Merge pull request #445 from avaje/feature/helidon-4-request-scope

Support RequestScope with Helidon 4.0.0 (Nima)

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/RequestScope.java

@@ -13,8 +13,8 @@ final class RequestScope {
   private static final String HELIDON_REQ = "io.helidon.webserver.ServerRequest";
   private static final String HELIDON_RES = "io.helidon.webserver.ServerResponse";
 
-  private static final String NIMA_REQ = "io.helidon.nima.webserver.http.ServerRequest";
-  private static final String NIMA_RES = "io.helidon.nima.webserver.http.ServerResponse";
+  private static final String NIMA_REQ = "io.helidon.webserver.http.ServerRequest";
+  private static final String NIMA_RES = "io.helidon.webserver.http.ServerResponse";
   private static final String HELIDON_REACTIVE_REQ = "io.helidon.reactive.webserver.ServerRequest";
   private static final String HELIDON_REACTIVE_RES = "io.helidon.reactive.webserver.ServerResponse";
 

inject-test/pom.xml

@@ -95,13 +95,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.helidon.webserver</groupId>
-      <artifactId>helidon-webserver</artifactId>
-      <version>2.5.0</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>

inject-test/src/test/java/io/helidon/webserver/http/ServerRequest.java

@@ -0,0 +1,7 @@
+package io.helidon.webserver.http;
+
+/**
+ * Placeholder for Helidon 4.x ServerRequest (without requiring Java 21).
+ */
+public class ServerRequest {
+}

inject-test/src/test/java/io/helidon/webserver/http/ServerResponse.java

@@ -0,0 +1,7 @@
+package io.helidon.webserver.http;
+
+/**
+ * Placeholder for Helidon 4.x ServerResponse (without requiring Java 21).
+ */
+public class ServerResponse {
+}

inject-test/src/test/java/org/example/request/BController.java

@@ -1,8 +1,8 @@
 package org.example.request;
 
 import io.avaje.http.api.Controller;
-import io.helidon.webserver.ServerRequest;
-import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
 
 /**
  * Controller with request scoped dependencies (request and response).

inject-test/src/test/java/org/example/request/BControllerReqOnly.java

@@ -1,7 +1,7 @@
 package org.example.request;
 
 import io.avaje.http.api.Controller;
-import io.helidon.webserver.ServerRequest;
+import io.helidon.webserver.http.ServerRequest;
 
 /**
  * Controller with request scoped dependencies (request and response).

inject-test/src/test/java/org/example/request/BControllerResOnly.java

@@ -1,7 +1,7 @@
 package org.example.request;
 
 import io.avaje.http.api.Controller;
-import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.http.ServerResponse;
 
 /**
  * Controller with request scoped dependencies (request and response).

inject-test/src/test/java/org/example/request/BWebRoute.java

@@ -1,8 +1,8 @@
 package org.example.request;
 
 import io.avaje.inject.spi.BeanFactory2;
-import io.helidon.webserver.ServerRequest;
-import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
 
 import jakarta.inject.Singleton;
 

inject-test/src/test/java/org/example/request/BWebRouteTest.java

@@ -2,8 +2,8 @@
 
 
 import io.avaje.inject.xtra.ApplicationScope;
-import io.helidon.webserver.ServerRequest;
-import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 

inject-test/src/test/java/org/example/request/CController.java

@@ -1,8 +1,8 @@
 package org.example.request;
 
 import io.avaje.http.api.Controller;
-import io.helidon.webserver.ServerRequest;
-import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
 import org.example.generic.MyObj;
 import org.example.generic.ReadService;