Fix issues 4697 and 2461 (@JsonUnwrapped caching)

src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java

@@ -24,6 +24,8 @@
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.databind.util.NameTransformer;
 
+import static com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap.emptyForProperties;
+
 /**
  * Base bean property handler class, which implements common parts of
  * reflection-based functionality for accessing a property value and serializing
@@ -222,8 +224,7 @@ public BeanPropertyWriter(BeanPropertyDefinition propDef,
 
         _declaredType = declaredType;
         _serializer = (JsonSerializer<Object>) ser;
-        _dynamicSerializers = (ser == null) ? PropertySerializerMap
-                .emptyForProperties() : null;
+        _dynamicSerializers = (ser == null) ? PropertySerializerMap.emptyForProperties() : null;
         _typeSerializer = typeSer;
         _cfgSerializationType = serType;
 
@@ -325,7 +326,11 @@ protected BeanPropertyWriter(BeanPropertyWriter base, PropertyName name) {
                     base._internalSettings);
         }
         _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
+        if (base.needToResetSerialization()) {
+            _dynamicSerializers = PropertySerializerMap.emptyForProperties();
+        } else {
+            _dynamicSerializers = base._dynamicSerializers;
+        }
         _suppressNulls = base._suppressNulls;
         _suppressableValue = base._suppressableValue;
         _includeInViews = base._includeInViews;
@@ -350,8 +355,12 @@ protected BeanPropertyWriter(BeanPropertyWriter base, SerializedString name) {
                     base._internalSettings);
         }
         _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
-        _suppressNulls = base._suppressNulls;
+        if (base.needToResetSerialization()) {
+            _dynamicSerializers = PropertySerializerMap.emptyForProperties();
+        } else {
+            _dynamicSerializers = base._dynamicSerializers;
+        }
+		_suppressNulls = base._suppressNulls;
         _suppressableValue = base._suppressableValue;
         _includeInViews = base._includeInViews;
         _typeSerializer = base._typeSerializer;
@@ -988,4 +997,4 @@ public String toString() {
         sb.append(')');
         return sb.toString();
     }
-}
+}

src/main/java/com/fasterxml/jackson/databind/ser/PropertyWriter.java

@@ -100,6 +100,13 @@ public <A extends Annotation> A findAnnotation(Class<A> acls) {
     /**********************************************************
      */
 
+    /**
+     * A way to reset serialization to correctly populate serializer
+     */
+    public boolean needToResetSerialization() {
+        return false;
+    }
+
     /**
      * The main serialization method called by filter when property is to be written normally.
      */

src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.java

@@ -224,4 +224,9 @@ protected JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
         _dynamicSerializers = _dynamicSerializers.newWith(type, serializer);
         return serializer;
     }
+
+    @Override
+    public boolean needToResetSerialization() {
+        return true;
+    }
 }

src/test/java/com/fasterxml/jackson/databind/tofix/JsonUnwrappedInconsistentSerialization4697Test.java

@@ -35,13 +35,16 @@ public Third() {
         }
     }
 
+    public static class AnotherFirst {
+        public Third thrid = new Third();
+    }
+
     public static class Common {
         public String a;
         public String b;
         public Common() {}
     }
 
-    @JacksonTestFailureExpected
     @Test
     public void testInconsistentSer() throws Exception {
         First first = new First();
@@ -51,8 +54,23 @@ public void testInconsistentSer() throws Exception {
         ObjectMapper secondMapper = newJsonMapper();
 
         firstMapper.writeValueAsString(first);
+        firstMapper.writeValueAsString(second);
+        assertEquals(
+                firstMapper.writeValueAsString(second),
+                secondMapper.writeValueAsString(second));
+    }
+    @Test
+    public void testInconsistentSer1() throws Exception {
+        AnotherFirst first = new AnotherFirst();
+        Second second = new Second();
+
+        ObjectMapper firstMapper = newJsonMapper();
+        ObjectMapper secondMapper = newJsonMapper();
+
+        firstMapper.writeValueAsString(first);
+        firstMapper.writeValueAsString(second);
         assertEquals(
                 firstMapper.writeValueAsString(second),
                 secondMapper.writeValueAsString(second));
     }
-}
+}

src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java

@@ -39,7 +39,6 @@ static class OuterContainer {
     }
 
     // [databind#2461]
-    @JacksonTestFailureExpected
     @Test
     void unwrappedCaching() throws Exception {
         final InnerContainer inner = new InnerContainer(new Base("12345"));