Merge pull request #1416 from dylanowen/master

Add vendor extensions to ArrayProperty. [241]
swagger-api · Sep 7, 2015 · 0567e01 · 0567e01
2 parents 0d59e55 + 6c0acd3
commit 0567e01
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/modules/swagger-core/src/main/java/io/swagger/util/PropertyDeserializer.java b/modules/swagger-core/src/main/java/io/swagger/util/PropertyDeserializer.java
@@ -174,7 +174,9 @@ Property propertyFromNode(JsonNode node) {
             detailNode = node.get("items");
             if (detailNode != null) {
                 Property subProperty = propertyFromNode(detailNode);
-                return new ArrayProperty().items(subProperty).description(description);
+                ArrayProperty arrayProperty = new ArrayProperty().items(subProperty).description(description);
+                arrayProperty.setVendorExtensionMap(getVendorExtensions(node));
+                return arrayProperty;
             }
         }
 

diff --git a/modules/swagger-core/src/test/java/io/swagger/util/JsonDeserializationTest.java b/modules/swagger-core/src/test/java/io/swagger/util/JsonDeserializationTest.java
@@ -4,7 +4,6 @@
 import io.swagger.models.*;
 import org.testng.annotations.Test;
 
-import java.io.File;
 import java.util.List;
 import java.util.Map;
 
@@ -122,5 +121,12 @@ public void testDeserializePropertyWithVendorExtensions() throws Exception {
         assertTrue(xBooleanValue);
 
         assertFalse(vendorExtensions.containsKey("not-an-extension"));
+
+        //check for vendor extensions in array property types
+        vendorExtensions = swagger.getDefinitions().get("Health").getProperties().get("array").getVendorExtensions();
+
+        xStringValue = (String) vendorExtensions.get("x-string-value");
+        assertNotNull(xStringValue);
+        assertEquals(xStringValue, "string_value");
     }
 }
diff --git a/modules/swagger-core/src/test/resources/specFiles/propertyWithVendorExtensions.json b/modules/swagger-core/src/test/resources/specFiles/propertyWithVendorExtensions.json
@@ -31,8 +31,15 @@
                     "x-number-value": 123,
                     "x-boolean-value": true,
                     "not-an-extension": "foobar"
+                },
+                "array": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/Health"
+                    },
+                    "x-string-value": "string_value"
                 }
             }
         }
     }
-}
+}