Fix problems enabling request scope in the Webserver (helidon-io#11350)

Fix problems enabling request scope in the Webserver. Update codegen to add new contracts for raw types. Update declarative test to show request scope in action.

Signed-off-by: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>

Author: spericas

declarative/tests/http/src/main/java/io/helidon/declarative/tests/http/GreetServiceEndpoint.java

@@ -22,9 +22,11 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import io.helidon.common.Default;
 import io.helidon.common.context.Context;
+import io.helidon.common.mapper.OptionalValue;
 import io.helidon.common.media.type.MediaTypes;
 import io.helidon.config.Configuration;
 import io.helidon.faulttolerance.Ft;
@@ -37,6 +39,7 @@
 import io.helidon.security.abac.role.RoleValidator;
 import io.helidon.service.registry.Service;
 import io.helidon.webserver.http.RestServer;
+import io.helidon.webserver.http.ServerRequest;
 
 /**
  * A simple endpoint to greet you. Examples:
@@ -66,9 +69,16 @@ class GreetServiceEndpoint implements GreetService {
      */
     private final AtomicReference<String> greeting = new AtomicReference<>();
 
+    /**
+     * A per-request supplier.
+     */
+    private final Supplier<ServerRequest> serverRequestSupplier;
+
     @Service.Inject
-    GreetServiceEndpoint(@Configuration.Value("app.greeting") @Default.Value("Ciao") String greeting) {
+    GreetServiceEndpoint(@Configuration.Value("app.greeting") @Default.Value("Ciao") String greeting,
+                         Supplier<ServerRequest> serverRequestSupplier) {
         this.greeting.set(greeting);
+        this.serverRequestSupplier = serverRequestSupplier;
     }
 
     @Http.GET
@@ -227,6 +237,15 @@ JsonObject updateGreetingHandlerWithSecurity(@Http.Entity JsonObject greetingMes
         return response;
     }
 
+    @Http.POST
+    @Http.Path("/server-request")
+    @Http.Produces(MediaTypes.TEXT_PLAIN_VALUE)
+    String serverRequestInjection() {
+        ServerRequest serverRequest = serverRequestSupplier.get();
+        OptionalValue<String> greet = serverRequest.query().first("greet");
+        return greet.get();
+    }
+
     private JsonObject response(String name) {
         return JsonObject.builder()
                 .set("message", stringResponse(name))

declarative/tests/http/src/main/java/module-info.java

@@ -36,5 +36,9 @@
     requires io.helidon.security.integration.common;
     requires io.helidon.security.annotations;
 
+    // required for generated binding
+    requires io.helidon.webserver.context;
+    requires io.helidon.webserver.observe;
+
     exports io.helidon.declarative.tests.http;
 }

declarative/tests/http/src/main/resources/application.yaml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025 Oracle and/or its affiliates.
+# Copyright (c) 2025, 2026 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@ server:
     # THIS MUST NOT BE USED IN PRODUCTION!
     # exception message will be sent back over the network - this may give potential attackers information about your application
     include-entity: true
+  features:
+    request-scope:
+      enabled: true
 
 greet-service.client:
   uri: "http://localhost:${test.server.port}"

declarative/tests/http/src/test/java/io/helidon/declarative/tests/http/DeclarativeHttpTest.java

@@ -200,4 +200,14 @@ void testTypedClient() {
         jsonMessage = typedClient.updateGreetingHandlerReturningCurrent(newGreeting);
         assertThat(jsonMessage.stringValue("message", "bad"), is("Ahoj World!"));
     }
+
+    @Test
+    void testServerRequestInjection() {
+        var response = client.post("/greet/server-request")
+                .queryParam("greet", "hello")
+                .request(String.class);
+
+        assertThat(response.status(), is(Status.OK_200));
+        assertThat(response.entity(), is("hello"));
+    }
 }

declarative/tests/metrics/src/main/java/module-info.java

@@ -27,5 +27,8 @@
     // needed for generated binding
     requires io.helidon.config.yaml;
 
+    // required for generated binding
+    requires io.helidon.webserver.observe;
+
     exports io.helidon.declarative.tests.metrics;
 }

declarative/tests/tracing/src/main/java/module-info.java

@@ -25,7 +25,7 @@
     requires io.helidon.metrics.api;
     requires io.helidon.config.yaml;
     requires io.helidon.webserver.observe.tracing;
-
+    requires io.helidon.webserver.concurrency.limits;
 
     exports io.helidon.declarative.tests.tracing;
 }

service/codegen/src/main/java/io/helidon/service/codegen/ServiceContracts.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025 Oracle and/or its affiliates.
+ * Copyright (c) 2024, 2026 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -247,11 +247,15 @@ public void addContracts(Set<ResolvedType> contractSet,
                             }
                         }
                         if (!wildcards.isEmpty()) {
+                            // Circle raw type
+                            contractSet.add(ResolvedType.create(withGenerics.genericTypeName()));
+
                             contractSet.add(ResolvedType.create(
                                     TypeName.builder()
                                             .from(withGenerics)
                                             .typeArguments(wildcards)
                                             .build()));
+
                             if (extendsValid) {
                                 contractSet.add(ResolvedType.create(
                                         TypeName.builder()

service/registry/src/main/java/io/helidon/service/registry/Service.java

@@ -126,11 +126,14 @@ private Service() {
      * Injections to different scopes are supported, but must be through a {@link java.util.function.Supplier},
      * as we do not provide a proxy mechanism for instances.
      * <p>
-     * Request scope is not started by default. If you want to use request scope, you can add the following
-     * library to your classpath to add support for it:
-     * <ul>
-     *     <li>{@code io.helidon.declarative.webserver:helidon-declarative-webserver-request-scope}</li>
-     * </ul>
+     * Request scope is not enabled by default in the Webserver. To do so, enable the feature
+     * as follows:
+     * <pre>
+     * server:
+     *   features:
+     *     request-scope:
+     *       enabled: true
+     * </pre>
      */
     @Documented
     @Retention(RetentionPolicy.CLASS)

webserver/webserver/src/main/java/io/helidon/webserver/WebServerConfigBlueprint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2026 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 @Prototype.Blueprint(decorator = WebServerConfigSupport.ServerConfigDecorator.class)
 @Prototype.CustomMethods(WebServerConfigSupport.CustomMethods.class)
 @Prototype.Configured("server")
+@Prototype.RegistrySupport
 interface WebServerConfigBlueprint extends ListenerConfigBlueprint, Prototype.Factory<WebServer> {
     /**
      * When true the webserver registers a shutdown hook with the JVM Runtime.