[AVRO] Generation of Avro schemas with logical types.

avro-java8/pom.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion> 
+  <parent>
+    <groupId>com.fasterxml.jackson.dataformat</groupId>
+    <artifactId>jackson-dataformats-binary</artifactId>
+    <version>2.10.0.pr2-SNAPSHOT</version>
+  </parent>
+  <artifactId>jackson-dataformat-avro-java8</artifactId>
+  <name>Jackson dataformat: Avro Java 8</name>
+  <packaging>bundle</packaging>
+  <description>Support for reading and writing AVRO-encoded data via Jackson
+abstractions.
+  </description>
+  <url>http://github.com/FasterXML/jackson-dataformats-binary</url>    
+
+  <properties>
+    <!-- Generate PackageVersion.java into this directory. -->
+    <packageVersion.dir>com/fasterxml/jackson/dataformat/avro/java8</packageVersion.dir>
+    <packageVersion.package>${project.groupId}.avro.java8</packageVersion.package>
+  </properties>
+
+  <dependencies>
+    <!--  Hmmh. Need annotations for introspection... -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <!--  and databind for Avro Schema generation... -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-avro</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- and for testing we need logback -->
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- A bit of help to reduce boiler-plate in dummy test classes -->
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.16.14</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- For validating more complex comparisons -->
+    <!-- 27-Feb-2017, tatu: NOTE! Can NOT use 3.x as it requires Java 8 
+      -->
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>2.5.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin><!-- Inherited from oss-base. Generate PackageVersion.java.-->
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
+        <executions>
+          <execution>
+            <id>process-packageVersion</id>
+            <phase>generate-sources</phase>
+          </execution>
+        </executions>
+      </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>8</source>
+                <target>8</target>
+            </configuration>
+        </plugin>
+    </plugins>
+  </build>
+</project>

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/AvroJavaTimeAnnotationIntrospector.java

@@ -0,0 +1,112 @@
+package com.fasterxml.jackson.dataformat.avro.java8;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.introspect.Annotated;
+import com.fasterxml.jackson.dataformat.avro.AvroAnnotationIntrospector;
+import com.fasterxml.jackson.dataformat.avro.AvroType;
+import com.fasterxml.jackson.dataformat.avro.java8.deser.InstantDeserializer;
+import com.fasterxml.jackson.dataformat.avro.java8.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.dataformat.avro.java8.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.dataformat.avro.java8.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.dataformat.avro.java8.ser.InstantSerializer;
+import com.fasterxml.jackson.dataformat.avro.java8.ser.LocalDateSerializer;
+import com.fasterxml.jackson.dataformat.avro.java8.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.dataformat.avro.java8.ser.LocalTimeSerializer;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+class AvroJavaTimeAnnotationIntrospector extends AvroAnnotationIntrospector {
+  static final AvroJavaTimeAnnotationIntrospector INSTANCE = new AvroJavaTimeAnnotationIntrospector();
+
+  @Override
+  public Object findSerializer(Annotated a) {
+    AvroType logicalType = _findAnnotation(a, AvroType.class);
+    if (null != logicalType) {
+      switch (logicalType.logicalType()) {
+        case TIMESTAMP_MILLISECOND:
+          if (a.getRawType().isAssignableFrom(LocalDateTime.class)) {
+            return LocalDateTimeSerializer.MILLIS;
+          }
+          if (a.getRawType().isAssignableFrom(Instant.class)) {
+            return InstantSerializer.MILLIS;
+          }
+          break;
+        case TIMESTAMP_MICROSECOND:
+          if (a.getRawType().isAssignableFrom(LocalDateTime.class)) {
+            return LocalDateTimeSerializer.MICROS;
+          }
+          if (a.getRawType().isAssignableFrom(Instant.class)) {
+            return InstantSerializer.MICROS;
+          }
+          break;
+        case DATE:
+          if (a.getRawType().isAssignableFrom(LocalDate.class)) {
+            return LocalDateSerializer.INSTANCE;
+          }
+          break;
+        case TIME_MILLISECOND:
+          if (a.getRawType().isAssignableFrom(LocalTime.class)) {
+            return LocalTimeSerializer.MILLIS;
+          }
+          break;
+        case TIME_MICROSECOND:
+          if (a.getRawType().isAssignableFrom(LocalTime.class)) {
+            return LocalTimeSerializer.MICROS;
+          }
+          break;
+      }
+    }
+
+    return super.findSerializer(a);
+  }
+
+  @Override
+  public Object findDeserializer(Annotated a) {
+    AvroType logicalType = _findAnnotation(a, AvroType.class);
+    if (null != logicalType) {
+      switch (logicalType.logicalType()) {
+        case TIMESTAMP_MILLISECOND:
+          if (a.getRawType().isAssignableFrom(LocalDateTime.class)) {
+            return LocalDateTimeDeserializer.MILLIS;
+          }
+          if (a.getRawType().isAssignableFrom(Instant.class)) {
+            return InstantDeserializer.MILLIS;
+          }
+          break;
+        case TIMESTAMP_MICROSECOND:
+          if (a.getRawType().isAssignableFrom(LocalDateTime.class)) {
+            return LocalDateTimeDeserializer.MICROS;
+          }
+          if (a.getRawType().isAssignableFrom(Instant.class)) {
+            return InstantDeserializer.MICROS;
+          }
+          break;
+        case DATE:
+          if (a.getRawType().isAssignableFrom(LocalDate.class)) {
+            return LocalDateDeserializer.INSTANCE;
+          }
+          break;
+        case TIME_MILLISECOND:
+          if (a.getRawType().isAssignableFrom(LocalTime.class)) {
+            return LocalTimeDeserializer.MILLIS;
+          }
+          break;
+        case TIME_MICROSECOND:
+          if (a.getRawType().isAssignableFrom(LocalTime.class)) {
+            return LocalTimeDeserializer.MICROS;
+          }
+          break;
+      }
+    }
+
+    return super.findDeserializer(a);
+  }
+
+  @Override
+  public Version version() {
+    return PackageVersion.VERSION;
+  }
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/AvroJavaTimeModule.java

@@ -0,0 +1,20 @@
+package com.fasterxml.jackson.dataformat.avro.java8;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.dataformat.avro.AvroModule;
+
+public class AvroJavaTimeModule extends AvroModule {
+
+
+  public AvroJavaTimeModule() {
+    withAnnotationIntrospector(AvroJavaTimeAnnotationIntrospector.INSTANCE);
+  }
+
+
+  @Override
+  public Version version() {
+    return PackageVersion.VERSION;
+  }
+
+
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/PackageVersion.java.in

@@ -0,0 +1,20 @@
+package @package@;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.core.Versioned;
+import com.fasterxml.jackson.core.util.VersionUtil;
+
+/**
+ * Automatically generated from PackageVersion.java.in during
+ * packageVersion-generate execution of maven-replacer-plugin in
+ * pom.xml.
+ */
+public final class PackageVersion implements Versioned {
+    public final static Version VERSION = VersionUtil.parseVersion(
+        "@projectversion@", "@projectgroupid@", "@projectartifactid@");
+
+    @Override
+    public Version version() {
+        return VERSION;
+    }
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/deser/BaseTimeJsonDeserializer.java

@@ -0,0 +1,43 @@
+package com.fasterxml.jackson.dataformat.avro.java8.deser;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.concurrent.TimeUnit;
+
+public abstract class BaseTimeJsonDeserializer<T> extends JsonDeserializer<T> {
+  private final TimeUnit resolution;
+  final ZoneId zoneId = ZoneId.of("UTC");
+
+  BaseTimeJsonDeserializer(TimeUnit resolution) {
+    this.resolution = resolution;
+  }
+
+  abstract T fromInstant(Instant input);
+
+  @Override
+  public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+    final long input = p.getLongValue();
+    final ChronoUnit chronoUnit;
+
+    switch (this.resolution) {
+      case MICROSECONDS:
+        chronoUnit = ChronoUnit.MICROS;
+        break;
+      case MILLISECONDS:
+        chronoUnit = ChronoUnit.MILLIS;
+        break;
+      default:
+        throw new UnsupportedOperationException(
+            String.format("%s is not supported", this.resolution)
+        );
+    }
+    final Instant instant = Instant.EPOCH.plus(input, chronoUnit);
+    return fromInstant(instant);
+  }
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/deser/InstantDeserializer.java

@@ -0,0 +1,20 @@
+package com.fasterxml.jackson.dataformat.avro.java8.deser;
+
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
+
+public class InstantDeserializer extends BaseTimeJsonDeserializer<Instant> {
+  public static JsonDeserializer<Instant> MILLIS = new InstantDeserializer(TimeUnit.MILLISECONDS);
+  public static JsonDeserializer<Instant> MICROS = new InstantDeserializer(TimeUnit.MICROSECONDS);
+
+  InstantDeserializer(TimeUnit resolution) {
+    super(resolution);
+  }
+
+  @Override
+  Instant fromInstant(Instant input) {
+    return input;
+  }
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/deser/LocalDateDeserializer.java

@@ -0,0 +1,18 @@
+package com.fasterxml.jackson.dataformat.avro.java8.deser;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.LocalDate;
+
+public class LocalDateDeserializer extends JsonDeserializer<LocalDate> {
+  public static final JsonDeserializer<LocalDate> INSTANCE = new LocalDateDeserializer();
+
+  @Override
+  public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+    return LocalDate.ofEpochDay(jsonParser.getLongValue());
+  }
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/deser/LocalDateTimeDeserializer.java

@@ -0,0 +1,21 @@
+package com.fasterxml.jackson.dataformat.avro.java8.deser;
+
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.util.concurrent.TimeUnit;
+
+public class LocalDateTimeDeserializer extends BaseTimeJsonDeserializer<LocalDateTime> {
+  public static JsonDeserializer<LocalDateTime> MILLIS = new LocalDateTimeDeserializer(TimeUnit.MILLISECONDS);
+  public static JsonDeserializer<LocalDateTime> MICROS = new LocalDateTimeDeserializer(TimeUnit.MICROSECONDS);
+
+  LocalDateTimeDeserializer(TimeUnit resolution) {
+    super(resolution);
+  }
+
+  @Override
+  protected LocalDateTime fromInstant(Instant input) {
+    return LocalDateTime.ofInstant(input, this.zoneId);
+  }
+}

avro-java8/src/main/java/com/fasterxml/jackson/dataformat/avro/java8/deser/LocalTimeDeserializer.java

@@ -0,0 +1,28 @@
+package com.fasterxml.jackson.dataformat.avro.java8.deser;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.LocalTime;
+import java.util.concurrent.TimeUnit;
+
+public class LocalTimeDeserializer extends JsonDeserializer<LocalTime> {
+  public static JsonDeserializer<LocalTime> MILLIS = new LocalTimeDeserializer(TimeUnit.MILLISECONDS);
+  public static JsonDeserializer<LocalTime> MICROS = new LocalTimeDeserializer(TimeUnit.MICROSECONDS);
+
+  final TimeUnit resolution;
+
+  LocalTimeDeserializer(TimeUnit resolution) {
+    this.resolution = resolution;
+  }
+
+  @Override
+  public LocalTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+    long value = jsonParser.getLongValue();
+    long nanos = this.resolution.toNanos(value);
+    return LocalTime.ofNanoOfDay(nanos);
+  }
+}