issue FasterXML#205 - add the xml untyped deser as an option

Signed-off-by: joaovarandas <[email protected]>

Author: joaovarandas

src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java

@@ -67,9 +67,6 @@ public void setupModule(SetupContext context)
             m.setXMLTextElementName(_cfgNameForTextElement);
         }
 
-        // fix the duplicated elements bug in an untyped Object
-        addDeserializer(Object.class, new XmlUntypedObjectDeserializer());
-
         /* Usually this would be the first call; but here anything added will
          * be stuff user may has added, so do it afterwards instead.
          */

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java

@@ -7,10 +7,16 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.PrettyPrinter;
+import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
+import com.fasterxml.jackson.dataformat.xml.deser.XmlUntypedObjectDeserializer;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
 import com.fasterxml.jackson.dataformat.xml.ser.XmlSerializerProvider;
 import com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter;
@@ -129,6 +135,15 @@ public XmlMapper setDefaultUseWrapper(boolean state) {
         }
         return this;
     }
+    
+    public XmlMapper setUseXmlUntypedObjectDeserModule(boolean state) {
+    	if (state == true) {
+    		Module xmlUntypedObjectDeserModule = new SimpleModule().addDeserializer(Object.class, new XmlUntypedObjectDeserializer());
+    		registerModule(xmlUntypedObjectDeserModule);
+    	} 
+    	
+    	return this;
+    }
 
     /*
     /**********************************************************

src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlParserTest.java

@@ -68,9 +68,15 @@ public void testSimpleNested() throws Exception
     public void testDuplicatedElementsSwallowing() throws Exception
     {
     	// 04-Aug-2016, jpvarandas: ensure that duplicated elements get wrapped into an array and do not get swallowed (deser and ser)
-        assertEquals("{\"name\":\"John\",\"parent\":[\"Jose\",\"Maria\"],\"dogs\":{\"count\":\"3\",\"dog\":[{\"name\":\"Spike\",\"age\":\"12\"},{\"name\":\"Brutus\",\"age\":\"9\"},{\"name\":\"Bob\",\"age\":\"14\"}]}}",
-        		_readXmlToMapToJson("<person><name>John</name><parent>Jose</parent><parent>Maria</parent><dogs><count>3</count><dog><name>Spike</name><age>12</age></dog><dog><name>Brutus</name><age>9</age></dog><dog><name>Bob</name><age>14</age></dog></dogs></person>"));
+        assertEquals("{\"id\":\"10\",\"name\":\"John\",\"parent\":[\"Jose\",\"Maria\"],\"dogs\":{\"count\":\"3\",\"dog\":[{\"name\":\"Spike\",\"age\":\"12\"},{\"name\":\"Brutus\",\"age\":\"9\"},{\"name\":\"Bob\",\"age\":\"14\"}]},\"addresses\":{\"address\":[\"Brazil\",\"US\"]}}",
+        		_readXmlToMapToJson("<person id=\"10\"><name>John</name><parent>Jose</parent><parent>Maria</parent><dogs><count>3</count><dog><name>Spike</name><age>12</age></dog><dog><name>Brutus</name><age>9</age></dog><dog><name>Bob</name><age>14</age></dog></dogs><addresses><address>Brazil</address><address>US</address></addresses></person>", true));
+        
+        // using 'false' should keep the deser the way it was before ...
+        assertEquals("{\"id\":\"10\",\"name\":\"John\",\"parent\":\"Maria\",\"dogs\":{\"count\":\"3\",\"dog\":{\"name\":\"Bob\",\"age\":\"14\"}},\"addresses\":{\"address\":\"US\"}}",
+        		_readXmlToMapToJson("<person id=\"10\"><name>John</name><parent>Jose</parent><parent>Maria</parent><dogs><count>3</count><dog><name>Spike</name><age>12</age></dog><dog><name>Brutus</name><age>9</age></dog><dog><name>Bob</name><age>14</age></dog></dogs><addresses><address>Brazil</address><address>US</address></addresses></person>", false));
+
     }
+
 
     /**
      * Unit test that verifies that we can write sample document from JSON
@@ -286,8 +292,10 @@ private String _readXmlWriteJson(String xml) throws IOException
         return w.toString();
     }
 
-    private String _readXmlToMapToJson(String xml) throws IOException
+    private String _readXmlToMapToJson(String xml, boolean state) throws IOException
     {
-        return _objectWriter.writeValueAsString(_xmlMapper.readValue(xml, Object.class));
+    	XmlMapper _xmlMapperWithOption = new XmlMapper().setUseXmlUntypedObjectDeserModule(state);
+    	
+        return _objectWriter.writeValueAsString(_xmlMapperWithOption.readValue(xml, Object.class));
     }
 }