Fix JD serializability

Author: cowtowncoder

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

@@ -35,6 +35,11 @@ public Builder(AvroFactory f) {
             addModule(new AvroModule());
         }
 
+        public Builder(StateImpl state) {
+            super(state);
+            // no need to add module, should come by default
+        }
+        
         @Override
         public AvroMapper build() {
             return new AvroMapper(this);
@@ -43,7 +48,7 @@ public AvroMapper build() {
         @Override
         protected MapperBuilderState _saveState() {
             // nothing extra, just format features
-            return new MapperBuilderState(this);
+            return new StateImpl(this);
         }
 
         /*
@@ -99,6 +104,23 @@ public Builder configure(AvroGenerator.Feature feature, boolean state)
             }
             return this;
         }
+
+        protected static class StateImpl extends MapperBuilderState
+            implements java.io.Serializable // important!
+        {
+            private static final long serialVersionUID = 3L;
+    
+            public StateImpl(Builder src) {
+                super(src);
+            }
+    
+            // We also need actual instance of state as base class can not implement logic
+             // for reinstating mapper (via mapper builder) from state.
+            @Override
+            protected Object readResolve() {
+                return new Builder(this).build();
+            }
+        }
     }
 
     /*

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

@@ -68,14 +68,36 @@ public Builder(IonFactory f) {
             addModule(m);
         }
 
+        public Builder(StateImpl state) {
+            super(state);
+            // other stuff should have been preserved along with state
+        }
+
         @Override
         public IonObjectMapper build() {
             return new IonObjectMapper(this);
         }
 
         @Override
         protected MapperBuilderState _saveState() {
-            return new MapperBuilderState(this);
+            return new StateImpl(this);
+        }
+
+        protected static class StateImpl extends MapperBuilderState
+            implements java.io.Serializable // important!
+        {
+            private static final long serialVersionUID = 3L;
+    
+            public StateImpl(Builder src) {
+                super(src);
+            }
+    
+            // We also need actual instance of state as base class can not implement logic
+             // for reinstating mapper (via mapper builder) from state.
+            @Override
+            protected Object readResolve() {
+                return new Builder(this).build();
+            }
         }
     }
 

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

@@ -34,14 +34,35 @@ public Builder(ProtobufFactory f) {
             super(f);
         }
 
+        public Builder(StateImpl state) {
+            super(state);
+        }
+
         @Override
         public ProtobufMapper build() {
             return new ProtobufMapper(this);
         }
 
         @Override
         protected MapperBuilderState _saveState() {
-            return new MapperBuilderState(this);
+            return new StateImpl(this);
+        }
+
+        protected static class StateImpl extends MapperBuilderState
+            implements java.io.Serializable // important!
+        {
+            private static final long serialVersionUID = 3L;
+    
+            public StateImpl(Builder src) {
+                super(src);
+            }
+    
+            // We also need actual instance of state as base class can not implement logic
+             // for reinstating mapper (via mapper builder) from state.
+            @Override
+            protected Object readResolve() {
+                return new Builder(this).build();
+            }
         }
     }