Issues with POST Request, application/x-www-form-urlencoded and only one parameter. Fixes #2990

Author: bnasslahsen

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

@@ -432,7 +432,7 @@ private Schema calculateRequestBodySchema(Components components, ParameterInfo p
 			requestBodyInfo.getMergedSchema().addProperty(paramName, schemaN);
 			schemaN = requestBodyInfo.getMergedSchema();
 		}
-		else if (parameterInfo.isRequestPart() || schemaN instanceof FileSchema || (schemaN!=null && schemaN.getItems() instanceof FileSchema)) {
+		else if (parameterInfo.isRequestPart() || ParameterIn.QUERY.toString().equals(parameterInfo.getParamType()) ||  schemaN instanceof FileSchema || (schemaN!=null && schemaN.getItems() instanceof FileSchema)) {
 			schemaN = new ObjectSchema().addProperty(paramName, schemaN);
 			requestBodyInfo.setMergedSchema(schemaN);
 		}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java

@@ -38,6 +38,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -110,4 +111,9 @@ public ResponseEntity<String> deletePerson(
 		}
 		return ResponseEntity.noContent().build();
 	}
+
+	@PostMapping(path = "/api/test", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	public void postSingleParameter(@RequestParam(name = "test_id") @NotNull final UUID testId) {
+		System.out.println("Received test_id: " + testId);
+	}
 }

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app1.json

@@ -87,10 +87,6 @@
           "content": {
             "application/x-www-form-urlencoded": {
               "schema": {
-                "required": [
-                  "firstName",
-                  "lastName"
-                ],
                 "type": "object",
                 "properties": {
                   "firstName": {
@@ -101,7 +97,11 @@
                     "type": "string",
                     "description": "Last Name"
                   }
-                }
+                },
+                "required": [
+                  "firstName",
+                  "lastName"
+                ]
               }
             }
           }
@@ -210,20 +210,20 @@
             "in": "query",
             "required": true,
             "schema": {
+              "type": "string",
               "maxLength": 6,
-              "minLength": 4,
-              "type": "string"
+              "minLength": 4
             }
           },
           {
             "name": "toto",
             "in": "query",
             "required": true,
             "schema": {
-              "maximum": 6,
-              "minimum": 4,
               "type": "integer",
-              "format": "int32"
+              "format": "int32",
+              "maximum": 6,
+              "minimum": 4
             }
           },
           {
@@ -340,9 +340,9 @@
             "description": "number of records to skip for pagination",
             "required": true,
             "schema": {
-              "minimum": 0,
               "type": "integer",
-              "format": "int32"
+              "format": "int32",
+              "minimum": 0
             }
           },
           {
@@ -351,10 +351,10 @@
             "description": "maximum number of records to return",
             "required": true,
             "schema": {
-              "maximum": 50,
-              "minimum": 0,
               "type": "integer",
-              "format": "int32"
+              "format": "int32",
+              "maximum": 50,
+              "minimum": 0
             }
           }
         ],
@@ -439,6 +439,48 @@
         }
       }
     },
+    "/api/test": {
+      "post": {
+        "tags": [
+          "people"
+        ],
+        "operationId": "postSingleParameter",
+        "requestBody": {
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "test_id": {
+                    "type": "string",
+                    "format": "uuid"
+                  }
+                },
+                "required": [
+                  "test_id"
+                ]
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "500": {
+            "description": "Internal Server Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorMessage"
+                }
+              }
+            }
+          },
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/people": {
       "get": {
         "tags": [
@@ -567,12 +609,6 @@
         }
       },
       "InventoryItem": {
-        "required": [
-          "id",
-          "manufacturer",
-          "name",
-          "releaseDate"
-        ],
         "type": "object",
         "properties": {
           "id": {
@@ -591,12 +627,15 @@
           "manufacturer": {
             "$ref": "#/components/schemas/Manufacturer"
           }
-        }
+        },
+        "required": [
+          "id",
+          "manufacturer",
+          "name",
+          "releaseDate"
+        ]
       },
       "Manufacturer": {
-        "required": [
-          "name"
-        ],
         "type": "object",
         "properties": {
           "name": {
@@ -611,7 +650,10 @@
             "type": "string",
             "example": "408-867-5309"
           }
-        }
+        },
+        "required": [
+          "name"
+        ]
       },
       "ItemDTO": {
         "type": "object",