Merge pull request swagger-api#2468 from ChristianCiach/issue2466_2.0

swagger-api#2466 retain generic types for attributes of BeanParam
stbischof · Oct 10, 2017 · f3a55f3 · f3a55f3
2 parents 18c91c9 + 85d8d2f
commit f3a55f3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/modules/swagger-jaxrs2/src/main/java/io/swagger/jaxrs2/DefaultParameterExtension.java b/modules/swagger-jaxrs2/src/main/java/io/swagger/jaxrs2/DefaultParameterExtension.java
@@ -114,7 +114,7 @@ private void handleAdditionalAnnotation(List<Parameter> parameters, Annotation a
 
                 // Gather the field's details
                 if (field != null) {
-                    paramType = field.getRawType();
+                	paramType = field.getType();
 
                     for (final Annotation fieldAnnotation : field.annotations()) {
                         if (!paramAnnotations.contains(fieldAnnotation)) {
@@ -127,7 +127,8 @@ private void handleAdditionalAnnotation(List<Parameter> parameters, Annotation a
                 if (setter != null) {
                     // Do not set the param class/type from the setter if the values are already identified
                     if (paramType == null) {
-                        paramType = setter.getRawParameterTypes() != null ? setter.getRawParameterTypes()[0] : null;
+                    	// paramType will stay null if there is no parameter
+                    	paramType = setter.getParameterType(0); 
                     }
 
                     for (final Annotation fieldAnnotation : setter.annotations()) {
@@ -141,7 +142,7 @@ private void handleAdditionalAnnotation(List<Parameter> parameters, Annotation a
                 if (getter != null) {
                     // Do not set the param class/type from the getter if the values are already identified
                     if (paramType == null) {
-                        paramType = getter.getRawReturnType();
+                        paramType = getter.getType();
                     }
 
                     for (final Annotation fieldAnnotation : getter.annotations()) {