Required multipart/form-data parameters not reflected in generated …

…schema. fixes #1106
springdoc · Mar 15, 2021 · 5c7f784 · 5c7f784
1 parent 5b992a8
commit 5c7f784
Show file tree

Hide file tree

Showing 14 changed files with 969 additions and 912 deletions.
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericParameterService.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/GenericParameterService.java
@@ -342,6 +342,10 @@ else if (schemaN instanceof FileSchema || schemaN instanceof ArraySchema && ((Ar
 		}
 		else
 			requestBodyInfo.addProperties(paramName, schemaN);
+
+		if(requestBodyInfo.getMergedSchema() !=null && parameterInfo.isRequired())
+			requestBodyInfo.getMergedSchema().addRequiredItem(parameterInfo.getpName());
+
 		return schemaN;
 	}
 

diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/RequestBodyService.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/RequestBodyService.java
@@ -237,8 +237,10 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met
 
 		RequestPart requestPart = methodParameter.getParameterAnnotation(RequestPart.class);
 		String paramName = null;
-		if (requestPart != null)
+		if (requestPart != null){
 			paramName = StringUtils.defaultIfEmpty(requestPart.value(), requestPart.name());
+			parameterInfo.setRequired(requestPart.required());
+		}
 		paramName = StringUtils.defaultIfEmpty(paramName, parameterInfo.getpName());
 		parameterInfo.setpName(paramName);
 

diff --git a/springdoc-openapi-webflux-core/src/test/resources/results/app4.json b/springdoc-openapi-webflux-core/src/test/resources/results/app4.json
@@ -26,6 +26,9 @@
           "content": {
             "multipart/form-data": {
               "schema": {
+                "required": [
+                  "resumeFile"
+                ],
                 "type": "object",
                 "properties": {
                   "resumeFile": {

diff --git a/springdoc-openapi-webflux-core/src/test/resources/results/app78.json b/springdoc-openapi-webflux-core/src/test/resources/results/app78.json
@@ -22,6 +22,9 @@
           "content": {
             "multipart/form-data": {
               "schema": {
+                "required": [
+                  "files"
+                ],
                 "type": "object",
                 "properties": {
                   "files": {
@@ -56,4 +59,4 @@
     }
   },
   "components": {}
-}
+}
diff --git a/springdoc-openapi-webmvc-core/src/test/resources/results/app103.json b/springdoc-openapi-webmvc-core/src/test/resources/results/app103.json
@@ -21,6 +21,10 @@
           "content": {
             "multipart/form-data": {
               "schema": {
+                "required": [
+                  "body",
+                  "file"
+                ],
                 "type": "object",
                 "properties": {
                   "body": {