Merge pull request #1237 from jacob-meacham/bugfix/1212-deprecated

Fixes #1212: Deprecated annotations are now read from the class hiera…

Author: webron

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.google.common.collect.Collections2;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -61,6 +62,7 @@
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.RefProperty;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,6 +73,7 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -832,7 +835,7 @@ private Operation parseMethod(Method method, List<Parameter> globalParameters) {
                 }
             }
         }
-        if (method.getAnnotation(Deprecated.class) != null) {
+        if (getAnnotation(method, Deprecated.class) != null) {
             operation.setDeprecated(true);
         }
 

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

@@ -194,6 +194,13 @@ class ReaderTest extends FlatSpec with Matchers {
     swagger.getPaths().get("/testDeprecated").getGet().isDeprecated() should equal(true)
     swagger.getPaths().get("/testAllowed").getGet.isDeprecated() should be(null)
   }
+  
+  it should "scan Deprecated annotation from interfaceResource" in {
+    val reader = new Reader(new Swagger())
+    val swagger = reader.read(classOf[DescendantResource])
+    var deprecatedMethod = swagger.getPaths().get("/pet/deprecated/{petId7}").getGet
+    deprecatedMethod.isDeprecated() should equal(true)
+  }
 
   it should "scan empty path annotation" in {
     val reader = new Reader(new Swagger())

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

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

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

@@ -32,4 +32,16 @@ Response methodFromInterface(
             @ApiResponse(code = 404, message = "Pet not found")})
     Response methodFromInterface(
             @ApiParam(value = "Method to check ArrayIndexOutOfBoundsException") @PathParam("petId6") Number petId, String str);
+
+    @GET
+    @Path("/deprecated/{petId7}")
+    @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")})
+    @Deprecated
+    Response deprecatedMethodFromInterface(
+            @ApiParam(value = "ID of pet to return") @PathParam("petId7") Number petId);
 }