#661 Fix Helidon request scope - ServerRequest / ServerResponse are i…

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

@@ -6,11 +6,13 @@ class RequestScopeTypes {
 
   private static final String JAVALIN_CONTEXT = "io.javalin.http.Context";
   private static final String JEX_CONTEXT = "io.avaje.jex.http.Context";
-  private static final String HELIDON_REQ = "io.helidon.webserver.ServerRequest";
-  private static final String HELIDON_RES = "io.helidon.webserver.ServerResponse";
+  private static final String HELIDON0_REQ = "io.helidon.webserver.ServerRequest";
+  private static final String HELIDON0_RES = "io.helidon.webserver.ServerResponse";
+  private static final String HELIDON1_REQ = "io.helidon.webserver.http.ServerRequest";
+  private static final String HELIDON1_RES = "io.helidon.webserver.http.ServerResponse";
 
   private static final Set<String> TYPES =
-      Set.of(JAVALIN_CONTEXT, JEX_CONTEXT, HELIDON_REQ, HELIDON_RES);
+      Set.of(JAVALIN_CONTEXT, JEX_CONTEXT, HELIDON0_REQ, HELIDON0_RES, HELIDON1_REQ, HELIDON1_RES);
 
   /** Return true if the type is a request scoped type. */
   static boolean isRequestType(String rawType) {

tests/test-nima-jsonb/src/main/java/org/example/FieldInject2Controller.java

@@ -0,0 +1,20 @@
+package org.example;
+
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Path;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
+import jakarta.inject.Inject;
+
+@Controller
+@Path("field")
+final class FieldInject2Controller {
+
+  @Inject ServerRequest request;
+
+  @Get
+  String hello() {
+    return "hi";
+  }
+}

tests/test-nima-jsonb/src/main/java/org/example/FieldInject3Controller.java

@@ -0,0 +1,20 @@
+package org.example;
+
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Path;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
+import jakarta.inject.Inject;
+
+@Controller
+@Path("field")
+final class FieldInject3Controller {
+
+  @Inject ServerResponse response;
+
+  @Get
+  String hello() {
+    return "hi";
+  }
+}

tests/test-nima-jsonb/src/main/java/org/example/FieldInjectController.java

@@ -0,0 +1,21 @@
+package org.example;
+
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Path;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
+import jakarta.inject.Inject;
+
+@Controller
+@Path("field")
+final class FieldInjectController {
+
+  @Inject ServerRequest request;
+  @Inject ServerResponse response;
+
+  @Get
+  String hello() {
+    return "hi";
+  }
+}