Merge pull request #1296 from lugaru1234/issue1177

Fixes #1177: DefaultJaxrsScanner has been fixed

Author: fehguy

modules/swagger-jaxrs/pom.xml

@@ -139,6 +139,10 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+        </dependency>
     </dependencies>
     <properties>
         <coverage.complexity.minimum>0.29</coverage.complexity.minimum>

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

@@ -8,9 +8,7 @@
 public class DefaultJaxrsScanner extends AbstractScanner implements JaxrsScanner {
     private boolean prettyPrint = false;
 
-    public Set<Class<?>> classesFromContext(
-            Application app,
-            ServletConfig sc) {
+    public Set<Class<?>> classesFromContext(Application app, ServletConfig sc) {
         Set<Class<?>> output = new HashSet<Class<?>>();
         if (app != null) {
             Set<Class<?>> clz = app.getClasses();
@@ -20,9 +18,7 @@ public Set<Class<?>> classesFromContext(
             Set<Object> singletons = app.getSingletons();
             if (singletons != null) {
                 for (Object o : singletons) {
-                    if (o instanceof Class) {
-                        output.add((Class) o);
-                    }
+                    output.add(o.getClass());
                 }
             }
         }

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

@@ -0,0 +1,40 @@
+package io.swagger;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+import io.swagger.jaxrs.config.DefaultJaxrsScanner;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import org.testng.annotations.Test;
+
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+public class DefaultJaxrsScannerTest {
+
+    @Test(description = "should return singletones")
+    public void classesFromContextTest() {
+        Application app = mock(Application.class);
+        Set<Object> singletons = Sets.newHashSet(new io.swagger.jaxrs.listing.ApiListingResource(), new DefaultJaxrsScannerTest());
+
+        when(app.getClasses()).thenReturn(null);
+        when(app.getSingletons()).thenReturn(singletons);
+
+        DefaultJaxrsScanner scanner = new DefaultJaxrsScanner();
+        Set<Class<?>> output = scanner.classesFromContext(app, null);
+
+        Set<Class<?>> classes = Sets.newHashSet(Iterables.transform(singletons, new Function<Object, Class<?>>() {
+            @Override
+            public Class<?> apply(Object o) {
+                return o.getClass();
+            }
+        }));
+
+        assertEquals(output, classes);
+    }
+}

pom.xml

@@ -507,6 +507,12 @@
                 <version>${testng-version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>${mockito-version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
@@ -558,6 +564,7 @@
 
         <junit-version>4.8.2</junit-version>
         <testng-version>6.9.4</testng-version>
+        <mockito-version>1.9.5</mockito-version>
         <surefire-version>2.18.1</surefire-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.2.1</commons-lang-version>