Moved CompletableFuture generic validation to ControllerMethodWriter.

Author: Haydon Perrin

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

@@ -52,10 +52,6 @@ private static void addJsonBodyType(MethodReader methodReader, Consumer<UType> a
   public static void writeJsonbType(UType type, Append writer) {
     // Support for CompletableFuture's.
     if (type.mainType().equals("java.util.concurrent.CompletableFuture")) {
-      if (!type.isGeneric()) {
-        throw new IllegalStateException("CompletableFuture usages must have a generic type defined. e.g. `CompletableFuture<String>` or `CompletableFuture<Void>`.");
-      }
-
       writeJsonbType(type.paramRaw(), writer);
       return;
     }

http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java

@@ -87,7 +87,11 @@ void write(boolean requestScoped) {
   private void writeContextReturn() {
     // Support for CompletableFuture's.
     final UType type = UType.parse(method.returnType());
-    if (type.isGeneric() && type.mainType().equals("java.util.concurrent.CompletableFuture")) {
+    if (type.mainType().equals("java.util.concurrent.CompletableFuture")) {
+      if (!type.isGeneric()) {
+        throw new IllegalStateException("CompletableFuture must be generic type (e.g. CompletableFuture<String>, CompletableFuture<Void>).");
+      }
+
       final String futureResultVariableName = "futureResult";
 
       writer.append("      ctx.future(() -> {").eol();
@@ -108,7 +112,7 @@ private void writeContextReturn(final String resultVariableName) {
     if (produces == null || MediaType.APPLICATION_JSON.equalsIgnoreCase(produces)) {
       if (useJsonB) {
         var uType = UType.parse(method.returnType());
-        if (uType.isGeneric() && uType.mainType().equals("java.util.concurrent.CompletableFuture")) {
+        if (uType.mainType().equals("java.util.concurrent.CompletableFuture")) {
           uType = uType.paramRaw();
         }