fix for #1292, added xml to model properties upon deserialization

Author: fehguy

modules/swagger-core/src/main/java/io/swagger/jackson/JAXBAnnotationsHelper.java

@@ -48,7 +48,8 @@ private static void applyElement(AnnotatedMember member, Property property) {
         if (wrapper != null) {
             final Xml xml = getXml(property);
             xml.setWrapped(true);
-            setName(wrapper.namespace(), wrapper.name(), property);
+            if(!"##default".equals(wrapper.name()) && !wrapper.name().isEmpty())
+              xml.setName(wrapper.name());
         }
         final XmlElement element = member.getAnnotation(XmlElement.class);
         if (element != null) {

modules/swagger-core/src/main/java/io/swagger/util/PropertyDeserializer.java

@@ -6,13 +6,15 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.ObjectProperty;
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.PropertyBuilder;
 import io.swagger.models.properties.RefProperty;
+import io.swagger.models.Xml;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,13 +70,48 @@ private static JsonNode getDetailNode(JsonNode node, PropertyBuilder.PropertyId
     public Property deserialize(JsonParser jp, DeserializationContext ctxt)
             throws IOException, JsonProcessingException {
         JsonNode node = jp.getCodec().readTree(jp);
-        return propertyFromNode(node);
+        Property property = propertyFromNode(node);
+        property.setXml(getXml(node));
+        return property;
+    }
+
+    public Xml getXml(JsonNode node) {
+      Xml xml = null;
+
+      if(node instanceof ObjectNode) {
+        ObjectNode obj = (ObjectNode)((ObjectNode) node).get("xml");
+        if(obj != null) {
+          xml = new Xml();
+          JsonNode n = obj.get("name");
+          if(n != null) {
+              xml.name(n.asText());
+          }
+          n = obj.get("namespace");
+          if(n != null) {
+              xml.namespace(n.asText());
+          }
+          n = obj.get("prefix");
+          if(n != null) {
+              xml.prefix(n.asText());
+          }
+          n = obj.get("attribute");
+          if(n != null) {
+              xml.attribute(n.asBoolean());
+          }
+          n = obj.get("wrapped");
+          if(n != null) {
+              xml.wrapped(n.asBoolean());
+          }
+        }
+      }
+      return xml;
     }
 
     Property propertyFromNode(JsonNode node) {
         final String type = getString(node, PropertyBuilder.PropertyId.TYPE);
         final String format = getString(node, PropertyBuilder.PropertyId.FORMAT);
         final String description = getString(node, PropertyBuilder.PropertyId.DESCRIPTION);
+        final Xml xml = getXml(node);
 
         JsonNode detailNode = node.get("$ref");
         if (detailNode != null) {

modules/swagger-core/src/test/scala/XmlModelTest.scala

@@ -57,6 +57,7 @@ class XmlModelTest extends FlatSpec with Matchers {
     var rootXml = model.asInstanceOf[ModelImpl].getXml()
     rootXml should not be (null)
     rootXml.getName() should equal("rootName")
+
     for ((name, property) <- model.getProperties.asScala) {
       name match {
         case "id" =>
@@ -76,14 +77,53 @@ class XmlModelTest extends FlatSpec with Matchers {
         case "wrappedList" =>
           var xml = property.getXml
           xml should not be (null)
-          xml.getName should be (null)
+          xml.getName should be ("wrappedListItems")
           xml.getAttribute should be (null)
           xml.getWrapped should equal (true)
         case _ =>
           fail(s"""Property "${name}" was not expected""")
       }
     }
   }
+
+  it should "deserialize a model" in {
+    val yaml = """
+---
+type: "object"
+properties:
+  id:
+    type: "string"
+    xml:
+      attribute: true
+  name:
+    type: "string"
+    xml:
+      name: "renamed"
+  list:
+    type: "array"
+    items:
+      type: "string"
+  wrappedList:
+    type: "array"
+    xml:
+      name: "wrappedListItems"
+      wrapped: true
+    items:
+      type: "string"
+  forcedElement:
+    type: "array"
+    items:
+      type: "string"
+xml:
+  name: "rootName"
+    """
+    val model = io.swagger.util.Yaml.mapper().readValue(yaml, classOf[ModelImpl])
+
+    val wrappedList = model.getProperties.get("wrappedList")
+    wrappedList should not be (null)
+    wrappedList.getXml() should not be (null)
+    wrappedList.getXml().getName() should be ("wrappedListItems")
+  }
 }
 
 @XmlRootElement(name = "monster")

modules/swagger-core/src/test/scala/models/ModelWithJAXBAnnotations.java

@@ -23,7 +23,8 @@ public class ModelWithJAXBAnnotations {
 
     public List<String> list;
 
-    @XmlElementWrapper
+    @XmlElementWrapper(name="wrappedListItems")
+    @XmlElement(name="wrappedList")
     public List<String> wrappedList;
 
     @XmlAttribute(name = "doNotUseMe")