Fixed model with composition sample

Author: webron

fixtures/v2.0/json/models/modelWithComposition.json

@@ -1,57 +1,5 @@
 {
   "definitions": {
-    "Cat": {
-      "description": "A representation of a cat",
-      "allOf": [
-        { "$ref": "#/definitions/Pet" },
-        {
-          "properties": {
-            "huntingSkill": {
-              "type": "string",
-              "description": "The measured skill for hunting",
-              "default": "lazy",
-              "enum": ["clueless", "lazy", "adventurous", "aggressive"]
-            }
-          },
-          "required": [ "huntingSkill" ]
-        }
-      ]
-    },
-    "Dog": {
-      "description": "A representation of a dog",
-      "allOf": [
-        { "$ref": "#/definitions/Pet" },
-        {
-          "properties": {
-            "packSize": {
-              "type": "integer",
-              "format": "int32",
-              "description": "the size of the pack the dog is from",
-              "default": 0,
-              "minimum": 0
-            }
-          },
-          "required": [ "name", "packSize" ]
-        }
-      ]
-    },
-    "Fish": {
-      "description": "A representation of a fish",
-      "allOf": [
-        { "$ref": "#/definitions/Pet" },
-        {
-          "properties": {
-            "fins": {
-              "type": "integer",
-              "format": "int32",
-              "description": "count of fins",
-              "minimum": 0
-            }
-          },
-          "required": [ "fins" ]
-        }
-      ]
-    },
     "Pet": {
       "discriminator": "petType",
       "properties": {
@@ -62,7 +10,79 @@
           "type": "string"
         }
       },
-      "required": [ "name", "petType" ]
+      "required": [
+        "name",
+        "petType"
+      ]
     }
+  },
+  "Cat": {
+    "description": "A representation of a cat",
+    "allOf": [
+      {
+        "$ref": "#/definitions/Pet"
+      },
+      {
+        "properties": {
+          "huntingSkill": {
+            "type": "string",
+            "description": "The measured skill for hunting",
+            "default": "lazy",
+            "enum": [
+              "clueless",
+              "lazy",
+              "adventurous",
+              "aggressive"
+            ]
+          }
+        },
+        "required": [
+          "huntingSkill"
+        ]
+      }
+    ]
+  },
+  "Dog": {
+    "description": "A representation of a dog",
+    "allOf": [
+      {
+        "$ref": "#/definitions/Pet"
+      },
+      {
+        "properties": {
+          "packSize": {
+            "type": "integer",
+            "format": "int32",
+            "description": "the size of the pack the dog is from",
+            "default": 0,
+            "minimum": 0
+          }
+        },
+        "required": [
+          "packSize"
+        ]
+      }
+    ]
+  },
+  "Fish": {
+    "description": "A representation of a fish",
+    "allOf": [
+      {
+        "$ref": "#/definitions/Pet"
+      },
+      {
+        "properties": {
+          "fins": {
+            "type": "integer",
+            "format": "int32",
+            "description": "count of fins",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "fins"
+        ]
+      }
+    ]
   }
-}
+}