fixes #148

Author: springdoc

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

@@ -79,7 +79,6 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
                     applyBeanValidatorAnnotations(parameter, Arrays.asList(parameters[i].getAnnotations()));
                 } else if (!RequestMethod.GET.equals(requestMethod)) {
                     requestBodyInfo.incrementNbParam();
-                    parameterInfo = new ParameterInfo(pName, parameters[i], parameterDoc);
                     requestBodyInfo.setRequestBody(operation.getRequestBody());
                     requestBodyBuilder.calculateRequestBodyInfo(components, handlerMethod, methodAttributes, i,
                             parameterInfo, requestBodyInfo);

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

@@ -6,9 +6,8 @@ class ParameterInfo {
 
     private final java.lang.reflect.Parameter parameter;
     private String pName;
-    private io.swagger.v3.oas.annotations.Parameter parameterDoc;
     private io.swagger.v3.oas.models.parameters.Parameter parameterModel;
-    private int index;
+    private final int index;
 
     public ParameterInfo(String pName, Parameter parameter,
                          io.swagger.v3.oas.models.parameters.Parameter parameterModel, int index) {
@@ -19,13 +18,6 @@ public ParameterInfo(String pName, Parameter parameter,
         this.index = index;
     }
 
-    public ParameterInfo(String pName, Parameter parameter, io.swagger.v3.oas.annotations.Parameter parameterDoc) {
-        super();
-        this.pName = pName;
-        this.parameter = parameter;
-        this.parameterDoc = parameterDoc;
-    }
-
     public String getpName() {
         return pName;
     }
@@ -38,10 +30,6 @@ public java.lang.reflect.Parameter getParameter() {
         return parameter;
     }
 
-    public io.swagger.v3.oas.annotations.Parameter getParameterDoc() {
-        return parameterDoc;
-    }
-
     public io.swagger.v3.oas.models.parameters.Parameter getParameterModel() {
         return parameterModel;
     }

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

@@ -103,28 +103,29 @@ private RequestBody buildRequestBody(RequestBody requestBody, Components compone
         if (requestBody == null)
             requestBody = new RequestBody();
 
+        if (parameterInfo.getParameterModel() != null) {
+            io.swagger.v3.oas.models.parameters.Parameter parameter = parameterInfo.getParameterModel();
+            if (StringUtils.isNotBlank(parameter.getDescription()))
+                requestBody.setDescription(parameter.getDescription());
+            if (parameter.getSchema() != null) {
+                Schema<?> schema = parameterInfo.getParameterModel().getSchema();
+                buildContent(requestBody, methodAttributes, schema);
+            }
+            requestBody.setRequired(parameter.getRequired());
+        }
+
         if (requestBody.getContent() == null
                 || (requestBody.getContent() != null && methodAttributes.isMethodOverloaded())) {
-
             Schema<?> schema = parameterBuilder.calculateSchema(components, parameterInfo.getParameter(),
                     parameterInfo.getpName(), requestBodyInfo,
                     methodAttributes.getJsonViewAnnotationForRequestBody());
-            Content content = requestBody.getContent();
-            content = buildContent(methodAttributes, schema, content);
-            requestBody.setContent(content);
+            buildContent(requestBody, methodAttributes, schema);
         }
-
-        if (parameterInfo.getParameterDoc() != null) {
-            io.swagger.v3.oas.annotations.Parameter parameterDoc = parameterInfo.getParameterDoc();
-            if (StringUtils.isNotBlank(parameterDoc.description()))
-                requestBody.setDescription(parameterDoc.description());
-            requestBody.setRequired(parameterDoc.required());
-        }
-
         return requestBody;
     }
 
-    private Content buildContent(MethodAttributes methodAttributes, Schema<?> schema, Content content) {
+    private void buildContent(RequestBody requestBody, MethodAttributes methodAttributes, Schema<?> schema) {
+        Content content = requestBody.getContent();
         if (methodAttributes.isMethodOverloaded() && content != null) {
             for (String value : methodAttributes.getAllConsumes()) {
                 setMediaTypeToContent(schema, content, value);
@@ -135,9 +136,11 @@ private Content buildContent(MethodAttributes methodAttributes, Schema<?> schema
                 setMediaTypeToContent(schema, content, value);
             }
         }
-        return content;
+        requestBody.setContent(content);
     }
 
+
+
     private void setMediaTypeToContent(Schema schema, Content content, String value) {
         io.swagger.v3.oas.models.media.MediaType mediaTypeObject = new io.swagger.v3.oas.models.media.MediaType();
         mediaTypeObject.setSchema(schema);

springdoc-openapi-webflux-core/src/test/resources/results/app4.json

@@ -33,8 +33,7 @@
                 }
               }
             }
-          },
-          "required": false
+          }
         },
         "responses": {
           "400": {
@@ -59,4 +58,4 @@
       }
     }
   }
-}
+}

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

@@ -0,0 +1,25 @@
+package test.org.springdoc.api.app58;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+
+    @PostMapping("/examplePost")
+    @Operation(summary = "schema example")
+    public Object example(@Parameter(schema = @Schema(hidden = true)) JsonNode json)
+    {
+        return null;
+    }
+
+    @GetMapping("/example")
+    public void test(@Parameter(schema = @Schema(hidden = true))JsonNode json) {
+
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app58/SpringDocApp58Test.java

@@ -0,0 +1,8 @@
+package test.org.springdoc.api.app58;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+public class SpringDocApp58Test extends AbstractSpringDocTest {
+
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app58/SpringDocTestApp.java

@@ -0,0 +1,12 @@
+package test.org.springdoc.api.app58;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringDocTestApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringDocTestApp.class, args);
+    }
+}

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

@@ -158,8 +158,7 @@
                 "$ref": "#/components/schemas/InventoryItem"
               }
             }
-          },
-          "required": false
+          }
         },
         "responses": {
           "500": {
@@ -559,12 +558,9 @@
           }
         }
       },
-      "ItemDTO": {
+      "ItemLightDTO": {
         "type": "object",
         "properties": {
-          "itemID": {
-            "type": "string"
-          },
           "description": {
             "type": "string"
           },
@@ -574,9 +570,12 @@
           }
         }
       },
-      "ItemLightDTO": {
+      "ItemDTO": {
         "type": "object",
         "properties": {
+          "itemID": {
+            "type": "string"
+          },
           "description": {
             "type": "string"
           },

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

@@ -347,8 +347,7 @@
                 }
               }
             }
-          },
-          "required": false
+          }
         },
         "responses": {
           "400": {

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

@@ -0,0 +1,59 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/example": {
+      "get": {
+        "operationId": "test",
+        "parameters": [
+          {
+            "name": "json",
+            "in": "query",
+            "required": true,
+            "schema": {}
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response"
+          }
+        }
+      }
+    },
+    "/examplePost": {
+      "post": {
+        "summary": "schema example",
+        "operationId": "example",
+        "requestBody": {
+          "content": {
+            "*/*": {
+              "schema": {}
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {}
+}