Improve JDK serialization handling of inner-non-static class properties

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/impl/FieldProperty.java

@@ -58,13 +58,13 @@ protected FieldProperty(FieldProperty src, PropertyName newName) {
     /**
      * Constructor used for JDK Serialization when reading persisted object
      */
-    protected FieldProperty(FieldProperty src, Field f)
+    protected FieldProperty(FieldProperty src)
     {
         super(src);
         _annotated = src._annotated;
+        Field f = _annotated.getAnnotated();
         if (f == null) {
-            throw new IllegalArgumentException("No Field passed for property '"+src.getName()
-                    +"' (class "+src.getDeclaringClass().getName()+")");
+            throw new IllegalArgumentException("Missing field (broken JDK (de)serialization?)");
         }
         _field = f;
     }
@@ -144,6 +144,6 @@ public Object setAndReturn(Object instance, Object value)
      */
 
     Object readResolve() {
-        return new FieldProperty(this, _annotated.getAnnotated());
+        return new FieldProperty(this);
     }
 }

src/main/java/com/fasterxml/jackson/databind/deser/impl/InnerClassProperty.java

@@ -4,14 +4,10 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.PropertyName;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
+import com.fasterxml.jackson.databind.introspect.*;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
@@ -31,10 +27,17 @@ public final class InnerClassProperty
     protected final SettableBeanProperty _delegate;
 
     /**
-     * Single-arg constructor we use for value instantiation.
+     * Constructor used when deserializing this property.
+     * Transient since there is no need to persist; only needed during
+     * construction of objects.
      */
-    protected final Constructor<?> _creator;
+    final protected transient Constructor<?> _creator;
 
+    /**
+     * Serializable version of single-arg constructor we use for value instantiation.
+     */
+    protected AnnotatedConstructor _annotated;
+
     public InnerClassProperty(SettableBeanProperty delegate,
             Constructor<?> ctor)
     {
@@ -43,6 +46,21 @@ public InnerClassProperty(SettableBeanProperty delegate,
         _creator = ctor;
     }
 
+    /**
+     * Constructor used with JDK Serialization; needed to handle transient
+     * Constructor, wrap/unwrap in/out-of Annotated variant.
+     */
+    protected InnerClassProperty(InnerClassProperty src, AnnotatedConstructor ann)
+    {
+        super(src);
+        _delegate = src._delegate;
+        _annotated = ann;
+        _creator = (_annotated == null) ? null : _annotated.getAnnotated();
+        if (_creator == null) {
+            throw new IllegalArgumentException("Missing constructor (broken JDK (de)serialization?)");
+        }
+    }
+    
     protected InnerClassProperty(InnerClassProperty src, JsonDeserializer<?> deser)
     {
         super(src, deser);
@@ -82,9 +100,8 @@ public <A extends Annotation> A getAnnotation(Class<A> acls) {
      */
 
     @Override
-    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-            Object bean)
-        throws IOException, JsonProcessingException
+    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt, Object bean)
+        throws IOException
     {
         JsonToken t = jp.getCurrentToken();
         Object value;
@@ -107,21 +124,37 @@ public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
     @Override
     public Object deserializeSetAndReturn(JsonParser jp,
     		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         return setAndReturn(instance, deserialize(jp, ctxt));
     }
 
     @Override
-    public final void set(Object instance, Object value) throws IOException
-    {
+    public final void set(Object instance, Object value) throws IOException {
         _delegate.set(instance, value);
     }
 
     @Override
-    public Object setAndReturn(Object instance, Object value)
-            throws IOException
-    {
-    	return _delegate.setAndReturn(instance, value);
+    public Object setAndReturn(Object instance, Object value) throws IOException {
+        return _delegate.setAndReturn(instance, value);
+    }
+
+    /*
+    /**********************************************************
+    /* JDK serialization handling
+    /**********************************************************
+     */
+
+    // When reading things back, 
+    Object readResolve() {
+        return new InnerClassProperty(this, _annotated);
+    }
+
+    Object writeReplace() {
+        // need to construct a fake instance to support serialization
+        if (_annotated != null) {
+            return this;
+        }
+        return new InnerClassProperty(this, new AnnotatedConstructor(_creator, null, null));
     }
 }