Skip to content

Commit d967e8b

Browse files
committed
Remove uses of TypeFactory.defaultInstance()
1 parent 3eb1d43 commit d967e8b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/StringVisitor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.fasterxml.jackson.databind.SerializerProvider;
1111
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonStringFormatVisitor;
1212
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
13-
import com.fasterxml.jackson.databind.type.TypeFactory;
1413

1514
public class StringVisitor extends JsonStringFormatVisitor.Base
1615
implements SchemaBuilder
@@ -37,7 +36,8 @@ public void enumTypes(Set<String> enums) {
3736
public Schema builtAvroSchema() {
3837
// Unlike Jackson, Avro treats characters as an int with the java.lang.Character class type.
3938
if (_type.hasRawClass(char.class) || _type.hasRawClass(Character.class)) {
40-
return AvroSchemaHelper.numericAvroSchema(NumberType.INT, TypeFactory.defaultInstance().constructType(Character.class));
39+
// should we construct JavaType for `Character.class` in case of primitive or... ?
40+
return AvroSchemaHelper.numericAvroSchema(NumberType.INT, _type);
4141
}
4242
// [dataformats-binary#179]: need special help with UUIDs, to coerce into Binary
4343
// (could actually be

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/schema/DateTimeVisitor_builtAvroSchemaTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
@RunWith(Parameterized.class)
2626
public class DateTimeVisitor_builtAvroSchemaTest {
2727

28-
private static final TypeFactory TYPE_FACTORY = TypeFactory.defaultInstance();
29-
3028
@Parameter(0)
31-
public Class testClass;
29+
public Class<?> testClass;
3230

3331
@Parameter(1)
3432
public JsonParser.NumberType givenNumberType;
@@ -40,7 +38,7 @@ public class DateTimeVisitor_builtAvroSchemaTest {
4038
public String expectedLogicalType;
4139

4240
@Parameters(name = "With {0} and number type {1}")
43-
public static Collection testData() {
41+
public static Collection<?> testData() {
4442
return Arrays.asList(new Object[][]{
4543
// Java type | given number type, | expected Avro type | expected logicalType
4644
{
@@ -72,14 +70,16 @@ public static Collection testData() {
7270
LocalTime.class,
7371
JsonParser.NumberType.INT,
7472
Schema.Type.INT,
75-
"time-millis"},
73+
"time-millis"
74+
}
7675
});
7776
}
7877

7978
@Test
8079
public void builtAvroSchemaTest() {
8180
// GIVEN
82-
DateTimeVisitor dateTimeVisitor = new DateTimeVisitor(TYPE_FACTORY.constructSimpleType(testClass, null));
81+
final TypeFactory tf = TypeFactory.createDefaultInstance();
82+
DateTimeVisitor dateTimeVisitor = new DateTimeVisitor(tf.constructSimpleType(testClass, null));
8383
dateTimeVisitor.numberType(givenNumberType);
8484

8585
// WHEN

0 commit comments

Comments
 (0)