Added Support for @RequestParam for file upload #377 - Fixes #377

Author: bnasslahsen

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractParameterBuilder.java

@@ -253,6 +253,22 @@ private boolean isRequestBodySchema(RequestBodyInfo requestBodyInfo) {
 
 	protected abstract boolean isFile(JavaType ct);
 
+	public boolean isFile(java.lang.reflect.Parameter parameter) {
+		boolean result =false;
+		Type type =  parameter.getParameterizedType();
+		JavaType javaType = constructType(parameter.getType());
+		if (isFile(javaType)) {
+			result =true;
+		}
+		else if (type instanceof ParameterizedType) {
+			ParameterizedType parameterizedType = (ParameterizedType) type;
+			if (isFile(parameterizedType)) {
+				result =true;
+			}
+		}
+		return result;
+	}
+
 	<A extends Annotation> A getParameterAnnotation(HandlerMethod handlerMethod,
 			java.lang.reflect.Parameter parameter, int i, Class<A> annotationType) {
 		A parameterDoc = AnnotationUtils.getAnnotation(parameter, annotationType);

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java

@@ -262,7 +262,7 @@ private Parameter buildParams(ParameterInfo parameterInfo, Components components
 			parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
 
 		}
-		else if (requestParam != null) {
+		else if (requestParam != null && !parameterBuilder.isFile(parameterInfo.getParameter())) {
 			boolean isOptional = Optional.class.equals(parameters.getType());
 			requestInfo = new RequestInfo(ParameterType.QUERY_PARAM, requestParam.value(), requestParam.required() && !isOptional,
 					requestParam.defaultValue());

Diff for: springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app63/toto/helloController2.java

@@ -0,0 +1,31 @@
+/*
+ *
+ *  * 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.app63.toto;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class helloController2 {
+
+	@GetMapping("/test1")
+	public void test1(String hello) {
+	}
+
+}

Diff for: springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app11/HelloController.java

@@ -20,9 +20,14 @@
 
 import java.util.List;
 
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -34,4 +39,10 @@ public ResponseEntity<String> uploadDocuments(@RequestPart("doc") List<Multipart
 		return null;
 	}
 
+	@RequestMapping(value = "/tracks", method = RequestMethod.POST, consumes = { MediaType.MULTIPART_FORM_DATA_VALUE })
+	public @ResponseBody
+	String postTrack(@RequestParam("file") MultipartFile file) {
+		return "redirect:/";
+	}
+
 }

Diff for: springdoc-openapi-webmvc-core/src/test/resources/results/app11.json

@@ -11,6 +11,41 @@
     }
   ],
   "paths": {
+    "/tracks": {
+      "post": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "postTrack",
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "file": {
+                    "type": "string",
+                    "format": "binary"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/documents": {
       "post": {
         "tags": [