components schema not generated. Fixes #601

Author: bnasslahsen

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

@@ -180,9 +180,9 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
 				parameterDoc = parametersDocMap.get(parameterInfo.getpName());
 			// use documentation as reference
 			if (parameterDoc != null) {
-				if (parameterDoc.hidden())
+				if (parameterDoc.hidden() || parameterDoc.schema().hidden())
 					continue;
-				parameter = parameterBuilder.buildParameterFromDoc(parameterDoc, null, methodAttributes.getJsonViewAnnotation());
+				parameter = parameterBuilder.buildParameterFromDoc(parameterDoc, components, methodAttributes.getJsonViewAnnotation());
 				parameterInfo.setParameterModel(parameter);
 			}
 

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

@@ -178,14 +178,10 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 		if (StringUtils.isNotBlank(parameterDoc.ref()))
 			parameter.$ref(parameterDoc.ref());
 		else {
-			Schema schema = AnnotationsUtils.getSchemaFromAnnotation(parameterDoc.schema(), components, jsonView).orElse(null);
+			Schema schema = AnnotationsUtils.getSchema(parameterDoc.schema(), null,false,parameterDoc.schema().implementation(),components,jsonView ).orElse(null);
 			if (schema == null) {
-				if (parameterDoc.content().length > 0) {
-					if (AnnotationsUtils.hasSchemaAnnotation(parameterDoc.content()[0].schema()))
-						schema = AnnotationsUtils.getSchemaFromAnnotation(parameterDoc.content()[0].schema(), components, jsonView).orElse(null);
-					else if (AnnotationsUtils.hasArrayAnnotation(parameterDoc.content()[0].array()))
-						schema = AnnotationsUtils.getArraySchema(parameterDoc.content()[0].array(), components, jsonView).orElse(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);
 			}

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

@@ -21,10 +21,12 @@
 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.Content;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -38,6 +40,60 @@ public Object example(@Parameter(schema = @Schema(hidden = true)) JsonNode json)
 
 	@GetMapping("/example")
 	public void test(@Parameter(schema = @Schema(hidden = true)) JsonNode json) {
+	}
+
+	@GetMapping(value = "/foo")
+	public void foobar(@Parameter(description = "User", name = "user",
+			schema = @Schema(implementation = PersonDTO.class)) @RequestParam("bar") String bar) {
+
+	}
+
+	@GetMapping(value = "/foo1")
+	public void foobar1(@Parameter(description = "User", name = "user",
+			content = @Content(mediaType = "application/json",
+					schema = @Schema(implementation = PersonDTO.class))) @RequestParam("bar") String bar) {
+
+	}
+
+	class PersonDTO {
+		private String email;
+
+		private String firstName;
 
+		private String lastName;
+
+		public PersonDTO() {
+		}
+
+		public PersonDTO(final String email, final String firstName, final String lastName) {
+			this.email = email;
+			this.firstName = firstName;
+			this.lastName = lastName;
+		}
+
+		public String getEmail() {
+			return email;
+		}
+
+		public void setEmail(final String email) {
+			this.email = email;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(final String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(final String lastName) {
+			this.lastName = lastName;
+		}
 	}
+
 }

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

@@ -21,7 +21,9 @@
           {
             "name": "name",
             "in": "query",
-            "schema": {}
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {

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

@@ -17,14 +17,6 @@
           "hello-controller"
         ],
         "operationId": "test",
-        "parameters": [
-          {
-            "name": "json",
-            "in": "query",
-            "required": true,
-            "schema": {}
-          }
-        ],
         "responses": {
           "200": {
             "description": "default response"
@@ -39,13 +31,6 @@
         ],
         "summary": "schema example",
         "operationId": "example",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {}
-            }
-          }
-        },
         "responses": {
           "200": {
             "description": "default response",
@@ -59,7 +44,72 @@
           }
         }
       }
+    },
+    "/foo": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "foobar",
+        "parameters": [
+          {
+            "name": "user",
+            "in": "query",
+            "description": "User",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/PersonDTO"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response"
+          }
+        }
+      }
+    },
+    "/foo1": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "foobar1",
+        "parameters": [
+          {
+            "name": "user",
+            "in": "query",
+            "description": "User",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/PersonDTO"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response"
+          }
+        }
+      }
     }
   },
-  "components": {}
+  "components": {
+    "schemas": {
+      "PersonDTO": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string"
+          },
+          "firstName": {
+            "type": "string"
+          },
+          "lastName": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
 }