merged from develop

Author: fehguy

modules/swagger-jaxrs-utils/pom.xml

@@ -3,14 +3,14 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project_2.10</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.3.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-jaxrs-utils_2.10</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.4-SNAPSHOT</version>
+  <version>1.3.2</version>
   <name>swagger-jaxrs-utils</name>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -49,11 +49,11 @@
     <dependency>
       <groupId>com.wordnik</groupId>
       <artifactId>common-utils_2.10</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.6</version>
       <exclusions>
       	<exclusion>
-      		<artifactId>slf4j-log4j12</artifactId>
-      		<groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+          <groupId>org.slf4j</groupId>
       	</exclusion>
       </exclusions>
     </dependency>

modules/swagger-jersey-jaxrs/pom.xml

@@ -3,14 +3,14 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project_2.10</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-jersey-jaxrs_2.10</artifactId>
   <packaging>jar</packaging>
-  <version>1.3.1</version>
+  <version>1.3.2</version>
   <name>swagger-jersey-jaxrs</name>
   <build>
     <defaultGoal>install</defaultGoal>

modules/swagger-jersey-jaxrs/src/main/scala/com/wordnik/swagger/jersey/JerseyApiReader.scala

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory
 import javax.ws.rs._
 import core.Context
 
-import java.lang.reflect.{ Type, Field, Modifier, Method }
+import java.lang.reflect.{ ParameterizedType, Type, Field, Modifier, Method }
 import java.lang.annotation.Annotation
 
 import com.sun.jersey.core.header.FormDataContentDisposition
@@ -102,5 +102,21 @@ class JerseyApiReader extends JaxrsApiReader {
     }
     else None
   }
+
+  def findSubresourceType(method: Method): Class[_] = {
+    method.getGenericReturnType match {
+      case c: Class[_] => c
+      case pt: ParameterizedType =>
+        val typeArguments = pt.getActualTypeArguments
+        if (pt.getRawType.equals(classOf[Class[_]]) && typeArguments.length == 1)
+          typeArguments(0) match {
+            case c: Class[_] => c
+            case _ => method.getReturnType
+          }
+        else
+          method.getReturnType
+      case _ => method.getReturnType
+    }
+  }
 }