Improve array management when using @parameter

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/GenericParameterService.java

@@ -270,7 +270,7 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 				LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e);
 			}
 			if (schema == null) {
-				schema = AnnotationsUtils.getArraySchema(parameterDoc.array(), components, jsonView).orElse(null);
+				schema =AnnotationsUtils.getSchema(parameterDoc.schema(), parameterDoc.array(), true, parameterDoc.array().schema().implementation(), components, jsonView).orElse(null);
 				// default value not set by swagger-core for array !
 				if (schema != null) {
 					Object defaultValue = SpringDocAnnotationsUtils.resolveDefaultValue(parameterDoc.array().arraySchema().defaultValue());

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app156/HelloController.java

@@ -0,0 +1,45 @@
+package test.org.springdoc.api.app156;
+
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static io.swagger.v3.oas.annotations.enums.ParameterIn.QUERY;
+
+@RestController
+public class HelloController {
+    @GetMapping("/hello")
+    @Parameter(name = "someEnums", in = QUERY, description = "SomeEum decs",
+           array = @ArraySchema(schema = @Schema(implementation = SomeEnum.class)))
+    @Parameter(name = "textSet", in = QUERY, description = "First decs",
+            array = @ArraySchema(schema = @Schema(implementation = String.class)))
+    @Parameter(name = "someText", in = QUERY, description = "Second decs",
+           schema = @Schema(type = "string"))
+    public String hello(@Parameter(hidden = true) User user) {
+        String forReturn = "Hello ";
+        StringBuilder stringBuilder = new StringBuilder(forReturn);
+
+        if (user.getSomeEnums() != null) {
+            for (SomeEnum some : user.getSomeEnums()) {
+                stringBuilder.append(some);
+                stringBuilder.append(" ");
+            }
+        }
+
+        if (user.getSomeText() != null) {
+            for (String text : user.getTextSet()) {
+                stringBuilder.append(text);
+                stringBuilder.append(" ");
+            }
+        }
+
+        if (user.getSomeText() != null) {
+            stringBuilder.append(user.getSomeText());
+        }
+
+        return stringBuilder.toString();
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app156/SomeEnum.java

@@ -0,0 +1,6 @@
+package test.org.springdoc.api.app156;
+
+public enum SomeEnum {
+    FIRST,
+    SECOND
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app156/SpringDocApp156Test.java

@@ -0,0 +1,34 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.api.app156;
+
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Tests Spring meta-annotations as method parameters
+ */
+public class SpringDocApp156Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app156/User.java

@@ -0,0 +1,33 @@
+package test.org.springdoc.api.app156;
+
+import java.util.Set;
+
+public class User {
+    private String someText;
+    private Set<String> textSet;
+    private Set<SomeEnum> someEnums;
+
+	public String getSomeText() {
+		return someText;
+	}
+
+	public void setSomeText(String someText) {
+		this.someText = someText;
+	}
+
+	public Set<String> getTextSet() {
+		return textSet;
+	}
+
+	public void setTextSet(Set<String> textSet) {
+		this.textSet = textSet;
+	}
+
+	public Set<SomeEnum> getSomeEnums() {
+		return someEnums;
+	}
+
+	public void setSomeEnums(Set<SomeEnum> someEnums) {
+		this.someEnums = someEnums;
+	}
+}

springdoc-openapi-webmvc-core/src/test/resources/results/app156.json

@@ -0,0 +1,72 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/hello": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "hello",
+        "parameters": [
+          {
+            "name": "someEnums",
+            "in": "query",
+            "description": "SomeEum decs",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "FIRST",
+                  "SECOND"
+                ]
+              }
+            }
+          },
+          {
+            "name": "textSet",
+            "in": "query",
+            "description": "First decs",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "someText",
+            "in": "query",
+            "description": "Second decs",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {}
+}