Merge pull request #1270 from maxime-morand/develop_2.0

Fixes swagger-api/swagger-codegen#980 : Allowing inheritance without additonal properties

Author: webron

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

@@ -31,20 +31,22 @@ public Model deserialize(JsonParser jp, DeserializationContext ctxt)
             // we only support one parent, no multiple inheritance or composition
             model = Json.mapper().convertValue(node, ComposedModel.class);
             List<Model> allComponents = model.getAllOf();
-            if (allComponents.size() >= 2) {
+            if (allComponents.size() >= 1) {
                 model.setParent(allComponents.get(0));
-                model.setChild(allComponents.get(allComponents.size() - 1));
-            }
-            if (allComponents.size() >= 2) {
-                List<RefModel> interfaces = new ArrayList<RefModel>();
-                int size = allComponents.size();
-                for (Model m : allComponents.subList(1, size - 1)) {
-                    if (m instanceof RefModel) {
-                        RefModel ref = (RefModel) m;
-                        interfaces.add(ref);
-                    }
-                }
-                model.setInterfaces(interfaces);
+                if (allComponents.size() >= 2) {
+	            	model.setChild(allComponents.get(allComponents.size() - 1));
+	                List<RefModel> interfaces = new ArrayList<RefModel>();
+	                int size = allComponents.size();
+	                for (Model m : allComponents.subList(1, size - 1)) {
+	                    if (m instanceof RefModel) {
+	                        RefModel ref = (RefModel) m;
+	                        interfaces.add(ref);
+	                    }
+	                }
+	                model.setInterfaces(interfaces);
+	            } else {
+	            	model.setChild(new ModelImpl());
+	            }
             }
             return model;
         } else {