support multiple ApiImplicitParameters

ileler · ileler · commit 708a2c582d3d · 2019-07-31T14:32:31.000+08:00
diff --git a/springfox-swagger-common/src/main/java/springfox/documentation/swagger/readers/operation/OperationImplicitParametersReader.java b/springfox-swagger-common/src/main/java/springfox/documentation/swagger/readers/operation/OperationImplicitParametersReader.java
@@ -59,12 +59,16 @@ public boolean supports(DocumentationType delimiter) {
   }
 
   private List<Parameter> readParameters(OperationContext context) {
-    Optional<ApiImplicitParams> annotation = context.findAnnotation(ApiImplicitParams.class);
+    List<Optional<ApiImplicitParams>> annotations = context.findAllAnnotations(ApiImplicitParams.class);
 
     List<Parameter> parameters = new ArrayList<>();
-    if (annotation.isPresent()) {
-      for (ApiImplicitParam param : annotation.get().value()) {
-        parameters.add(OperationImplicitParameterReader.implicitParameter(descriptions, param));
+    if (annotations != null && !annotations.isEmpty()) {
+      for (Optional<ApiImplicitParams> annotation : annotations) {
+        if (annotation.isPresent()) {
+          for (ApiImplicitParam param : annotation.get().value()) {
+            parameters.add(OperationImplicitParameterReader.implicitParameter(descriptions, param));
+          }
+        }
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,16 @@ public boolean supports(DocumentationType delimiter) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`private List<Parameter> readParameters(OperationContext context) {`
`62`		`- Optional<ApiImplicitParams> annotation = context.findAnnotation(ApiImplicitParams.class);`
	`62`	`+ List<Optional<ApiImplicitParams>> annotations = context.findAllAnnotations(ApiImplicitParams.class);`
`63`	`63`
`64`	`64`	`List<Parameter> parameters = new ArrayList<>();`
`65`		`- if (annotation.isPresent()) {`
`66`		`- for (ApiImplicitParam param : annotation.get().value()) {`
`67`		`- parameters.add(OperationImplicitParameterReader.implicitParameter(descriptions, param));`
	`65`	`+ if (annotations != null && !annotations.isEmpty()) {`
	`66`	`+ for (Optional<ApiImplicitParams> annotation : annotations) {`
	`67`	`+ if (annotation.isPresent()) {`
	`68`	`+ for (ApiImplicitParam param : annotation.get().value()) {`
	`69`	`+ parameters.add(OperationImplicitParameterReader.implicitParameter(descriptions, param));`
	`70`	`+ }`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`