Merge pull request #1710 from frantuma/issue-1707

Fix #1707 - Fix NPE in case of model with no props
swagger-api · Mar 10, 2016 · ac95489 · ac95489
2 parents aa2acce + fc9fb46
commit ac95489
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/modules/swagger-core/src/main/java/io/swagger/core/filter/SpecFilter.java b/modules/swagger-core/src/main/java/io/swagger/core/filter/SpecFilter.java
@@ -170,11 +170,12 @@ private Swagger removeBrokenReferenceDefinitions (Swagger swagger) {
 
     private void locateNestedReferencedDefinitions (Model m, Set<String> referencedDefinitions) {
 
+        if (m.getProperties() == null) return;
         for (String keyProp: m.getProperties().keySet()) {
             Property p = m.getProperties().get(keyProp);
             if (p instanceof ArrayProperty) {
                 ArrayProperty ap = (ArrayProperty) p;
-                if (ap.getItems() instanceof RefProperty) {
+                if (ap.getItems() != null && ap.getItems() instanceof RefProperty) {
                     RefProperty rp = (RefProperty) ap.getItems();
                     String simpleRef = rp.getSimpleRef();
                     referencedDefinitions.add(simpleRef);

diff --git a/modules/swagger-core/src/test/java/io/swagger/filter/SpecFilterTest.java b/modules/swagger-core/src/test/java/io/swagger/filter/SpecFilterTest.java
@@ -120,16 +120,19 @@ public void filterAwayBrokenReferenceModelProperties() throws IOException {
         final Swagger swagger = getSwagger("specFiles/paramAndResponseRef.json");
 
         assertNotNull(swagger.getDefinitions().get("Order"));
+        assertNotNull(swagger.getDefinitions().get("NoPropertiesModel"));
 
         final NoOpOperationsFilter noOpfilter = new NoOpOperationsFilter();
         Swagger filtered = new SpecFilter().filter(swagger, noOpfilter, null, null, null);
 
         assertNotNull(filtered.getDefinitions().get("Order"));
+        assertNotNull(swagger.getDefinitions().get("NoPropertiesModel"));
 
         final RemoveUnreferencedDefinitionsFilter refFilter = new RemoveUnreferencedDefinitionsFilter();
         filtered = new SpecFilter().filter(swagger, refFilter, null, null, null);
 
         assertNull(filtered.getDefinitions().get("Order"));
+        assertNull(filtered.getDefinitions().get("NoPropertiesModel"));
 
     }
 

diff --git a/modules/swagger-core/src/test/resources/specFiles/paramAndResponseRef.json b/modules/swagger-core/src/test/resources/specFiles/paramAndResponseRef.json
@@ -213,6 +213,8 @@
           "format": "date-time"
         }
       }
+    },
+    "NoPropertiesModel": {
     }
   }
 }