[helidon generation] Improve generated code extracting queryParams variable

Author: rbygrave

http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerMethodWriter.java

@@ -184,6 +184,9 @@ void writeHandler(boolean requestScoped) {
     for (final PathSegments.Segment matrixSegment : segments.matrixSegments()) {
       matrixSegment.writeCreateSegment(writer, platform());
     }
+    if (usesQueryParams()) {
+      writer.append("    var queryParams = req.query();").eol();
+    }
     final var params = method.params();
     for (final MethodParam param : params) {
       if (!isExceptionOrFilterChain(param)) {
@@ -371,6 +374,10 @@ private boolean usesFormParams() {
     return method.params().stream().anyMatch(p -> p.isForm() || ParamType.FORMPARAM.equals(p.paramType()));
   }
 
+  private boolean usesQueryParams() {
+    return method.params().stream().anyMatch(p -> ParamType.QUERYPARAM.equals(p.paramType()));
+  }
+
   private void writeContextReturn(String indent) {
     final var producesOp = Optional.ofNullable(method.produces());
     if (producesOp.isEmpty() && !useJsonB && !useJstachio) {

http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/NimaPlatformAdapter.java

@@ -71,12 +71,11 @@ public void writeReadParameter(Append writer, ParamType paramType, String paramN
     switch (paramType) {
       case PATHPARAM -> writer.append("pathParams.contains(\"%s\") ? pathParams.get(\"%s\") : null", paramName, paramName);
 
-      case QUERYPARAM -> writer.append("req.query().contains(\"%s\") ? req.query().get(\"%s\") : null", paramName, paramName);
+      case QUERYPARAM -> writer.append("queryParams.contains(\"%s\") ? queryParams.get(\"%s\") : null", paramName, paramName);
 
       case FORMPARAM -> writer.append("formParams.contains(\"%s\") ? formParams.get(\"%s\") : null", paramName, paramName);
 
-      case HEADER -> writer.append(
-          "req.headers().value(HeaderNames.create(\"%s\")).orElse(null)", paramName);
+      case HEADER -> writer.append("req.headers().value(HeaderNames.create(\"%s\")).orElse(null)", paramName);
 
       case COOKIE -> writer.append("req.headers().cookies().contains(\"%s\") ? req.headers().cookies().get(\"%s\") : null", paramName, paramName);
 
@@ -91,7 +90,7 @@ public void writeReadParameter(Append writer, ParamType paramType, String paramN
           "pathParams.contains(\"%s\") ? pathParams.get(\"%s\") : \"%s\"", paramName, paramName, paramDefault);
 
       case QUERYPARAM -> writer.append(
-          "req.query().contains(\"%s\") ? req.query().get(\"%s\") : \"%s\"", paramName, paramName, paramDefault);
+          "queryParams.contains(\"%s\") ? queryParams.get(\"%s\") : \"%s\"", paramName, paramName, paramDefault);
 
       case FORMPARAM -> writer.append(
           "formParams.contains(\"%s\") ? formParams.get(\"%s\") : \"%s\"", paramName, paramName, paramDefault);
@@ -109,18 +108,17 @@ public void writeReadParameter(Append writer, ParamType paramType, String paramN
   @Override
   public void writeReadMapParameter(Append writer, ParamType paramType) {
     switch (paramType) {
-      case QUERYPARAM -> writer.append("req.query().toMap()");
+      case QUERYPARAM -> writer.append("queryParams.toMap()");
       case FORM, FORMPARAM -> writer.append("formParams.toMap()");
       case COOKIE -> writer.append("req.headers().cookies().toMap()");
-      default -> throw new UnsupportedOperationException(
-          "Only Form/Query/Cookie Multi-Value Maps are supported");
+      default -> throw new UnsupportedOperationException("Only Form/Query/Cookie Multi-Value Maps are supported");
     }
   }
 
   @Override
   public void writeReadCollectionParameter(Append writer, ParamType paramType, String paramName) {
     switch (paramType) {
-      case QUERYPARAM -> writer.append("req.query().all(\"%s\")", paramName);
+      case QUERYPARAM -> writer.append("queryParams.all(\"%s\")", paramName);
       case FORMPARAM -> writer.append("formParams.all(\"%s\")", paramName);
 
       case HEADER -> writer.append(
@@ -139,7 +137,7 @@ public void writeReadCollectionParameter(
       Append writer, ParamType paramType, String paramName, List<String> paramDefault) {
     switch (paramType) {
       case QUERYPARAM -> writer.append(
-          "req.query().all(\"%s\", () -> java.util.List.of(\"%s\"))",
+          "queryParams.all(\"%s\", () -> java.util.List.of(\"%s\"))",
           paramName, String.join(",", paramDefault));
 
       case FORMPARAM -> writer.append(

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

@@ -1268,7 +1268,7 @@
 			}
 		},
 		"/test/byteArray" : {
-			"get" : {
+			"post" : {
 				"tags" : [
 
 				],
@@ -1286,7 +1286,7 @@
 					"required" : true
 				},
 				"responses" : {
-					"200" : {
+					"201" : {
 						"description" : "",
 						"content" : {
 							"application/json" : {
@@ -1730,7 +1730,7 @@
 			}
 		},
 		"/test/inputStream" : {
-			"get" : {
+			"post" : {
 				"tags" : [
 
 				],
@@ -1748,7 +1748,7 @@
 					"required" : true
 				},
 				"responses" : {
-					"200" : {
+					"201" : {
 						"description" : "",
 						"content" : {
 							"application/json" : {

tests/test-nima/src/main/java/org/example/HelloController.java

@@ -1,6 +1,7 @@
 package org.example;
 
 import io.avaje.http.api.Controller;
+import io.avaje.http.api.Default;
 import io.avaje.http.api.Get;
 import io.avaje.http.api.Produces;
 
@@ -23,7 +24,7 @@ Person person(String name, String sortBy) {
   @Roles({AppRoles.ADMIN, AppRoles.BASIC_USER})
   @Produces("text/plain")
   @Get("other/{name}")
-  String name(String name) {
+  String name(String name, String sortBy, @Default("0") long max) {
     return "hi " + name;
   }
 }