Merge pull request #2246 from packleader/master

Get namespace from package-info #2150

Author: fehguy

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

@@ -56,6 +56,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchema;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
@@ -273,6 +274,16 @@ public Model resolve(JavaType type, ModelConverterContext context, Iterator<Mode
             if (rootAnnotation.namespace() != null && !"".equals(rootAnnotation.namespace()) && !"##default".equals(rootAnnotation.namespace())) {
                 xml.namespace(rootAnnotation.namespace());
             }
+            else {
+                // If namespace was not given in the annotation, look for it in package-info
+                Package pkg = type.getRawClass().getPackage();
+                if(pkg != null) {
+                    XmlSchema xmlSchma = pkg.getAnnotation(XmlSchema.class);
+                    if(xmlSchma != null) {
+                        xml.namespace(xmlSchma.namespace());
+                    }
+                }
+            }
             model.xml(xml);
         }
         final XmlAccessorType xmlAccessorTypeAnnotation = beanDesc.getClassAnnotations().get(XmlAccessorType.class);

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

@@ -0,0 +1,54 @@
+package io.swagger.jackson;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.converter.ModelConverterContextImpl;
+import io.swagger.models.Link;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.Xml;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import static org.testng.Assert.*;
+
+public class ModelResolverTest extends SwaggerTestBase {
+
+    @Test(dataProvider = "testXmlNamespaceData")
+    public void testXmlNamespace(Class clazz, String name, String namespace) throws Exception {
+        final ObjectMapper mapper = mapper();
+        final ModelResolver modelResolver = new ModelResolver(mapper);
+        final ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
+
+        final JavaType javaType = mapper.constructType(clazz);
+
+        final Model model = modelResolver.resolve(javaType, context, null);
+
+        assertTrue(model instanceof ModelImpl);
+
+        final Xml xml = ((ModelImpl) model).getXml();
+        assertNotNull(xml);
+        assertEquals(xml.getName(), name);
+        assertEquals(xml.getNamespace(), namespace);
+    }
+
+    @DataProvider
+    private Object[][] testXmlNamespaceData() {
+        return new Object[][]{
+                {Link.class, "link", null},
+                {TypeWithNamespace.class, "TypeWithNamespace", "http://io.swagger/jackson"},
+                {TypeWithoutNamespace.class, "TypeWithOutNamespace", "http://io.swagger/jackson/package"}
+        };
+    }
+
+    @XmlRootElement(name = "TypeWithNamespace", namespace = "http://io.swagger/jackson")
+    public static class TypeWithNamespace {
+    }
+
+    @XmlRootElement(name = "TypeWithOutNamespace")
+    public static class TypeWithoutNamespace {
+    }
+
+}

modules/swagger-core/src/test/java/io/swagger/jackson/package-info.java

@@ -0,0 +1,2 @@
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://io.swagger/jackson/package")
+package io.swagger.jackson;