Minor clean up for #222 fix

Author: cowtowncoder

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

@@ -160,7 +160,7 @@ public class BeanPropertyWriter extends PropertyWriter
      * is used for determining exact mechanism to use (compared to
      * actual runtime type used for serializing actual state).
      */
-    protected final TypeSerializer _typeSerializer;
+    protected TypeSerializer _typeSerializer;
 
     /**
      * In case serializer is not known statically (i.e. <code>_serializer</code>
@@ -335,33 +335,6 @@ protected BeanPropertyWriter(BeanPropertyWriter base, SerializedString name) {
         _metadata = base._metadata;
     }
 
-    /**
-     * @since 2.6
-     */
-    protected BeanPropertyWriter(BeanPropertyWriter base, TypeSerializer typeSer)
-    {
-        _name = base._name;
-        _wrapperName = base._wrapperName;
-
-        _member = base._member;
-        _contextAnnotations = base._contextAnnotations;
-        _declaredType = base._declaredType;
-        _accessorMethod = base._accessorMethod;
-        _field = base._field;
-        _serializer = base._serializer;
-        _nullSerializer = base._nullSerializer;
-        _internalSettings = base._internalSettings; // safe, as per usage
-        _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
-        _suppressNulls = base._suppressNulls;
-        _suppressableValue = base._suppressableValue;
-        _includeInViews = base._includeInViews;
-        _nonTrivialBaseType = base._nonTrivialBaseType;
-        _metadata = base._metadata;
-
-        _typeSerializer = typeSer;
-    }
-    
     public BeanPropertyWriter rename(NameTransformer transformer) {
         String newName = transformer.transform(_name.getValue());
         if (newName.equals(_name.toString())) {
@@ -371,17 +344,13 @@ public BeanPropertyWriter rename(NameTransformer transformer) {
     }
 
     /**
-     * Mutant factory to construct and return a new {@link BeanPropertyWriter} with
-     * specified type serializer, unless this instance already has that 
-     * type serializer configured.
-     * 
+     * Method called to set, reset or clear the configured type serializer
+     * for property.
+     *
      * @since 2.6
      */
-    public BeanPropertyWriter withTypeSerializer(TypeSerializer typeSer) {
-        if (typeSer == _typeSerializer) {
-            return this;
-        }
-        return new BeanPropertyWriter(this, typeSer);
+    public void assignTypeSerializer(TypeSerializer typeSer) {
+        _typeSerializer = typeSer;
     }
 
     /**

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

@@ -721,9 +721,10 @@ protected List<BeanPropertyWriter> removeOverlappingTypeIds(SerializerProvider p
             }
             String n = td.getPropertyName();
             PropertyName typePropName = PropertyName.construct(n);
+
             for (BeanPropertyWriter w2 : props) {
                 if ((w2 != bpw) && w2.wouldConflictWithName(typePropName)) {
-                    props.set(i, bpw.withTypeSerializer(null));
+                    bpw.assignTypeSerializer(null);
                     break;
                 }
             }

src/test/java/com/fasterxml/jackson/databind/jsontype/TestExternalId.java

@@ -5,19 +5,12 @@
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 // Tests for [JACKSON-453]
 public class TestExternalId extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
-    
     static class ExternalBean
     {
         @JsonTypeInfo(use=Id.NAME, include=As.EXTERNAL_PROPERTY, property="extType")
@@ -217,6 +210,31 @@ public AsValueThingy() { }
         }
     }
 
+    // [databind#222]
+    static class Issue222Bean
+    {
+        @JsonTypeInfo(use = JsonTypeInfo.Id.NAME,
+                property = "type",
+                include = JsonTypeInfo.As.EXTERNAL_PROPERTY)
+        public Issue222BeanB value;
+
+        public String type = "foo";
+        
+        public Issue222Bean() { }
+        public Issue222Bean(int v) {
+            value = new Issue222BeanB(v);
+        }
+    }
+
+    @JsonTypeName("222b") // shouldn't actually matter
+    static class Issue222BeanB
+    {
+        public int x;
+        
+        public Issue222BeanB() { }
+        public Issue222BeanB(int value) { x = value; }
+    }
+
     /*
     /**********************************************************
     /* Unit tests, serialization
@@ -399,7 +417,7 @@ public void testWithNaturalScalar118() throws Exception
         assertEquals("foobar", result.value);
     }
 
-    // For [Issue#119]... and bit of [#167] as well
+    // For [databind#119]... and bit of [#167] as well
     public void testWithAsValue() throws Exception
     {
         ExternalTypeWithNonPOJO input = new ExternalTypeWithNonPOJO(new AsValueThingy(12345L));
@@ -422,4 +440,13 @@ public void testWithAsValue() throws Exception
         assertEquals(Date.class, result.value.getClass());
         assertEquals(12345L, ((Date) result.value).getTime());
     }
+
+    // for [databind#222]
+    public void testExternalTypeWithProp222() throws Exception
+    {
+        final ObjectMapper mapper = new ObjectMapper();
+        Issue222Bean input = new Issue222Bean(13);
+        String json = mapper.writeValueAsString(input);
+        assertEquals("{\"value\":{\"x\":13},\"type\":\"foo\"}", json);
+    }
 }