#179 Tidy up and format for BeanParam OpenAPI

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/MethodParam.java

@@ -32,27 +32,22 @@ public void buildParamName(Append writer) {
   }
 
   public void buildApiDocumentation(MethodDocBuilder methodDoc) {
-    if (elementParam.paramType() != ParamType.BEANPARAM)
+    if (elementParam.paramType() != ParamType.BEANPARAM) {
       elementParam.buildApiDocumentation(methodDoc);
-    else {
+    } else {
       asElement(elementParam.element().asType()).getEnclosedElements().stream()
           .filter(e -> e.getKind() == ElementKind.FIELD)
           .map(VariableElement.class::cast)
-          .forEach(
-              e -> {
-                final var typeMirror = e.asType();
-
-                new ElementReader(
-                        e,
-                        Util.parse(typeMirror.toString()),
-                        Util.typeDef(typeMirror),
-                        ParamType.QUERYPARAM,
-                        false)
-                    .buildApiDocumentation(methodDoc);
-              });
+          .forEach(e -> buildDoc(methodDoc, e));
     }
   }
 
+  private static void buildDoc(MethodDocBuilder methodDoc, VariableElement e) {
+    final var typeMirror = e.asType();
+    new ElementReader(e, Util.parse(typeMirror.toString()), Util.typeDef(typeMirror), ParamType.QUERYPARAM, false)
+      .buildApiDocumentation(methodDoc);
+  }
+
   public boolean isBody() {
     return elementParam.paramType() == ParamType.BODY;
   }

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

@@ -79,9 +79,7 @@ private OpenAPI initOpenAPI() {
 
   Schema toSchema(String rawType, Element element) {
     final var typeElement = elements.getTypeElement(rawType);
-    final var varElement =
-        elements.getTypeElement(Util.trimAnnotations(element.asType().toString()));
-
+    final var varElement = elements.getTypeElement(Util.trimAnnotations(element.asType().toString()));
     if (typeElement == null) {
       // primitive types etc
       return schemaBuilder.toSchema(element.asType());

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

@@ -135,8 +135,7 @@ private static TypeMirror typeArgument(TypeMirror type) {
   }
 
   Schema<?> toSchema(Element element) {
-    var schema = toSchema(element.asType());
-
+    final var schema = toSchema(element.asType());
     setLengthMinMax(element, schema);
     setFormatFromValidation(element, schema);
     if (isNotNullable(element)) {

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

@@ -1,18 +1,18 @@
 {
 	"openapi" : "3.0.1",
 	"info" : {
-		"title" : "Example service",
+		"title" : "Example service showing off the Path extension method of controller",
 		"description" : "Example Javalin controllers with Java and Maven",
 		"version" : ""
 	},
 	"tags" : [
 		{
 			"name" : "tag1",
-			"description" : "it's somethin"
+			"description" : "this is added to openapi tags"
 		},
 		{
 			"name" : "tag1",
-			"description" : "this is added to openapi tags"
+			"description" : "it's somethin"
 		}
 	],
 	"paths" : {

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

@@ -682,10 +682,22 @@
 				"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"
 						}
 					}
 				],
@@ -835,22 +847,6 @@
 					}
 				}
 			},
-			"GetBeanForm" : {
-				"type" : "object",
-				"properties" : {
-					"name" : {
-						"maxLength" : 150,
-						"minLength" : 2,
-						"type" : "string",
-						"nullable" : false
-					},
-					"email" : {
-						"maxLength" : 100,
-						"type" : "string",
-						"format" : "email"
-					}
-				}
-			},
 			"HelloDto" : {
 				"type" : "object",
 				"properties" : {