Merge branch 'master' of github.com:swagger-api/swagger-core

Author: fehguy

modules/swagger-core/src/main/java/io/swagger/util/ReflectionUtils.java

@@ -145,7 +145,7 @@ public static boolean isConstructorCompatible(Constructor<?> constructor) {
      * @return list of Fields
      */
     public static List<Field> getDeclaredFields(Class<?> cls) {
-        if (cls.equals(Object.class)) {
+        if (cls == null || Object.class.equals(cls)) {
             return Collections.emptyList();
         }
         final List<Field> fields = new ArrayList<Field>();

modules/swagger-core/src/test/java/io/swagger/ReflectionUtilsTest.java

@@ -3,6 +3,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.reflection.Child;
+import io.swagger.reflection.IParent;
 import io.swagger.reflection.Parent;
 import io.swagger.util.ReflectionUtils;
 
@@ -12,6 +13,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Arrays;
+import java.util.Collections;
 
 import javax.ws.rs.Path;
 
@@ -114,4 +116,10 @@ public void testDerivedAnnotation() {
         Assert.assertNotNull(annotation);
         Assert.assertEquals(annotation.value(), "parentInterfacePath");
     }
+
+    @Test
+    public void getDeclaredFieldsFromInterfaceTest() throws NoSuchMethodException {
+        final Class cls = IParent.class;
+        Assert.assertEquals(Collections.emptyList(), ReflectionUtils.getDeclaredFields(cls));
+    }
 }

modules/swagger-jaxrs/src/test/java/io/swagger/SimpleScannerTest.java

@@ -52,6 +52,7 @@
 import io.swagger.resources.SimpleResourceWithoutAnnotations;
 import io.swagger.resources.SimpleSelfReferencingSubResource;
 import io.swagger.resources.TaggedResource;
+import io.swagger.resources.NicknamedOperation;
 
 import org.testng.annotations.Test;
 
@@ -337,7 +338,7 @@ public void scanSimpleSelfReferencingSubResource() {
         retrieve = getGet(swagger, "/sub/recurse2");
         assertNotNull(retrieve);
         assertEquals(retrieve.getParameters().size(), 0);
-}
+    }
 
     @Test(description = "scan resource with ApiOperation.code() value")
     public void scanResourceWithApiOperationCodeValue() {
@@ -527,4 +528,17 @@ public void checkResponseModelsProcessing() {
             }
         }
     }
+
+    @Test(description = "scan a resource with custom operation nickname")
+    public void scanResourceWithApiOperationNickname() {
+        Swagger swagger = getSwagger(NicknamedOperation.class);
+        assertEquals(swagger.getPaths().size(), 1);
+
+        assertNotNull(swagger.getPaths().get("/external/info"));
+
+        Operation op = swagger.getPaths().get("/external/info").getGet();
+        assertNotNull(op);
+
+        assertEquals(op.getOperationId(), "getMyNicknameTest");
+    }
 }

modules/swagger-jaxrs/src/test/java/io/swagger/resources/NicknamedOperation.java

@@ -0,0 +1,20 @@
+package io.swagger.resources;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+
+@Api(value = "/external/info/")
+@Path("external/info/")
+public class NicknamedOperation {
+    @ApiOperation(value = "test", nickname = "getMyNicknameTest")
+    @GET
+    public Response.Status getTest(@ApiParam(value = "test") ArrayList<String> tenantId) {
+        return Response.Status.OK;
+    }
+}