Merge pull request #5469 from bstansberry/WFCORE-6314

[WFCORE-6314] Remove @deprecated from RequestController.SERVICE_NAME …
wildfly · Apr 25, 2023 · 64cacc1 · 64cacc1
2 parents 80b4f3e + 5ded698
commit 64cacc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...t-controller/src/main/java/org/wildfly/extension/requestcontroller/RequestController.java b/...t-controller/src/main/java/org/wildfly/extension/requestcontroller/RequestController.java
@@ -59,8 +59,7 @@
  */
 public class RequestController implements Service<RequestController>, ServerActivity {
 
-    @Deprecated
-    public static final ServiceName SERVICE_NAME = RequestControllerRootDefinition.REQUEST_CONTROLLER_CAPABILITY.getCapabilityServiceName();
+    static final ServiceName SERVICE_NAME = RequestControllerRootDefinition.REQUEST_CONTROLLER_CAPABILITY.getCapabilityServiceName();
 
     private static final AtomicIntegerFieldUpdater<RequestController> activeRequestCountUpdater = AtomicIntegerFieldUpdater.newUpdater(RequestController.class, "activeRequestCount");
     private static final AtomicReferenceFieldUpdater<RequestController, ServerActivityCallback> listenerUpdater = AtomicReferenceFieldUpdater.newUpdater(RequestController.class, ServerActivityCallback.class, "listener");

diff --git a/...red/src/main/java/org/wildfly/test/suspendresumeendpoint/TestSuspendServiceActivator.java b/...red/src/main/java/org/wildfly/test/suspendresumeendpoint/TestSuspendServiceActivator.java
@@ -18,7 +18,8 @@ public void activate(ServiceActivatorContext serviceActivatorContext) throws Ser
 
         TestUndertowService testUndertowService = new TestUndertowService();
         serviceActivatorContext.getServiceTarget().addService(TestUndertowService.SERVICE_NAME, testUndertowService)
-                .addDependency(RequestController.SERVICE_NAME, RequestController.class, testUndertowService.getRequestControllerInjectedValue())
+                .addDependency(RuntimeCapability.Builder.of("org.wildfly.request-controller", RequestController.class).build().getCapabilityServiceName(),
+                        RequestController.class, testUndertowService.getRequestControllerInjectedValue())
                 .addDependency(RuntimeCapability.Builder.of("org.wildfly.management.socket-binding-manager", SocketBindingManager.class).build().getCapabilityServiceName(),
                         SocketBindingManager.class, testUndertowService.getSocketBindingManagerInjectedValue())
                 .install();