Skip to content

Commit 5f9492f

Browse files
committed
minor fixes
1 parent 11fac99 commit 5f9492f

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroMapper.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import com.fasterxml.jackson.databind.*;
1212
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
13-
13+
import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
1414
import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
1515

1616
/**
@@ -40,6 +40,12 @@ public AvroMapper build() {
4040
return new AvroMapper(this);
4141
}
4242

43+
@Override
44+
protected MapperBuilderState _saveState() {
45+
// nothing extra, just format features
46+
return new MapperBuilderState(this);
47+
}
48+
4349
/*
4450
/******************************************************************
4551
/* Format features

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonObjectMapper.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.fasterxml.jackson.databind.JavaType;
2424
import com.fasterxml.jackson.databind.ObjectMapper;
2525
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
26+
import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
2627
import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
2728
import com.fasterxml.jackson.databind.module.SimpleModule;
2829
import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
@@ -58,7 +59,8 @@ public Builder(IonFactory f) {
5859

5960
// !!! 04-Jan-2018, tatu: needs to be reworked in future; may remain a module
6061
// Use native Ion timestamps for dates
61-
SimpleModule m = new SimpleModule("IonTimestampModule", PackageVersion.VERSION);
62+
SimpleModule m = new SimpleModule("IonTimestampModule", PackageVersion.VERSION,
63+
"IonTimestampModule");
6264
m.addSerializer(Date.class, new IonTimestampSerializers.IonTimestampJavaDateSerializer());
6365
m.addSerializer(java.sql.Date.class, new IonTimestampSerializers.IonTimestampSQLDateSerializer());
6466
m.addDeserializer(Date.class, new IonTimestampDeserializers.IonTimestampJavaDateDeserializer());
@@ -70,6 +72,11 @@ public Builder(IonFactory f) {
7072
public IonObjectMapper build() {
7173
return new IonObjectMapper(this);
7274
}
75+
76+
@Override
77+
protected MapperBuilderState _saveState() {
78+
return new MapperBuilderState(this);
79+
}
7380
}
7481

7582
/*

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufMapper.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.fasterxml.jackson.databind.JsonMappingException;
1212
import com.fasterxml.jackson.databind.ObjectMapper;
1313
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
14-
14+
import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
1515
import com.fasterxml.jackson.dataformat.protobuf.schema.DescriptorLoader;
1616
import com.fasterxml.jackson.dataformat.protobuf.schema.FileDescriptorSet;
1717
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
@@ -38,6 +38,11 @@ public Builder(ProtobufFactory f) {
3838
public ProtobufMapper build() {
3939
return new ProtobufMapper(this);
4040
}
41+
42+
@Override
43+
protected MapperBuilderState _saveState() {
44+
return new MapperBuilderState(this);
45+
}
4146
}
4247

4348
protected ProtobufSchemaLoader _schemaLoader = ProtobufSchemaLoader.std;

0 commit comments

Comments
 (0)