Unable to generate correct definition for request parameter containing JSON. Fixes #791

Author: bnasslahsen

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

@@ -493,7 +493,7 @@ private Parameter buildParam(String in, Components components, ParameterInfo par
 		if (containsDeprecatedAnnotation(parameterInfo.getMethodParameter().getParameterAnnotations()))
 			parameter.setDeprecated(true);
 
-		if (parameter.getSchema() == null) {
+		if (parameter.getSchema() == null && parameter.getContent() == null) {
 			Schema<?> schema = parameterBuilder.calculateSchema(components, parameterInfo, null,
 					jsonView);
 			if (defaultValue != null)

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

@@ -40,6 +40,7 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.examples.Example;
 import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.Content;
 import io.swagger.v3.oas.models.media.FileSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
@@ -190,7 +191,7 @@ private static void mergeParameter(Parameter paramCalcul, Parameter paramDoc) {
 		if (StringUtils.isBlank(paramDoc.get$ref()))
 			paramDoc.set$ref(paramDoc.get$ref());
 
-		if (paramDoc.getSchema() == null)
+		if (paramDoc.getSchema() == null && paramDoc.getContent() == null)
 			paramDoc.setSchema(paramCalcul.getSchema());
 
 		if (paramDoc.getExamples() == null)
@@ -240,7 +241,13 @@ public Parameter buildParameterFromDoc(io.swagger.v3.oas.annotations.Parameter p
 		if (parameterDoc.allowReserved())
 			parameter.setAllowReserved(parameterDoc.allowReserved());
 
-		setSchema(parameterDoc, components, jsonView, parameter);
+		if (parameterDoc.content().length > 0) {
+			Optional<Content> optionalContent = AnnotationsUtils.getContent(parameterDoc.content(), null, null, null, components, jsonView);
+			optionalContent.ifPresent(parameter::setContent);
+		}
+		else
+			setSchema(parameterDoc, components, jsonView, parameter);
+
 		setExamples(parameterDoc, parameter);
 		setExtensions(parameterDoc, parameter);
 		setParameterStyle(parameter, parameterDoc);
@@ -269,10 +276,7 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 				LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e);
 			}
 			if (schema == null) {
-				if (parameterDoc.content().length > 0)
-					schema = AnnotationsUtils.getSchema(parameterDoc.content()[0], components, jsonView).orElse(null);
-				else
-					schema = AnnotationsUtils.getArraySchema(parameterDoc.array(), components, jsonView).orElse(null);
+				schema = AnnotationsUtils.getArraySchema(parameterDoc.array(), components, jsonView).orElse(null);
 			}
 			parameter.setSchema(schema);
 		}

springdoc-openapi-common/src/main/java/org/springdoc/core/converters/models/PageableAsQueryParam.java

@@ -28,7 +28,6 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
@@ -40,16 +39,16 @@
 @Parameter(in = ParameterIn.QUERY
 		, description = "Zero-based page index (0..N)"
 		, name = "page"
-		, content = @Content(schema = @Schema(type = "integer", defaultValue = "0")))
+		, schema = @Schema(type = "integer", defaultValue = "0"))
 @Parameter(in = ParameterIn.QUERY
 		, description = "The size of the page to be returned"
 		, name = "size"
-		, content = @Content(schema = @Schema(type = "integer", defaultValue = "20")))
+		, schema = @Schema(type = "integer", defaultValue = "20"))
 @Parameter(in = ParameterIn.QUERY
 		, description = "Sorting criteria in the format: property(,asc|desc). "
 		+ "Default sort order is ascending. " + "Multiple sort criteria are supported."
 		, name = "sort"
-		, content = @Content(array = @ArraySchema(schema = @Schema(type = "string"))))
+		, array = @ArraySchema(schema = @Schema(type = "string")))
 public @interface
 PageableAsQueryParam {
 

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

@@ -24,6 +24,27 @@
         }
       }
     },
+    "/examplePost": {
+      "post": {
+        "tags": [
+          "hello-controller"
+        ],
+        "summary": "schema example",
+        "operationId": "example",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/foo": {
       "get": {
         "tags": [
@@ -60,8 +81,12 @@
             "in": "query",
             "description": "User",
             "required": true,
-            "schema": {
-              "$ref": "#/components/schemas/PersonDTO"
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDTO"
+                }
+              }
             }
           }
         ],
@@ -71,27 +96,6 @@
           }
         }
       }
-    },
-    "/examplePost": {
-      "post": {
-        "tags": [
-          "hello-controller"
-        ],
-        "summary": "schema example",
-        "operationId": "example",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "*/*": {
-                "schema": {
-                  "type": "object"
-                }
-              }
-            }
-          }
-        }
-      }
     }
   },
   "components": {

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

@@ -42,10 +42,14 @@
             "in": "query",
             "description": "createdFrom",
             "required": true,
-            "schema": {
-              "type": "array",
-              "items": {
-                "type": "string"
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
               }
             }
           },