keep validation stuff

Author: SentryMan

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/DocContext.java

@@ -22,6 +22,7 @@
 import io.avaje.http.generator.core.SecuritySchemesPrism;
 import io.avaje.http.generator.core.TagPrism;
 import io.avaje.http.generator.core.TagsPrism;
+import io.avaje.http.generator.core.Util;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -77,12 +78,17 @@ private OpenAPI initOpenAPI() {
   }
 
   Schema toSchema(String rawType, Element element) {
-    TypeElement typeElement = elements.getTypeElement(rawType);
+    final var typeElement = elements.getTypeElement(rawType);
+    final var varElement =
+        elements.getTypeElement(Util.trimAnnotations(element.asType().toString()));
+
     if (typeElement == null) {
       // primitive types etc
       return schemaBuilder.toSchema(element.asType());
+    } else if (varElement != null) {
+      return schemaBuilder.toSchema(element);
     } else {
-      return schemaBuilder.toSchema(typeElement.asType());
+      return schemaBuilder.toSchema(typeElement);
     }
   }
 

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java

@@ -132,6 +132,17 @@ private static TypeMirror typeArgument(TypeMirror type) {
     return typeArguments.get(0);
   }
 
+  Schema<?> toSchema(Element element) {
+    var schema = toSchema(element.asType());
+
+    setLengthMinMax(element, schema);
+    setFormatFromValidation(element, schema);
+    if (isNotNullable(element)) {
+      schema.setNullable(Boolean.FALSE);
+    }
+    return schema;
+  }
+
   Schema<?> toSchema(TypeMirror type) {
     if (types.isAssignable(type, completableFutureType)) {
       type = typeArgument(type);

tests/test-javalin-jsonb/src/main/resources/public/openapi.json

@@ -692,10 +692,39 @@
 				"description" : "",
 				"parameters" : [
 					{
-						"name" : "bean",
-						"in" : "bean",
+						"name" : "name",
+						"in" : "query",
 						"schema" : {
-							"$ref" : "#/components/schemas/GetBeanForm"
+							"maxLength" : 150,
+							"minLength" : 2,
+							"type" : "string",
+							"nullable" : false
+						}
+					},
+					{
+						"name" : "email",
+						"in" : "query",
+						"schema" : {
+							"maxLength" : 100,
+							"type" : "string",
+							"format" : "email"
+						}
+					},
+					{
+						"name" : "addresses",
+						"in" : "query",
+						"schema" : {
+							"type" : "array",
+							"items" : {
+								"type" : "string"
+							}
+						}
+					},
+					{
+						"name" : "head",
+						"in" : "header",
+						"schema" : {
+							"type" : "string"
 						}
 					}
 				],
@@ -1440,6 +1469,11 @@
 					}
 				}
 			}
+		},
+						}
+					}
+				}
+			}
 		},
 		"/test/int" : {
 			"put" : {
@@ -1805,28 +1839,6 @@
 					}
 				}
 			},
-			"GetBeanForm" : {
-				"type" : "object",
-				"properties" : {
-					"name" : {
-						"maxLength" : 150,
-						"minLength" : 2,
-						"type" : "string",
-						"nullable" : false
-					},
-					"email" : {
-						"maxLength" : 100,
-						"type" : "string",
-						"format" : "email"
-					},
-					"addresses" : {
-						"type" : "array",
-						"items" : {
-							"type" : "string"
-						}
-					}
-				}
-			},
 			"HelloDto" : {
 				"type" : "object",
 				"properties" : {
@@ -1876,6 +1888,9 @@
 					}
 				}
 			},
+			"InputStream" : {
+				"type" : "object"
+			},
 			"MyForm" : {
 				"type" : "object",
 				"properties" : {