Merge pull request #2409 from clovis-guillemot/bugfix/1847-xmlattribute-not-parsed

fix 1847-XmlAttribute are not parsed when XmlAccessType.NONE

Author: frantuma

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

@@ -22,6 +22,7 @@
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchema;
@@ -627,7 +628,7 @@ protected boolean ignore(final Annotated member, final XmlAccessorType xmlAccess
             return false;
         }
         if (xmlAccessorTypeAnnotation.value().equals(XmlAccessType.NONE)) {
-            if (!member.hasAnnotation(XmlElement.class)) {
+            if (!member.hasAnnotation(XmlElement.class) && !member.hasAnnotation(XmlAttribute.class)) {
                 return true;
             }
         }

modules/swagger-core/src/test/java/io/swagger/jackson/XMLInfoTest.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -77,10 +78,25 @@ public void testReadingXmlAccessorTypeNone() throws Exception {
         assertNotNull(xml);
         assertEquals(xml.getName(), "xmlDecoratedBean");
 
-        final Property property = impl.getProperties().get("a");
-        assertNotNull(property);
+        assertNotNull(impl.getProperties().get("a"));
 
         assertNull(impl.getProperties().get("b"));
+
+        assertNotNull(impl.getProperties().get("c"));
+    }
+
+    @XmlRootElement(name = "xmlDecoratedBean")
+    @XmlAccessorType(XmlAccessType.NONE)
+    @ApiModel
+    static class XmlDecoratedBeanXmlAccessorNone {
+
+        @XmlElement
+        public int a;
+
+        public String b;
+
+        @XmlAttribute
+        public String c;
     }
 
     @Test
@@ -102,17 +118,6 @@ public void testReadingXmlAccessorTypePublic() throws Exception {
         assertNotNull(propertyB);
     }
 
-    @XmlRootElement(name = "xmlDecoratedBean")
-    @XmlAccessorType(XmlAccessType.NONE)
-    @ApiModel
-    static class XmlDecoratedBeanXmlAccessorNone {
-
-        @XmlElement
-        public int a;
-
-        public String b;
-    }
-
     @XmlRootElement(name = "xmlDecoratedBean")
     @ApiModel
     static class XmlDecoratedBeanXmlAccessorPublic {