Fix #117

Author: cowtowncoder

release-notes/VERSION

@@ -1,6 +1,9 @@
 Project: jackson-dataformat-xml
 Version: 2.4.1 (xx-Jun-2014)
 
+#117: @JsonAnyGetter + @JsonTypeInfo combination prevents serialization of properties as elements
+ (reported by gawi@github)
+
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanSerializerBase.java

@@ -145,7 +145,7 @@ protected void serializeFields(Object bean, JsonGenerator jgen0, SerializerProvi
         }
 
         final int attrCount = _attributeCount;
-        boolean isAttribute = xgen._nextIsAttribute;
+        final boolean isAttribute = xgen._nextIsAttribute;
         if (attrCount > 0) {
             xgen.setNextIsAttribute(true);
         }
@@ -176,6 +176,9 @@ protected void serializeFields(Object bean, JsonGenerator jgen0, SerializerProvi
                 }
             }
             if (_anyGetterWriter != null) {
+                // For [#117]: not a clean fix, but with @JsonTypeInfo, we'll end up
+                // with accidental attributes otherwise
+                xgen.setNextIsAttribute(false);
                 _anyGetterWriter.getAndSerialize(bean, xgen, provider);
             }
         } catch (Exception e) {
@@ -215,6 +218,7 @@ protected void serializeFieldsFiltered(Object bean, JsonGenerator jgen0,
             return;
         }
 
+        final boolean isAttribute = xgen._nextIsAttribute;
         final int attrCount = _attributeCount;
         if (attrCount > 0) {
             xgen.setNextIsAttribute(true);
@@ -225,7 +229,9 @@ protected void serializeFieldsFiltered(Object bean, JsonGenerator jgen0,
         int i = 0;
         try {
             for (final int len = props.length; i < len; ++i) {
-                if (i == attrCount) {
+                // 28-jan-2014, pascal: we don't want to reset the attribute flag if we are an unwrapping serializer 
+                // that started with nextIsAttribute to true because all properties should be unwrapped as attributes too.
+                if (i == attrCount && !(isAttribute && isUnwrappingSerializer())) {
                     xgen.setNextIsAttribute(false);
                 }
                 // also: if this is property to write as text ("unwrap"), need to:
@@ -239,6 +245,9 @@ protected void serializeFieldsFiltered(Object bean, JsonGenerator jgen0,
                 }
             }
             if (_anyGetterWriter != null) {
+                // For [#117]: not a clean fix, but with @JsonTypeInfo, we'll end up
+                // with accidental attributes otherwise
+                xgen.setNextIsAttribute(false);
                 _anyGetterWriter.getAndSerialize(bean, xgen, provider);
             }
         } catch (Exception e) {
@@ -261,7 +270,6 @@ public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvide
             _serializeWithObjectId(bean, jgen, provider, typeSer);
             return;
         }
-
         /* Ok: let's serialize type id as attribute, but if (and only if!)
          * we are using AS_PROPERTY
          */

src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java

@@ -265,7 +265,7 @@ protected byte[] utf8Bytes(String str) {
 
     /**
      * Helper method that tries to remove unnecessary namespace
-     * declaration that default JDK XML parser (SJSXP) seems fit
+     * declaration that default JDK XML parser (SJSXP) sees fit
      * to add.
      */
     protected static String removeSjsxpNamespace(String xml)

src/test/java/com/fasterxml/jackson/dataformat/xml/ser/TestSerializationAttr.java

@@ -1,8 +1,9 @@
 package com.fasterxml.jackson.dataformat.xml.ser;
 
 import java.io.IOException;
+import java.util.*;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
@@ -35,6 +36,22 @@ public class Jurisdiction {
         @JacksonXmlProperty(isAttribute=true)
         protected int value = 13;
     }
+
+    @JacksonXmlRootElement(localName = "dynaBean", namespace = "")
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class", include = JsonTypeInfo.As.PROPERTY)
+    public class DynaBean {
+        private final Map<String, String> _properties = new TreeMap<String, String>();
+
+        public DynaBean(Map<String, String> values) {
+            _properties.putAll(values);
+        }
+
+        @JsonAnyGetter
+        @JacksonXmlProperty(isAttribute = false)
+        public Map<String, String> getProperties() {
+            return _properties;
+        }
+    }    
 
     /*
     /**********************************************************
@@ -81,6 +98,16 @@ public void testIssue6() throws IOException
         assertEquals("<Jurisdiction name=\"Foo\" value=\"13\"/>",
                 _xmlMapper.writeValueAsString(new Jurisdiction()));
     }
+
+    public void testIssue117AnySetterAttrs() throws IOException
+    {
+        Map<String, String> values = new HashMap<String, String>();
+        values.put("prop1", "val1");
+
+        String xml = _xmlMapper.writeValueAsString(new DynaBean(values));
+        assertEquals("<dynaBean class=\"TestSerializationAttr$DynaBean\"><prop1>val1</prop1></dynaBean>",
+                removeSjsxpNamespace(xml));
+    }
 
     /*
     /**********************************************************