-
-
Notifications
You must be signed in to change notification settings - Fork 138
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
logicalType switch. Logical types are not generated by default.
- Loading branch information
1 parent
d21db2a
commit 3761b0e
Showing
7 changed files
with
246 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
...xml/jackson/dataformat/avro/schema/AvroFormatVisitorWrapper_createVisitorWrapperTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.fasterxml.jackson.dataformat.avro.schema; | ||
|
|
||
| import com.fasterxml.jackson.databind.SerializerProvider; | ||
| import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider; | ||
| import org.assertj.core.api.Assertions; | ||
|
|
||
| public class AvroFormatVisitorWrapper_createVisitorWrapperTest { | ||
|
|
||
| public void test () { | ||
| // GIVEN | ||
| SerializerProvider serializerProvider = new DefaultSerializerProvider.Impl(); | ||
| DefinedSchemas schemas = new DefinedSchemas(); | ||
|
|
||
| AvroFormatVisitorWrapper src = new AvroFormatVisitorWrapper(schemas, serializerProvider); | ||
| src.enableLogicalTypes(); | ||
|
|
||
| // WHEN | ||
| AvroFormatVisitorWrapper actual = src.createVisitorWrapper(); | ||
|
|
||
| // THEN | ||
| // All settings are inherited from parent visitor wrapper. | ||
| Assertions.assertThat(actual.getSchemas()).isEqualTo(schemas); | ||
| Assertions.assertThat(actual.getProvider()).isEqualTo(serializerProvider); | ||
| Assertions.assertThat(actual.isLogicalTypesEnabled()).isTrue(); | ||
| } | ||
| } |
100 changes: 100 additions & 0 deletions
100
...ava/com/fasterxml/jackson/dataformat/avro/schema/DateTimeVisitor_builtAvroSchemaTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| package com.fasterxml.jackson.dataformat.avro.schema; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.databind.type.TypeFactory; | ||
| import org.apache.avro.LogicalType; | ||
| import org.apache.avro.Schema; | ||
| import org.apache.avro.specific.SpecificData; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
| import org.junit.runners.Parameterized.Parameter; | ||
| import org.junit.runners.Parameterized.Parameters; | ||
|
|
||
| import java.time.Instant; | ||
| import java.time.LocalDate; | ||
| import java.time.LocalDateTime; | ||
| import java.time.LocalTime; | ||
| import java.time.OffsetDateTime; | ||
| import java.time.ZonedDateTime; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| @RunWith(Parameterized.class) | ||
| public class DateTimeVisitor_builtAvroSchemaTest { | ||
|
|
||
| private static final TypeFactory TYPE_FACTORY = TypeFactory.defaultInstance(); | ||
|
|
||
| @Parameter(0) | ||
| public Class testClass; | ||
|
|
||
| @Parameter(1) | ||
| public JsonParser.NumberType givenNumberType; | ||
|
|
||
| @Parameter(2) | ||
| public Schema.Type expectedAvroType; | ||
|
|
||
| @Parameter(3) | ||
| public String expectedLogicalType; | ||
|
|
||
| @Parameters(name = "With {0} and number type {1}") | ||
| public static Collection testData() { | ||
| return Arrays.asList(new Object[][]{ | ||
| // Java type | given number type, | expected Avro type | expected logicalType | ||
| { | ||
| Instant.class, | ||
| JsonParser.NumberType.LONG, | ||
| Schema.Type.LONG, | ||
| "timestamp-millis"}, | ||
| { | ||
| OffsetDateTime.class, | ||
| JsonParser.NumberType.LONG, | ||
| Schema.Type.LONG, | ||
| "timestamp-millis"}, | ||
| { | ||
| ZonedDateTime.class, | ||
| JsonParser.NumberType.LONG, | ||
| Schema.Type.LONG, | ||
| "timestamp-millis"}, | ||
| { | ||
| LocalDateTime.class, | ||
| JsonParser.NumberType.LONG, | ||
| Schema.Type.LONG, | ||
| "local-timestamp-millis"}, | ||
| { | ||
| LocalDate.class, | ||
| JsonParser.NumberType.INT, | ||
| Schema.Type.INT, | ||
| "date"}, | ||
| { | ||
| LocalTime.class, | ||
| JsonParser.NumberType.INT, | ||
| Schema.Type.INT, | ||
| "time-millis"}, | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void builtAvroSchemaTest() { | ||
| // GIVEN | ||
| DateTimeVisitor dateTimeVisitor = new DateTimeVisitor(TYPE_FACTORY.constructSimpleType(testClass, null)); | ||
| dateTimeVisitor.numberType(givenNumberType); | ||
|
|
||
| // WHEN | ||
| Schema actualSchema = dateTimeVisitor.builtAvroSchema(); | ||
|
|
||
| System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true)); | ||
|
|
||
| // THEN | ||
| assertThat(actualSchema.getType()).isEqualTo(expectedAvroType); | ||
| assertThat(actualSchema.getProp(LogicalType.LOGICAL_TYPE_PROP)).isEqualTo(expectedLogicalType); | ||
| /** | ||
| * Having logicalType and java-class is not valid according to | ||
| * {@link LogicalType#validate(Schema)} | ||
| */ | ||
| assertThat(actualSchema.getProp(SpecificData.CLASS_PROP)).isNull(); | ||
| } | ||
|
|
||
| } |