fix

Author: SentryMan

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

@@ -107,14 +107,12 @@ private void writeEnd() {
       String known = KNOWN_RESPONSE.get(returnType.full());
       if (known != null) {
         writer.append("      %s", known).eol();
+      } else if (COMPLETABLE_FUTURE.equals(returnType.mainType())) {
+        writeAsyncResponse();
+      } else if (HTTP_CALL.equals(returnType.mainType())) {
+        writeCallResponse();
       } else {
-        if (COMPLETABLE_FUTURE.equals(returnType.mainType())) {
-          writeAsyncResponse();
-        } else if (HTTP_CALL.equals(returnType.mainType())) {
-            writeCallResponse();
-        } else {
-          writeSyncResponse();
-        }
+        writeSyncResponse();
       }
     }
     writer.append("  }").eol().eol();
@@ -145,24 +143,28 @@ private void writeResponse(UType type) {
     } else if (isStream(mainType)) {
       writer.append(".stream(");
       writeGeneric(param1);
+      writer.append(");").eol();
     } else if (isHttpResponse(mainType)) {
       if (bodyHandlerParam == null) {
-        UType paramType = type.paramRaw();
-        if (paramType.mainType().equals("java.util.List")) {
+        final UType paramType = type.paramRaw();
+        if ("java.util.List".equals(paramType.mainType())) {
           writer.append(".asList(");
           writeGeneric(paramType.paramRaw());
-        } else if (paramType.mainType().equals("java.util.stream.Stream")) {
+        } else if ("java.util.stream.Stream".equals(paramType.mainType())) {
           writer.append(".asStream(");
           writeGeneric(paramType.paramRaw());
         } else {
           writer.append(".as(");
           writeGeneric(paramType);
         }
+        writer.append(");").eol();
       } else {
-        writer.append(".handler(%s);", bodyHandlerParam.name()).eol();      }
+        writer.append(".handler(%s);", bodyHandlerParam.name()).eol();
+      }
     } else {
       writer.append(".bean(");
       writeGeneric(type);
+      writer.append(");").eol();
     }
   }
 
@@ -181,15 +183,13 @@ void writeGeneric(UType type) {
   }
 
   private void writeQueryParams(PathSegments pathSegments) {
-    for (MethodParam param : method.params()) {
-      ParamType paramType = param.paramType();
-      if (paramType == ParamType.QUERYPARAM) {
-        if (pathSegments.segment(param.paramName()) == null) {
-          if (isMap(param)) {
-            writer.append("      .queryParam(%s)", param.name()).eol();
-          } else {
-            writer.append("      .queryParam(\"%s\", %s)", param.paramName(), param.name()).eol();
-          }
+    for (final MethodParam param : method.params()) {
+      final ParamType paramType = param.paramType();
+      if (paramType == ParamType.QUERYPARAM && pathSegments.segment(param.paramName()) == null) {
+        if (isMap(param)) {
+          writer.append("      .queryParam(%s)", param.name()).eol();
+        } else {
+          writer.append("      .queryParam(\"%s\", %s)", param.paramName(), param.name()).eol();
         }
       }
     }
@@ -280,19 +280,19 @@ private boolean isMap(MethodParam param) {
   }
 
   private boolean isMap(String type0) {
-    return type0.equals("java.util.Map");
+    return "java.util.Map".equals(type0);
   }
 
   private boolean isList(String type0) {
-    return type0.equals("java.util.List");
+    return "java.util.List".equals(type0);
   }
 
   private boolean isStream(String type0) {
-    return type0.equals("java.util.stream.Stream");
+    return "java.util.stream.Stream".equals(type0);
   }
 
   private boolean isHttpResponse(String type0) {
-    return type0.equals("java.net.http.HttpResponse");
+    return "java.net.http.HttpResponse".equals(type0);
   }
 
 }

tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/ServerType.java renamed to tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/ServerType.java

@@ -1,4 +1,4 @@
-package org.example.myapp.web.test;
+package org.example.myapp.web;
 
 public enum ServerType {
   PROXY,