updated tag support for #841

Author: fehguy

modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java

@@ -82,7 +82,7 @@ public Swagger read(Class cls) {
     }
 
     if(api != null) {
-      List<String> tagStrings = new ArrayList<String>();
+      Set<String> tagStrings = new HashSet<String>();
       // the value will be used as a tag for 2.0 UNLESS a Tags annotation is present
       com.wordnik.swagger.annotations.Tag[] tags = api.tags();
       boolean hasExplicitTags = false;
@@ -155,6 +155,27 @@ public Swagger read(Class cls) {
             break;
 
           Operation operation = parseMethod(method);
+
+          ApiOperation op = (ApiOperation) method.getAnnotation(ApiOperation.class);
+          if(op != null) {
+            com.wordnik.swagger.annotations.Tag[] operationTags = op.tags();
+            boolean hasExplicitTag = false;
+            for(com.wordnik.swagger.annotations.Tag tag : operationTags) {
+              if(!"".equals(tag.value())) {
+                operation.tag(tag.value());
+                if(!tagStrings.contains(tag.value())) {
+                  Tag tagObject = new Tag()
+                    .name(tag.value())
+                    .description(tag.description());
+
+                  if(tag.externalDocs() != null && !"".equals(tag.externalDocs().value()))
+                    tagObject.externalDocs(
+                      new ExternalDocs(tag.externalDocs().value(), tag.externalDocs().url()));
+                  swagger.tag(tagObject);
+                }
+              }
+            }
+          }
           if(operation != null) {
             if(operation.getConsumes() == null)
               for(String mediaType: apiConsumes)
@@ -163,8 +184,10 @@ public Swagger read(Class cls) {
               for(String mediaType: apiProduces)
                 operation.produces(mediaType);
 
-            for(String tagString : tagStrings)
-              operation.tag(tagString);
+            if(operation.getTags() == null) {
+              for(String tagString : tagStrings)
+                operation.tag(tagString);
+            }
             for(SecurityRequirement security : securities)
               operation.security(security);
             Path path = swagger.getPath(operationPath);
@@ -198,6 +221,8 @@ String getPath(javax.ws.rs.Path classLevelPath, javax.ws.rs.Path methodLevelPath
       b.append(methodPath);
     }
     String output = b.toString();
+    if(!output.startsWith("/"))
+      output = "/" + output;
     if(output.endsWith("/") && output.length() > 1)
       return output.substring(0, output.length() - 1);
     else
@@ -217,9 +242,11 @@ public Operation parseMethod(Method method) {
     if(apiOperation != null) {
       if(!"".equals(apiOperation.nickname()))
         operationId = method.getName();
+
       operation
         .summary(apiOperation.value())
         .description(apiOperation.notes());
+
       if(apiOperation.response() != null && !Void.class.equals(apiOperation.response())) {
         responseClass = apiOperation.response();
       }

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

@@ -8,6 +8,8 @@ import com.wordnik.swagger.models.Swagger
 import com.wordnik.swagger.jaxrs.Reader
 import com.wordnik.swagger.util.Json
 
+import scala.collection.JavaConverters._
+
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
@@ -81,7 +83,6 @@ class SimpleScannerTest extends FlatSpec with Matchers {
   it should "scan a resource with Response.Status return type per 877" in {
     val swagger = new Reader(new Swagger()).read(classOf[Resource877])
     val path = swagger.getPaths().get("external/info")
-    Json.prettyPrint(swagger)
 
     swagger.getTags() should not be (null)
     swagger.getTags().size() should be (1)
@@ -90,15 +91,30 @@ class SimpleScannerTest extends FlatSpec with Matchers {
     tag.getName() should equal ("externalinfo")
     tag.getDescription() should equal ("it's an api")
     tag.getExternalDocs() should be (null)
+  }
 
+  it should "scan a resource with tags" in {
+    val swagger = new Reader(new Swagger()).read(classOf[TaggedResource])
     Json.prettyPrint(swagger)
   }
 }
 
 @RunWith(classOf[JUnitRunner])
 class SimpleScannerTest2 extends FlatSpec with Matchers {
   it should "scan a resource with tags" in {
-    val swagger = new Reader(new Swagger()).read(classOf[TaggedResource])
-    Json.prettyPrint(swagger)
+    val swagger = new Reader(new Swagger()).read(classOf[Resource841])
+    swagger.getTags().size() should be (3)
+
+    val rootTags = swagger.getPaths().get("/fun").getGet().getTags()
+    rootTags.size() should be (2)
+    (rootTags.asScala.toList.toSet & Set("tag1", "tag2")).size should be (2)
+
+    val thisTags = swagger.getPaths().get("/fun/this").getGet().getTags()
+    thisTags.size() should be (1)
+    (thisTags.asScala.toList.toSet & Set("tag1")).size should be (1)
+
+    val thatTags = swagger.getPaths().get("/fun/that").getGet().getTags()
+    thatTags.size() should be (1)
+    (thatTags.asScala.toList.toSet & Set("tag2")).size should be (1)
   }
 }

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

@@ -0,0 +1,34 @@
+package resources;
+
+import com.wordnik.swagger.annotations.*;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import java.util.*;
+
+@Api(value = "/external/info/")
+@Path("fun")
+public class Resource841 {
+  @ApiOperation(value="this", tags={@Tag(value = "tag1", description = "the tag 1")})
+  @GET
+  @Path("/this")
+  public Response getThis(@ApiParam(value = "test") ArrayList<String> tenantId) {
+    return Response.ok().build();
+  }
+
+  @ApiOperation(value="that", tags={@Tag(value = "tag2", description = "the tag 2")})
+  @GET
+  @Path("/that")
+  public Response getThat(@ApiParam(value = "test") ArrayList<String> tenantId) {
+    return Response.ok().build();
+  }
+
+  @ApiOperation(value="everything", tags={
+    @Tag(value = "tag1", description = "the tag 1"),
+    @Tag(value = "tag2", description = "the tag 2")})
+  @GET
+  public Response getEverything(@ApiParam(value = "test") ArrayList<String> tenantId) {
+    return Response.ok().build();
+  }
+}