Fix generated openapi schema for CompletableFuture response body

Note: Not detecting openapi array vs object there though

Author: rbygrave

.gitignore

@@ -11,3 +11,4 @@ build/
 */bin/
 *.editorconfig
 *.Module
+dependency-reduced-pom.xml

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

@@ -22,6 +22,7 @@
 import javax.lang.model.util.Types;
 
 import io.avaje.http.generator.core.HiddenPrism;
+import io.avaje.http.generator.core.UType;
 import io.avaje.http.generator.core.Util;
 import io.avaje.prism.GeneratePrism;
 import io.swagger.v3.oas.models.Operation;
@@ -43,6 +44,7 @@ class SchemaDocBuilder {
   private static final String APP_FORM = "application/x-www-form-urlencoded";
   private static final String APP_JSON = "application/json";
 
+  private final Elements elements;
   private final Types types;
   private final KnownTypes knownTypes;
   private final TypeMirror iterableType;
@@ -52,6 +54,7 @@ class SchemaDocBuilder {
 
   SchemaDocBuilder(Types types, Elements elements) {
     this.types = types;
+    this.elements = elements;
     this.knownTypes = new KnownTypes();
     this.iterableType = types.erasure(elements.getTypeElement("java.lang.Iterable").asType());
     this.mapType = types.erasure(elements.getTypeElement("java.util.Map").asType());
@@ -112,7 +115,6 @@ void addRequestBody(Operation operation, Schema schema, boolean asForm, String d
   }
 
   private RequestBody requestBody(Operation operation) {
-
     RequestBody body = operation.getRequestBody();
     if (body == null) {
       body = new RequestBody();
@@ -125,7 +127,15 @@ private RequestBody requestBody(Operation operation) {
   }
 
   Schema<?> toSchema(TypeMirror type) {
-
+    UType uType = UType.parse(type);
+    if (uType.mainType().equals("java.util.concurrent.CompletableFuture")) {
+      UType bodyType = uType.paramRaw();
+      if (bodyType.isGeneric()) { // Container type like List, Set etc
+        bodyType = bodyType.paramRaw();
+      }
+      TypeElement typeElement = elements.getTypeElement(bodyType.full());
+      type = typeElement.asType();
+    }
     Schema<?> schema = knownTypes.createSchema(typeDef(type));
     if (schema != null) {
       return schema;

http-generator-core/src/test/java/io/avaje/http/generator/core/UtilTest.java

@@ -122,6 +122,13 @@ void parse_CompletableFutureListBean() {
 
     assertThat(type.importTypes()).containsExactly("java.util.concurrent.CompletableFuture", "java.util.List", "org.example.Repo");
     assertThat(type.shortType()).isEqualTo("CompletableFuture<List<Repo>>");
+
+    assertThat(type.mainType()).isEqualTo("java.util.concurrent.CompletableFuture");
+    UType param = type.paramRaw();
+    assertThat(param.isGeneric()).isTrue();
+    assertThat(param.full()).isEqualTo("java.util.List<org.example.Repo>");
+    UType uType = param.paramRaw();
+    assertThat(uType.full()).isEqualTo("org.example.Repo");
   }
 
   @Test

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

@@ -324,6 +324,27 @@
 				}
 			}
 		},
+		"/hello/async" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"$ref" : "#/components/schemas/HelloDto"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/hello/findbyname/{name}" : {
 			"get" : {
 				"tags" : [

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

@@ -314,6 +314,27 @@
 				}
 			}
 		},
+		"/hello/async" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"$ref" : "#/components/schemas/HelloDto"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/hello/findbyname/{name}" : {
 			"get" : {
 				"tags" : [