fix for #1098, #1011, all / recursive scanning of packages

Author: fehguy

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/BeanConfig.java

@@ -166,6 +166,8 @@ public Set<Class<?>> classes() {
     ConfigurationBuilder config = new ConfigurationBuilder();
     Set<String> acceptablePackages = new HashSet<String>();
 
+    boolean allowAllPackages = false;
+
     if(resourcePackage != null && !"".equals(resourcePackage)) {
       String[] parts = resourcePackage.split(",");
       for(String pkg : parts) {
@@ -175,6 +177,9 @@ public Set<Class<?>> classes() {
         }
       }
     }
+    else {
+      allowAllPackages = true;
+    }
 
     config.setScanners(new ResourcesScanner(), new TypeAnnotationsScanner(), new SubTypesScanner());
 
@@ -198,13 +203,21 @@ public Set<Class<?>> classes() {
 
     reader.getSwagger().setInfo(info);
     final Reflections reflections = new Reflections(config);
-	Set<Class<?>> classes = reflections.getTypesAnnotatedWith(Api.class);
+	  Set<Class<?>> classes = reflections.getTypesAnnotatedWith(Api.class);
     classes.addAll(reflections.getTypesAnnotatedWith(javax.ws.rs.Path.class));
 
     Set<Class<?>> output = new HashSet<Class<?>>();
     for(Class<?> cls : classes) {
-      if(acceptablePackages.contains(cls.getPackage().getName()))
+      if(allowAllPackages) {
         output.add(cls);
+      }
+      else {
+        for(String pkg : acceptablePackages) {
+          if(cls.getPackage().getName().startsWith(pkg)) {
+            output.add(cls);
+          }
+        }
+      }
     }
     return output;
   }

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

@@ -33,4 +33,26 @@ class BeanConfigTest extends FlatSpec with Matchers {
     val schemes = swagger.getSchemes()
     schemes.asScala.toSet should be (Set(Scheme.HTTP, Scheme.HTTPS))
   }
+
+  it should "deep scan packages per #1011" in {
+    val bc = new BeanConfig()
+    bc.setResourcePackage("com.my,org.my")
+    bc.setSchemes(List("http", "https").toArray);
+    bc.setHost("petstore.swagger.io")
+    bc.setBasePath("/api")
+    bc.setTitle("Petstore Sample API")
+    bc.setDescription("A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification")
+    bc.setTermsOfServiceUrl("http://swagger.io/terms/")
+    bc.setContact("Swagger API Team")
+    bc.setLicense("MIT")
+    bc.setLicenseUrl("http://github.com/gruntjs/grunt/blob/master/LICENSE-MIT")
+    bc.setScan(true)
+
+    val swagger = bc.getSwagger()
+    swagger should not be (null)
+    val keys = swagger.getPaths().keySet()
+    keys.asScala.toSet should be (Set("/packageA", "/packageB"))
+    val schemes = swagger.getSchemes()
+    schemes.asScala.toSet should be (Set(Scheme.HTTP, Scheme.HTTPS))
+  }
 }