Merge branch 'patrykpacewicz-bugfix/531-encoding-section-in-multipart-request'

Author: bnasslahsen

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

@@ -148,6 +148,7 @@ private void buildContent(RequestBody requestBody, MethodAttributes methodAttrib
 			if (content.get(value) != null) {
 				mediaTypeObject.setExample(content.get(value).getExample());
 				mediaTypeObject.setExamples(content.get(value).getExamples());
+				mediaTypeObject.setEncoding(content.get(value).getEncoding());
 			}
 			content.addMediaType(value, mediaTypeObject);
 		}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app104/ExampleBody.java

@@ -0,0 +1,23 @@
+package test.org.springdoc.api.app104;
+
+public class ExampleBody {
+    private String stringParam;
+
+    private int intParam;
+
+    public String getStringParam() {
+        return stringParam;
+    }
+
+    public void setStringParam(String stringParam) {
+        this.stringParam = stringParam;
+    }
+
+    public int getIntParam() {
+        return intParam;
+    }
+
+    public void setIntParam(int intParam) {
+        this.intParam = intParam;
+    }
+}

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

@@ -0,0 +1,51 @@
+/*
+ *
+ *  * 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.app104;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Encoding;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+public class HelloController {
+
+    @PostMapping(value = "/test/103", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(
+            requestBody = @RequestBody(
+                    content = @Content(
+                            encoding = @Encoding(name = "body", contentType = "application/json")
+                    )
+            )
+    )
+    public String postMyRequestBody(
+            @RequestPart("body") ExampleBody body,
+            @RequestParam("file") MultipartFile file
+    ) {
+        return null;
+    }
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app104/SpringDocApp104Test.java

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

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

@@ -0,0 +1,62 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/test/103": {
+      "post": {
+        "tags": [ "hello-controller" ],
+        "operationId": "postMyRequestBody",
+        "requestBody": {
+          "content": {
+            "multipart/form-data":{
+              "schema":{
+                "type":"object",
+                "properties":{
+                  "body":{"$ref":"#/components/schemas/ExampleBody"},
+                  "file":{"type":"string","format":"binary"}
+                }
+              },
+              "encoding":{
+                "body":{
+                  "contentType":"application/json"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas":{
+      "ExampleBody":{
+        "type":"object",
+        "properties":{
+          "stringParam":{ "type":"string" },
+          "intParam":{ "type":"integer", "format":"int32" }
+        }
+      }
+    }
+  }
+}