Merge branch 'develop_2.0' into relative-refs

Author: Helmsdown

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")
+  }
+}

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/utils/ReflectionUtils.java

@@ -109,6 +109,9 @@ public static Method findMethod(Method methodToFind, Class<?> cls) {
             }
             Class<?>[] pt = method.getParameterTypes();
             Type[] gpt = method.getGenericParameterTypes();
+            if (pTypes.length != pt.length || gpTypes.length != gpt.length) {
+                continue;
+            }
             for (int j = 0; j < pTypes.length; j++) {
                 Class<?> parameterType = pTypes[j];
                 if (!(pt[j].equals(parameterType) || (!gpt[j].equals(gpTypes[j]) && pt[j].isAssignableFrom(parameterType)))) {

modules/swagger-jaxrs/src/test/scala/ReaderTest.scala

@@ -141,6 +141,8 @@ class ReaderTest extends FlatSpec with Matchers {
 
     val methodFromInterface = swagger.getPaths().get("/pet/{petId5}").getGet
     methodFromInterface should not equal (null)
+
+    swagger.getPaths().get("/pet/{petId6}").getGet should not equal (null)
   }
 
   it should "scan implicit params" in {

modules/swagger-jaxrs/src/test/scala/resources/DescendantResource.java

@@ -53,4 +53,9 @@ public Response overriddenMethodWithoutTypedParam(@ApiParam(value = "ID of pet t
     public Response methodFromInterface(@ApiParam(value = "ID of pet to return") Number petId) {
         return null;
     }
+
+    @Override
+    public Response methodFromInterface(@ApiParam(value = "Method to check ArrayIndexOutOfBoundsException") @PathParam("petId6") Number petId, String str) {
+        return null;
+    }
 }

modules/swagger-jaxrs/src/test/scala/resources/InterfaceResource.java

@@ -21,4 +21,15 @@ public interface InterfaceResource {
             @ApiResponse(code = 404, message = "Pet not found")})
     Response methodFromInterface(
             @ApiParam(value = "ID of pet to return") @PathParam("petId5") Number petId);
+
+    @GET
+    @Path("/{petId6}")
+    @ApiOperation(value = "Find pet by ID",
+            notes = "Returns a single pet",
+            response = String.class
+    )
+    @ApiResponses(value = {@ApiResponse(code = 400, message = "Invalid ID supplied"),
+            @ApiResponse(code = 404, message = "Pet not found")})
+    Response methodFromInterface(
+            @ApiParam(value = "Method to check ArrayIndexOutOfBoundsException") @PathParam("petId6") Number petId, String str);
 }