addressed comments in PR

Author: gracekarina

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

@@ -51,8 +51,9 @@ public Model deserialize(JsonParser jp, DeserializationContext ctxt)
             return model;
         } else {
             sub = node.get("type");
+            JsonNode items = node.get("items");
             Model model = null;
-            if (sub != null && "array".equals(((TextNode) sub).textValue())) {
+            if ((sub != null && "array".equals(((TextNode) sub).textValue())) || (items != null)){
                 model = Json.mapper().convertValue(node, ArrayModel.class);
             } else {
                 model = Json.mapper().convertValue(node, ModelImpl.class);

modules/swagger-core/src/test/java/io/swagger/deserialization/JsonDeserializationTest.java

@@ -2,7 +2,10 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertNotNull;
 
+import io.swagger.models.ArrayModel;
+import io.swagger.models.Model;
 import io.swagger.models.Swagger;
 import io.swagger.models.properties.ObjectProperty;
 import io.swagger.models.properties.MapProperty;
@@ -12,6 +15,7 @@
 import io.swagger.util.ResourceUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.util.Yaml;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -117,4 +121,19 @@ public void testNestedUntypedProperty() throws IOException {
         assertTrue(additionalProperties instanceof UntypedProperty);
         assertEquals(additionalProperties.getDescription(), "map value");
     }
+
+    @Test(description = "it should deserialize an array untyped")
+    public void testArrayUntypedModel() throws IOException {
+        final String json = "{\n" +
+                "   \"description\":\"top level object\",\n" +
+                "   \"items\":{}" +
+                "}";
+        final Model result = m.readValue(json, Model.class);
+        assertTrue(result instanceof ArrayModel);
+
+        final ArrayModel array = (ArrayModel) result;
+        assertEquals(array.getType(),"array");
+        assertEquals(array.getDescription(), "top level object");
+        assertNotNull(array.getItems());
+    }
 }

modules/swagger-models/src/main/java/io/swagger/models/ModelImpl.java

@@ -23,27 +23,13 @@ public class ModelImpl extends AbstractModel {
     private String description;
     private Object example;
     private Property additionalProperties;
-    private Property items;
     private String discriminator;
     @JsonProperty("default")
     private String defaultValue;
     private List<String> _enum;
     private BigDecimal minimum;
     private BigDecimal maximum;
 
-    public ModelImpl items(Property items) {
-        this.setItems(items);
-        return this;
-    }
-
-    public Property getItems() {
-        return items;
-    }
-
-    public void setItems(Property items) {
-        this.items = items;
-    }
-
     public ModelImpl _enum(List<String> value) {
         this._enum = value;
         return this;
@@ -311,9 +297,6 @@ public boolean equals(Object o) {
         if (additionalProperties != null ? !additionalProperties.equals(model.additionalProperties) : model.additionalProperties != null) {
             return false;
         }
-        if (items != null ? !items.equals(model.items) : model.items != null) {
-            return false;
-        }
         if (discriminator != null ? !discriminator.equals(model.discriminator) : model.discriminator != null) {
             return false;
         }
@@ -347,7 +330,6 @@ public int hashCode() {
         result = 31 * result + (_enum != null ? _enum.hashCode() : 0);
         result = 31 * result + (minimum != null ? minimum.hashCode() : 0);
         result = 31 * result + (maximum != null ? maximum.hashCode() : 0);
-        result = 31 * result + (items != null ? items.hashCode() : 0);
         return result;
     }
 
@@ -369,7 +351,6 @@ public Object clone() {
         cloned.defaultValue = this.defaultValue;
         cloned.minimum = this.minimum;
         cloned.maximum = this.maximum;
-        cloned.items = this.items;
 
         return cloned;
     }