multpart/form-data single paramter cannot resolve in ui. Fixes #1185.

Author: bnasslahsen

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

@@ -336,7 +336,7 @@ private Schema calculateRequestBodySchema(Components components, ParameterInfo p
 			requestBodyInfo.getMergedSchema().addProperties(paramName, schemaN);
 			schemaN = requestBodyInfo.getMergedSchema();
 		}
-		else if (schemaN instanceof FileSchema || schemaN instanceof ArraySchema && ((ArraySchema) schemaN).getItems() instanceof FileSchema) {
+		else if (parameterInfo.isRequestPart() || schemaN instanceof FileSchema || schemaN instanceof ArraySchema && ((ArraySchema) schemaN).getItems() instanceof FileSchema) {
 			schemaN = new ObjectSchema().addProperties(paramName, schemaN);
 			requestBodyInfo.setMergedSchema(schemaN);
 		}

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

@@ -71,6 +71,11 @@ public class ParameterInfo {
 	 */
 	private String paramType;
 
+	/**
+	 * if the paramater type is RequestPart
+	 */
+	private boolean requestPart;
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(ParameterInfo.class);
 
 
@@ -280,4 +285,22 @@ private void calculateParams(RequestHeader requestHeader) {
 		this.defaultValue = requestHeader.defaultValue();
 		this.paramType = ParameterIn.HEADER.toString();
 	}
+
+	/**
+	 * Is request part boolean.
+	 *
+	 * @return the boolean
+	 */
+	public boolean isRequestPart() {
+		return requestPart;
+	}
+
+	/**
+	 * Sets request part.
+	 *
+	 * @param requestPart the request part
+	 */
+	public void setRequestPart(boolean requestPart) {
+		this.requestPart = requestPart;
+	}
 }

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

@@ -240,6 +240,7 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met
 		if (requestPart != null){
 			paramName = StringUtils.defaultIfEmpty(requestPart.value(), requestPart.name());
 			parameterInfo.setRequired(requestPart.required());
+			parameterInfo.setRequestPart(true);
 		}
 		paramName = StringUtils.defaultIfEmpty(paramName, parameterInfo.getpName());
 		parameterInfo.setpName(paramName);

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

@@ -0,0 +1,49 @@
+/*
+ *
+ *  * 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.app161;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+
+
+	@Operation(summary = "add")
+	@PostMapping(value = "/add", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	public ResponseEntity<Void> add(@Parameter(description = "content") @RequestPart(value = "content") String content) throws Exception {
+		return null;
+	}
+
+
+	@Operation(summary = "add2")
+	@PostMapping(value = "/add2", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	public ResponseEntity<Void> add2(
+			@Parameter(description = "content") @RequestPart(value = "content") String content,
+			@RequestPart(value = "type") String type
+	)  {
+		return null;
+	}
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app161/SpringDocApp161Test.java

@@ -0,0 +1,13 @@
+package test.org.springdoc.api.app161;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringDocApp161Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+
+}

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

@@ -0,0 +1,84 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/add": {
+      "post": {
+        "tags": [
+          "hello-controller"
+        ],
+        "summary": "add",
+        "operationId": "add",
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "content"
+                ],
+                "type": "object",
+                "properties": {
+                  "content": {
+                    "type": "string",
+                    "description": "content"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/add2": {
+      "post": {
+        "tags": [
+          "hello-controller"
+        ],
+        "summary": "add2",
+        "operationId": "add2",
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "required": [
+                  "content",
+                  "type"
+                ],
+                "type": "object",
+                "properties": {
+                  "content": {
+                    "type": "string",
+                    "description": "content"
+                  },
+                  "type": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  },
+  "components": {}
+}