Add support for XmlSchema annotation during model generation

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

@@ -67,13 +67,14 @@
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
 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.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchema;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -2013,10 +2014,18 @@ protected Discriminator resolveDiscriminator(JavaType type, ModelConverterContex
     }
 
     protected XML resolveXml(Annotated a, Annotation[] annotations, io.swagger.v3.oas.annotations.media.Schema schema) {
-        // if XmlRootElement annotation, construct an Xml object and attach it to the model
+        // if XmlRootElement annotation, construct a Xml object and attach it to the model
         XmlRootElement rootAnnotation = null;
+        XmlSchema xmlSchema = null;
         if (a != null) {
             rootAnnotation = a.getAnnotation(XmlRootElement.class);
+            Class<?> rawType = a.getRawType();
+            if (rawType != null) {
+                Package aPackage = rawType.getPackage();
+                if (aPackage != null) {
+                    xmlSchema = aPackage.getAnnotation(XmlSchema.class);
+                }
+            }
         }
         if (rootAnnotation == null) {
             if (annotations != null) {
@@ -2028,16 +2037,25 @@ protected XML resolveXml(Annotated a, Annotation[] annotations, io.swagger.v3.oa
                 }
             }
         }
+
         if (rootAnnotation != null && !"".equals(rootAnnotation.name()) && !JAXB_DEFAULT.equals(rootAnnotation.name())) {
             XML xml = new XML().name(rootAnnotation.name());
-            if (rootAnnotation.namespace() != null && !"".equals(rootAnnotation.namespace()) && !JAXB_DEFAULT.equals(rootAnnotation.namespace())) {
+            if (xmlSchema != null && isNonTrivialXmlNamespace(xmlSchema.namespace())) {
+                xml.namespace(xmlSchema.namespace());
+            }
+            // Let XmlRootElement overwrite global XmlSchema namespace if present
+            if (isNonTrivialXmlNamespace(rootAnnotation.namespace())) {
                 xml.namespace(rootAnnotation.namespace());
             }
             return xml;
         }
         return null;
     }
 
+    private boolean isNonTrivialXmlNamespace(String namespace) {
+        return namespace != null && !"".equals(namespace) && !JAXB_DEFAULT.equals(namespace);
+    }
+
     protected Set<String> resolveIgnoredProperties(Annotations a, Annotation[] annotations) {
 
         Set<String> propertiesToIgnore = new HashSet<>();

modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/xmltest/NestedModelWithJAXBAnnotations.java

@@ -0,0 +1,21 @@
+package io.swagger.v3.core.oas.models.xmltest;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+@XmlRootElement(name = "RootName")
+public class NestedModelWithJAXBAnnotations {
+    @XmlAttribute
+    public String id;
+
+    @XmlElement(name = "named")
+    public String name;
+
+    @XmlElement(name = "SubName")
+    public SubModelWithJAXBAnnotations subName;
+}

modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/xmltest/SubModelWithJAXBAnnotations.java

@@ -0,0 +1,16 @@
+package io.swagger.v3.core.oas.models.xmltest;
+
+import javax.xml.bind.annotation.*;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SubType", propOrder = {
+        "id",
+        "name"
+})
+public class SubModelWithJAXBAnnotations {
+    @XmlAttribute
+    public String id;
+
+    @XmlElement
+    public String name;
+}

modules/swagger-core/src/test/java/io/swagger/v3/core/oas/models/xmltest/package-info.java

@@ -0,0 +1,5 @@
+@javax.xml.bind.annotation.XmlSchema(
+        namespace = "https://www.openapis.org/test/nested",
+        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
+)
+package io.swagger.v3.core.oas.models.xmltest;

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/XmlModelTest.java

@@ -4,6 +4,7 @@
 import io.swagger.v3.core.oas.models.Address;
 import io.swagger.v3.core.oas.models.Issue534;
 import io.swagger.v3.core.oas.models.ModelWithJAXBAnnotations;
+import io.swagger.v3.core.oas.models.xmltest.NestedModelWithJAXBAnnotations;
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.XML;
@@ -106,6 +107,48 @@ public void processModelWithJAXBAnnotations() {
         }
     }
 
+    @Test(description = "it should process a nested model with JAXB annotations and a namespace")
+    public void processModelWithJAXBAnnotationsAndNamespace() {
+        final Map<String, Schema> schemas = ModelConverters.getInstance().readAll(NestedModelWithJAXBAnnotations.class);
+        assertEquals(schemas.size(), 2);
+
+        final Schema model = schemas.get("NestedModelWithJAXBAnnotations");
+        assertNotNull(model);
+        assertTrue(model instanceof Schema);
+
+        final XML rootXml = model.getXml();
+        assertNotNull(rootXml);
+        assertEquals(rootXml.getName(), "RootName");
+        assertEquals(rootXml.getNamespace(), "https://www.openapis.org/test/nested");
+
+        Map<String, Schema> props = model.getProperties();
+        for (Map.Entry<String, Schema> entry : props.entrySet()) {
+            final String name = entry.getKey();
+            final Schema property = entry.getValue();
+            if ("id".equals(name)) {
+                final XML xml = property.getXml();
+                assertNotNull(xml);
+                assertNull(xml.getName());
+                assertTrue(xml.getAttribute());
+                assertNull(xml.getWrapped());
+            } else if ("name".equals(name)) {
+                final XML xml = property.getXml();
+                assertNotNull(xml);
+                assertEquals(xml.getName(), "named");
+                assertNull(xml.getAttribute());
+                assertNull(xml.getWrapped());
+            } else if ("subName".equals(name)) {
+                final XML xml = property.getXml();
+                assertNotNull(xml);
+                assertEquals(xml.getName(), "SubName");
+                assertNull(xml.getAttribute());
+                assertNull(xml.getWrapped());
+            } else {
+                fail(String.format("Unexpected property: %s", name));
+            }
+        }
+    }
+
     @Test(description = "it should deserialize a model")
     public void deserializeModel() throws IOException {
         final String yaml = "---\n" +