Add a unit test for #822, not yet failing.

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java

@@ -817,7 +817,6 @@ public boolean hasAsValueAnnotation(AnnotatedMethod am) {
      * @return Serialized enum value.
      */
     public String findEnumValue(Enum<?> value) {
-        // as per [JACKSON-875], should use default here
         return value.name();
     }
 

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

@@ -147,9 +147,9 @@ public boolean hasSingleElement(String[] value) {
 
     @Override
     public final void serialize(String[] value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+        throws IOException
     {
-    	final int len = value.length;
+        final int len = value.length;
         if ((len == 1) && provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED)) {
             serializeContents(value, jgen, provider);
             return;
@@ -160,45 +160,36 @@ public final void serialize(String[] value, JsonGenerator jgen, SerializerProvid
     }
 
     @Override
-    public void serializeContents(String[] value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+    public void serializeContents(String[] value, JsonGenerator gen, SerializerProvider provider)
+        throws IOException
     {
         final int len = value.length;
         if (len == 0) {
             return;
         }
         if (_elementSerializer != null) {
-            serializeContentsSlow(value, jgen, provider, _elementSerializer);
+            serializeContentsSlow(value, gen, provider, _elementSerializer);
             return;
         }
-        /* 08-Dec-2008, tatus: If we want this to be fully overridable
-         *  (for example, to support String cleanup during writing
-         *  or something), we should find serializer  by provider.
-         *  But for now, that seems like an overkill: and caller can
-         *  add custom serializer if that is needed as well.
-         * (ditto for null values)
-         */
-        //JsonSerializer<String> ser = (JsonSerializer<String>)provider.findValueSerializer(String.class);
         for (int i = 0; i < len; ++i) {
             String str = value[i];
             if (str == null) {
-                jgen.writeNull();
+                gen.writeNull();
             } else {
-                //ser.serialize(value[i], jgen, provider);
-                jgen.writeString(value[i]);
+                gen.writeString(value[i]);
             }
         }
     }
 
-    private void serializeContentsSlow(String[] value, JsonGenerator jgen, SerializerProvider provider, JsonSerializer<Object> ser)
-        throws IOException, JsonGenerationException
+    private void serializeContentsSlow(String[] value, JsonGenerator gen, SerializerProvider provider, JsonSerializer<Object> ser)
+        throws IOException
     {
         for (int i = 0, len = value.length; i < len; ++i) {
             String str = value[i];
             if (str == null) {
-                provider.defaultSerializeNull(jgen);
+                provider.defaultSerializeNull(gen);
             } else {
-                ser.serialize(value[i], jgen, provider);
+                ser.serialize(value[i], gen, provider);
             }
         }
     }

…databind/creators/TestBuilderSimple.java …databind/creators/BuilderSimpleTest.javasrc/test/java/com/fasterxml/jackson/databind/creators/TestBuilderSimple.java renamed to src/test/java/com/fasterxml/jackson/databind/creators/BuilderSimpleTest.java src/test/java/com/fasterxml/jackson/databind/creators/TestBuilderSimple.java renamed to src/test/java/com/fasterxml/jackson/databind/creators/BuilderSimpleTest.java

@@ -1,5 +1,8 @@
 package com.fasterxml.jackson.databind.creators;
 
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
@@ -8,7 +11,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
-public class TestBuilderSimple extends BaseMapTest
+public class BuilderSimpleTest extends BaseMapTest
 {
     // // Simple 2-property value class, builder with standard naming
 
@@ -246,6 +249,39 @@ public ValueClassXY build() {
             return null;
         }
     }
+    
+    // [databind#822]
+    @JsonPOJOBuilder(buildMethodName = "build", withPrefix = "with")
+    static class ValueBuilder822
+    {
+        public int x;
+        private Map<String,Object> stuff = new HashMap<String,Object>();
+        
+        public ValueBuilder822 withX(int x0) {
+            this.x = x0;
+            return this;
+        }
+
+        @JsonAnySetter
+        public void addStuff(String key, Object value) {
+            stuff.put(key, value);
+        }
+
+        public ValueClass822 build() {
+            return new ValueClass822(x, stuff);
+        }
+    }
+
+    @JsonDeserialize(builder = ValueBuilder822.class)
+    static class ValueClass822 {
+        public int x;
+        public Map<String,Object> stuff;
+
+        public ValueClass822(int x, Map<String,Object> stuff) {
+            this.x = x;
+            this.stuff = stuff;
+        }
+    }
 
     /*
     /**********************************************************
@@ -333,4 +369,18 @@ public void testBuilderMethodReturnInvalidType() throws Exception
         }
     }
 
+    public void testWithAnySetter822() throws Exception
+    {
+        final String json = "{\"extra\":3,\"foobar\":[ ],\"x\":1,\"name\":\"bob\"}";
+        ValueClass822 value = mapper.readValue(json, ValueClass822.class);
+        assertEquals(1, value.x);
+        assertNotNull(value.stuff);
+        assertEquals(3, value.stuff.size());
+        assertEquals(Integer.valueOf(3), value.stuff.get("extra"));
+        assertEquals("bob", value.stuff.get("name"));
+        Object ob = value.stuff.get("foobar");
+        assertNotNull(ob);
+        assertTrue(ob instanceof List);
+        assertTrue(((List<?>) ob).isEmpty());
+    }
 }