Merge pull request swagger-api#1935 from HugoMario/master

swagger-api#1595 added test to verify issue

Author: fehguy

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

@@ -4,6 +4,8 @@
 import static org.testng.Assert.fail;
 import static org.testng.Assert.assertEquals;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -107,6 +109,14 @@ public void testIntArray() throws Exception {
         assertEquals(prop.getType(), "array");
     }
 
+    @Test
+    public void testComplex() throws Exception {
+        final Model model = context.resolve(ComplexBean.class);
+        assertNotNull(model);
+        final Map<String, Property> props = model.getProperties();
+        assertEquals(props.size(), 6);
+    }
+
   /*
   /**********************************************************
   /* Test methods
@@ -170,4 +180,48 @@ static class StringDateMapBean {
     static class IntArrayBean {
         public int[] b;
     }
+
+
+    static class ComplexBean {
+        public String j;
+        @JsonIgnore
+        public SimpleBean simpleBean;
+
+        @JsonCreator
+        public ComplexBean(@JsonProperty("b") int b,
+                   @JsonProperty("c") long c, @JsonProperty("d") float d, @JsonProperty("e") double e,
+                   @JsonProperty("j") String j) {
+            simpleBean = new SimpleBean();
+            simpleBean.b = b;
+            simpleBean.c = c;
+            simpleBean.d = d;
+            simpleBean.e = e;
+            this.j = j;
+        }
+
+        public SimpleBean getSimpleBean() {
+            return simpleBean;
+        }
+
+        public String getA() {
+            return simpleBean.getA();
+        }
+        public int getB() {
+            return simpleBean.b;
+        }
+        public long getC() {
+            return simpleBean.c;
+        }
+        public float getD() {
+            return simpleBean.d;
+        }
+        public double getE() {
+            return simpleBean.e;
+        }
+        public String getJ() {
+            return j;
+        }
+    }
+
+
 }