Merge pull request #1142 from csuich2/develop_2.0

Fix for #1141 - SpecFilter.filterDefinitions() throwing NPE

Author: webron

modules/swagger-core/src/main/java/io/swagger/core/filter/SpecFilter.java

@@ -66,17 +66,21 @@ public Map<String, Model> filterDefinitions(SwaggerSpecFilter filter, Map<String
         for (String key : definitions.keySet()) {
             Model definition = definitions.get(key);
             Map<String, Property> clonedProperties = new LinkedHashMap<String, Property>();
-            for (String propName : definition.getProperties().keySet()) {
-                Property property = definition.getProperties().get(propName);
-                if (property != null) {
-                    boolean shouldInclude = filter.isPropertyAllowed(definition, property, propName, params, cookies, headers);
-                    if (shouldInclude) {
-                        clonedProperties.put(propName, property);
+            if (definition.getProperties() != null) {
+                for (String propName : definition.getProperties().keySet()) {
+                    Property property = definition.getProperties().get(propName);
+                    if (property != null) {
+                        boolean shouldInclude = filter.isPropertyAllowed(definition, property, propName, params, cookies, headers);
+                        if (shouldInclude) {
+                            clonedProperties.put(propName, property);
+                        }
                     }
                 }
             }
             Model clonedModel = (Model) definition.clone();
-            clonedModel.getProperties().clear();
+            if (clonedModel.getProperties() != null) {
+                clonedModel.getProperties().clear();
+            }
             clonedModel.setProperties(clonedProperties);
             clonedDefinitions.put(key, clonedModel);
         }

modules/swagger-core/src/test/scala/filter/SpecFilterTest.scala

@@ -1,12 +1,12 @@
 package filter
 
 import io.swagger.core.filter.SpecFilter
-import io.swagger.models.Swagger
+import io.swagger.models.{ModelImpl, Swagger}
 import io.swagger.util.Json
 import matchers.SerializationMatchers._
 import org.junit.runner.RunWith
-import org.scalatest.{FlatSpec, Matchers}
 import org.scalatest.junit.JUnitRunner
+import org.scalatest.{FlatSpec, Matchers}
 
 import scala.collection.JavaConverters._
 import scala.io.Source
@@ -93,4 +93,18 @@ class SpecFilterTest extends FlatSpec with Matchers {
       }
     }
   }
-}
+
+  it should "filter models where some fields have no properties" in {
+    val modelName = "Array"
+    val model = new ModelImpl().`type`(ModelImpl.OBJECT).name(modelName)
+
+    val swagger = new Swagger()
+    swagger.addDefinition(modelName, model)
+
+    val filtered = new SpecFilter().filterDefinitions(new NoOpOperationsFilter(), swagger.getDefinitions,
+      null, null, null)
+
+    if (filtered.size() != 1)
+      fail("ModelImpl with no properties failed to filter")
+  }
+}