Merge pull request #1264 from swagger-api/swagger-definition-scan-order-issue_1243

fixed so SwaggerDefinitions are scanned before resources to get tags …

Author: webron

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

@@ -19,7 +19,6 @@
 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;
@@ -62,7 +61,6 @@
 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;
@@ -73,7 +71,6 @@
 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;
@@ -144,6 +141,14 @@ public Swagger read(Set<Class<?>> classes) {
             }
         }
 
+        // process SwaggerDefinitions first - so we get tags in desired order
+        for (Class<?> cls : classes) {
+            SwaggerDefinition swaggerDefinition = cls.getAnnotation(SwaggerDefinition.class);
+            if (swaggerDefinition != null) {
+                readSwaggerConfig(cls, swaggerDefinition);
+            }
+        }
+
         for (Class<?> cls : classes) {
             read(cls);
         }
@@ -172,11 +177,6 @@ public Swagger read(Class<?> cls) {
     }
 
     protected Swagger read(Class<?> cls, String parentPath, String parentMethod, boolean readHidden, String[] parentConsumes, String[] parentProduces, Map<String, Tag> parentTags, List<Parameter> parentParameters) {
-        SwaggerDefinition swaggerDefinition = cls.getAnnotation(SwaggerDefinition.class);
-        if (swaggerDefinition != null) {
-            readSwaggerConfig(cls, swaggerDefinition);
-        }
-
         Api api = (Api) cls.getAnnotation(Api.class);
         Map<String, SecurityScope> globalScopes = new HashMap<String, SecurityScope>();
 

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

@@ -44,7 +44,7 @@ class ConfigAndExtensionScannerTest extends FlatSpec with Matchers {
     swagger.getSchemes().contains(Scheme.HTTP);
     swagger.getSchemes().contains(Scheme.HTTPS);
 
-    swagger.getTags().size() should be(6)
+    swagger.getTags().size() should be(7)
     swagger.getTags().get(0).getName() should be("Tag-added-before-read")
 
     swagger.getTags().get(1).getName() should be("mytag")
@@ -62,7 +62,8 @@ class ConfigAndExtensionScannerTest extends FlatSpec with Matchers {
     extensions.get("x-test") should be("value")
 
     swagger.getTags().get(4).getName() should be("externalinfo")
-    swagger.getTags().get(5).getName() should be("Tag-added-after-read")
+    swagger.getTags().get(5).getName() should be("testingtag")
+    swagger.getTags().get(6).getName() should be("Tag-added-after-read")
 
     extensions = swagger.getInfo().getVendorExtensions()
     extensions.size() should be(3)

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

@@ -52,7 +52,7 @@
 @Api(value = "/external/info/")
 @Path("who/cares")
 public class ResourceWithConfigAndExtensions implements ReaderListener {
-    @ApiOperation(value = "test.", extensions = {
+    @ApiOperation(value = "test.", tags = {"tagwithextensions", "mytag", "testingtag"}, extensions = {
             @Extension(properties = @ExtensionProperty(name = "test", value = "value"))
     })
     @GET