fixes to sync with mapper/builder

Author: cowtowncoder

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

@@ -10,7 +10,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
-import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
+
 import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
 
 /**
@@ -32,10 +32,11 @@ public static class Builder extends MapperBuilder<AvroMapper, Builder>
     {
         public Builder(AvroFactory f) {
             super(f);
+            addModule(new AvroModule());
         }
 
         @Override
-        public AvroMapper _constructMapper(MapperBuilderState state) {
+        public AvroMapper build() {
             return new AvroMapper(this);
         }
 
@@ -117,7 +118,7 @@ public AvroMapper(AvroFactory f) {
     }
 
     public AvroMapper(Builder b) {
-        super(b.addModule(new AvroModule()));
+        super(b);
     }
 
     @SuppressWarnings("unchecked")

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

@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
-import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
 import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
@@ -68,7 +67,7 @@ public Builder(IonFactory f) {
         }
 
         @Override
-        public IonObjectMapper _constructMapper(MapperBuilderState state) {
+        public IonObjectMapper build() {
             return new IonObjectMapper(this);
         }
     }

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

@@ -11,7 +11,6 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
-import com.fasterxml.jackson.databind.cfg.MapperBuilderState;
 
 import com.fasterxml.jackson.dataformat.protobuf.schema.DescriptorLoader;
 import com.fasterxml.jackson.dataformat.protobuf.schema.FileDescriptorSet;
@@ -36,7 +35,7 @@ public Builder(ProtobufFactory f) {
         }
 
         @Override
-        public ProtobufMapper _constructMapper(MapperBuilderState state) {
+        public ProtobufMapper build() {
             return new ProtobufMapper(this);
         }
     }