Merge pull request #1297 from mwinkels/patch-2

fehguy · fehguy · commit 253bd9bdd891 · 2015-07-29T22:29:05.000-07:00
Allow VendorExtensions to process @context params
diff --git a/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/ParameterProcessor.java b/modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/ParameterProcessor.java
@@ -35,7 +35,7 @@ public class ParameterProcessor {
 
     public static Parameter applyAnnotations(Swagger swagger, Parameter parameter, Type type, List<Annotation> annotations) {
         final AnnotationsHelper helper = new AnnotationsHelper(annotations);
-        if (helper.isContext()) {
+        if (helper.isContext() && parameter.getVendorExtensions().isEmpty()) {
             return null;
         }
         final ParamWrapper<?> param = helper.getApiParam();

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class ParameterProcessor {`
`35`	`35`
`36`	`36`	`public static Parameter applyAnnotations(Swagger swagger, Parameter parameter, Type type, List<Annotation> annotations) {`
`37`	`37`	`final AnnotationsHelper helper = new AnnotationsHelper(annotations);`
`38`		`- if (helper.isContext()) {`
	`38`	`+ if (helper.isContext() && parameter.getVendorExtensions().isEmpty()) {`
`39`	`39`	`return null;`
`40`	`40`	`}`
`41`	`41`	`final ParamWrapper<?> param = helper.getApiParam();`