Merge pull request wildfly#17525 from pferraro/WFLY-18912

WFLY-18912 Fix capability name resolution issues in undertow subsystem

undertow/src/main/java/org/wildfly/extension/undertow/AbstractHttpListenerResourceDefinition.java

@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 
 import io.undertow.UndertowOptions;
 import io.undertow.protocols.http2.Http2Channel;
@@ -128,7 +127,7 @@ abstract class AbstractHttpListenerResourceDefinition extends ListenerResourceDe
             REQUIRE_HOST_HTTP11,
             PROXY_PROTOCOL);
 
-    AbstractHttpListenerResourceDefinition(SimpleResourceDefinition.Parameters parameters, Function<Collection<AttributeDefinition>, AbstractAddStepHandler> addHandlerFactory) {
-        super(parameters, addHandlerFactory, Map.of(WORKER, new HttpListenerWorkerAttributeWriteHandler(WORKER)));
+    AbstractHttpListenerResourceDefinition(SimpleResourceDefinition.Parameters parameters, AbstractAddStepHandler addHandler) {
+        super(parameters, addHandler, Map.of(WORKER, new HttpListenerWorkerAttributeWriteHandler()));
     }
 }

undertow/src/main/java/org/wildfly/extension/undertow/AccessLogAdd.java

@@ -13,7 +13,6 @@
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.services.path.PathManager;
-import org.jboss.as.controller.services.path.PathManagerService;
 import org.jboss.dmr.ModelNode;
 import org.xnio.XnioWorker;
 
@@ -26,10 +25,6 @@
  */
 final class AccessLogAdd extends AbstractAddStepHandler {
 
-    private AccessLogAdd() {
-        super(AccessLogDefinition.ATTRIBUTES);
-    }
-
     static final AccessLogAdd INSTANCE = new AccessLogAdd();
 
     @Override
@@ -58,10 +53,10 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         final String hostName = hostAddress.getLastElement().getValue();
 
         final CapabilityServiceBuilder<?> sb = context.getCapabilityServiceTarget().addCapability(AccessLogDefinition.ACCESS_LOG_CAPABILITY);
-        final Consumer<AccessLogService> sConsumer = sb.provides(AccessLogDefinition.ACCESS_LOG_CAPABILITY, UndertowService.accessLogServiceName(serverName, hostName));
+        final Consumer<AccessLogService> sConsumer = sb.provides(AccessLogDefinition.ACCESS_LOG_CAPABILITY);
         final Supplier<Host> hSupplier = sb.requiresCapability(Capabilities.CAPABILITY_HOST, Host.class, serverName, hostName);
         final Supplier<XnioWorker> wSupplier = sb.requiresCapability(Capabilities.REF_IO_WORKER, XnioWorker.class, worker);
-        final Supplier<PathManager> pmSupplier = sb.requires(PathManagerService.SERVICE_NAME);
+        final Supplier<PathManager> pmSupplier = sb.requires(PathManager.SERVICE_DESCRIPTOR);
         final AccessLogService service;
         if (useServerLog) {
             service = new AccessLogService(sConsumer, hSupplier, wSupplier, pmSupplier, pattern, extended, predicate);

undertow/src/main/java/org/wildfly/extension/undertow/AccessLogDefinition.java

@@ -10,13 +10,14 @@
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.PersistentResourceDefinition;
+import org.jboss.as.controller.ServiceRemoveStepHandler;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleResourceDefinition;
 import org.jboss.as.controller.access.constraint.SensitivityClassification;
 import org.jboss.as.controller.access.management.AccessConstraintDefinition;
 import org.jboss.as.controller.access.management.SensitiveTargetAccessConstraintDefinition;
-import org.jboss.as.controller.capability.DynamicNameMappers;
+import org.jboss.as.controller.capability.BinaryCapabilityNameResolver;
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
 import org.jboss.dmr.ModelNode;
@@ -29,7 +30,7 @@
 class AccessLogDefinition extends PersistentResourceDefinition {
     static final PathElement PATH_ELEMENT = PathElement.pathElement(Constants.SETTING, Constants.ACCESS_LOG);
     static final RuntimeCapability<Void> ACCESS_LOG_CAPABILITY = RuntimeCapability.Builder.of(Capabilities.CAPABILITY_ACCESS_LOG, true, AccessLogService.class)
-              .setDynamicNameMapper(DynamicNameMappers.GRAND_PARENT)
+              .setDynamicNameMapper(BinaryCapabilityNameResolver.GRANDPARENT_PARENT)
               .build();
 
 
@@ -113,7 +114,7 @@ class AccessLogDefinition extends PersistentResourceDefinition {
     AccessLogDefinition() {
         super(new SimpleResourceDefinition.Parameters(PATH_ELEMENT, UndertowExtension.getResolver(PATH_ELEMENT.getValue()))
                 .setAddHandler(AccessLogAdd.INSTANCE)
-                .setRemoveHandler(AccessLogRemove.INSTANCE)
+                .setRemoveHandler(new ServiceRemoveStepHandler(AccessLogAdd.INSTANCE))
                 .setCapabilities(ACCESS_LOG_CAPABILITY)
         );
         SensitivityClassification sc = new SensitivityClassification(UndertowExtension.SUBSYSTEM_NAME, "web-access-log", false, false, false);
@@ -128,6 +129,6 @@ public List<AccessConstraintDefinition> getAccessConstraints() {
     @Override
     public Collection<AttributeDefinition> getAttributes() {
         //noinspection unchecked
-        return (Collection) ATTRIBUTES;
+        return ATTRIBUTES;
     }
 }

undertow/src/main/java/org/wildfly/extension/undertow/AjpListenerAdd.java

@@ -5,17 +5,13 @@
 
 package org.wildfly.extension.undertow;
 
-import static org.wildfly.extension.undertow.Capabilities.REF_SOCKET_BINDING;
-
-import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.CapabilityServiceBuilder;
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.network.SocketBinding;
 import org.jboss.dmr.ModelNode;
 import org.xnio.OptionMap;
 
-import java.util.Collection;
 import java.util.function.Consumer;
 
 /**
@@ -24,10 +20,6 @@
  */
 class AjpListenerAdd extends ListenerAdd<AjpListenerService> {
 
-    AjpListenerAdd(Collection<AttributeDefinition> attributes) {
-        super(attributes);
-    }
-
     @Override
     AjpListenerService createService(final Consumer<ListenerService> serviceConsumer, final String name, final String serverName, final OperationContext context, ModelNode model, OptionMap listenerOptions, OptionMap socketOptions) throws OperationFailedException {
         ModelNode schemeNode = AjpListenerResourceDefinition.SCHEME.resolveModelAttribute(context, model);
@@ -44,7 +36,7 @@ AjpListenerService createService(final Consumer<ListenerService> serviceConsumer
     void configureAdditionalDependencies(OperationContext context, CapabilityServiceBuilder<?> serviceBuilder, ModelNode model, AjpListenerService service) throws OperationFailedException {
         ModelNode redirectBindingRef = ListenerResourceDefinition.REDIRECT_SOCKET.resolveModelAttribute(context, model);
         if (redirectBindingRef.isDefined()) {
-            service.getRedirectSocket().set(serviceBuilder.requiresCapability(REF_SOCKET_BINDING, SocketBinding.class, redirectBindingRef.asString()));
+            service.getRedirectSocket().set(serviceBuilder.requires(SocketBinding.SERVICE_DESCRIPTOR, redirectBindingRef.asString()));
         }
     }
 }

undertow/src/main/java/org/wildfly/extension/undertow/AjpListenerResourceDefinition.java

@@ -48,7 +48,7 @@ public class AjpListenerResourceDefinition extends ListenerResourceDefinition {
     static final List<AttributeDefinition> ATTRIBUTES = List.of(SCHEME, REDIRECT_SOCKET, MAX_AJP_PACKET_SIZE);
 
     AjpListenerResourceDefinition() {
-        super(new SimpleResourceDefinition.Parameters(PATH_ELEMENT, UndertowExtension.getResolver(Constants.LISTENER)), AjpListenerAdd::new, Map.of());
+        super(new SimpleResourceDefinition.Parameters(PATH_ELEMENT, UndertowExtension.getResolver(Constants.LISTENER)), new AjpListenerAdd(), Map.of());
     }
 
     @Override

undertow/src/main/java/org/wildfly/extension/undertow/ApplicationSecurityDomainDefinition.java

@@ -226,7 +226,6 @@ private static class AddHandler extends AbstractAddStepHandler {
         private final SecurityDomainSingleSignOnManagementProvider provider;
 
         private AddHandler(Set<String> knownApplicationSecurityDomains) {
-            super(ATTRIBUTES);
             this.knownApplicationSecurityDomains = knownApplicationSecurityDomains;
             Iterator<SecurityDomainSingleSignOnManagementProvider> providers = ServiceLoader.load(SecurityDomainSingleSignOnManagementProvider.class, SecurityDomainSingleSignOnManagementProvider.class.getClassLoader()).iterator();
             this.provider = providers.hasNext() ? providers.next() : NonDistributableSingleSignOnManagementProvider.INSTANCE;

undertow/src/main/java/org/wildfly/extension/undertow/ByteBufferPoolDefinition.java

@@ -118,10 +118,6 @@ public Collection<AttributeDefinition> getAttributes() {
 
     private static class BufferPoolAdd extends AbstractAddStepHandler {
 
-        private BufferPoolAdd() {
-            super(ByteBufferPoolDefinition.ATTRIBUTES);
-        }
-
         @Override
         protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException {
             final ModelNode bufferSizeModel = BUFFER_SIZE.resolveModelAttribute(context, model);

undertow/src/main/java/org/wildfly/extension/undertow/Capabilities.java

@@ -15,6 +15,7 @@ public final class Capabilities {
     public static final String CAPABILITY_UNDERTOW = "org.wildfly.undertow";
     public static final String CAPABILITY_LISTENER = "org.wildfly.undertow.listener";
     public static final String CAPABILITY_SERVER = "org.wildfly.undertow.server";
+    public static final String CAPABILITY_SERVER_LISTENER = "org.wildfly.undertow.server.listener";
     public static final String CAPABILITY_HOST = "org.wildfly.undertow.host";
     public static final String CAPABILITY_HOST_SSO = "org.wildfly.undertow.host.sso";
     public static final String CAPABILITY_LOCATION = "org.wildfly.undertow.host.location";
@@ -38,11 +39,9 @@ public final class Capabilities {
 
     public static final String REF_IO_WORKER = "org.wildfly.io.worker";
     public static final String REF_SECURITY_DOMAIN = "org.wildfly.security.security-domain";
-    public static final String REF_SOCKET_BINDING = "org.wildfly.network.socket-binding";
     public static final String REF_SSL_CONTEXT = "org.wildfly.security.ssl-context";
     public static final String REF_HTTP_AUTHENTICATION_FACTORY = "org.wildfly.security.http-authentication-factory";
     public static final String REF_HTTP_LISTENER_REGISTRY = "org.wildfly.remoting.http-listener-registry";
-    public static final String REF_OUTBOUND_SOCKET = "org.wildfly.network.outbound-socket-binding";
     public static final String REF_REQUEST_CONTROLLER = "org.wildfly.request-controller";
     public static final String REF_SUSPEND_CONTROLLER = "org.wildfly.server.suspend-controller";
 }

undertow/src/main/java/org/wildfly/extension/undertow/ConsoleAccessLogDefinition.java

@@ -25,7 +25,7 @@
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleResourceDefinition;
-import org.jboss.as.controller.capability.DynamicNameMappers;
+import org.jboss.as.controller.capability.BinaryCapabilityNameResolver;
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
@@ -43,7 +43,7 @@ class ConsoleAccessLogDefinition extends PersistentResourceDefinition {
     static final PathElement PATH_ELEMENT = PathElement.pathElement(Constants.SETTING, Constants.CONSOLE_ACCESS_LOG);
     private static final RuntimeCapability<Void> CONSOLE_ACCESS_LOG_CAPABILITY = RuntimeCapability.Builder.of(
             Capabilities.CAPABILITY_CONSOLE_ACCESS_LOG, true, EventLoggerService.class)
-            .setDynamicNameMapper(DynamicNameMappers.GRAND_PARENT)
+            .setDynamicNameMapper(BinaryCapabilityNameResolver.GRANDPARENT_PARENT)
             .build();
 
     static final SimpleAttributeDefinition INCLUDE_HOST_NAME = SimpleAttributeDefinitionBuilder.create("include-host-name", ModelType.BOOLEAN, true)
@@ -81,10 +81,6 @@ public Collection<AttributeDefinition> getAttributes() {
     private static class AddHandler extends AbstractAddStepHandler {
         static final AddHandler INSTANCE = new AddHandler();
 
-        private AddHandler() {
-            super(ATTRIBUTES);
-        }
-
         @Override
         protected void performRuntime(final OperationContext context, final ModelNode operation, final ModelNode model) throws OperationFailedException {
             final PathAddress address = context.getCurrentAddress();

undertow/src/main/java/org/wildfly/extension/undertow/CrawlerSessionManagementDefinition.java

@@ -96,7 +96,7 @@ protected void recreateParentService(OperationContext context, PathAddress paren
 
         @Override
         protected ServiceName getParentServiceName(PathAddress parentAddress) {
-            return UndertowService.SERVLET_CONTAINER.append(parentAddress.getLastElement().getValue());
+            return ServletContainerDefinition.SERVLET_CONTAINER_CAPABILITY.getCapabilityServiceName(parentAddress);
         }
     }
 
@@ -113,7 +113,7 @@ protected void recreateParentService(OperationContext context, PathAddress paren
 
         @Override
         protected ServiceName getParentServiceName(PathAddress parentAddress) {
-            return UndertowService.SERVLET_CONTAINER.append(parentAddress.getLastElement().getValue());
+            return ServletContainerDefinition.SERVLET_CONTAINER_CAPABILITY.getCapabilityServiceName(parentAddress);
         }
     }
 }

undertow/src/main/java/org/wildfly/extension/undertow/HostAdd.java

@@ -42,10 +42,6 @@ final class HostAdd extends AbstractAddStepHandler {
 
     static final HostAdd INSTANCE = new HostAdd();
 
-    private HostAdd() {
-        super(HostDefinition.ATTRIBUTES);
-    }
-
     @Override
     protected void recordCapabilitiesAndRequirements(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
         super.recordCapabilitiesAndRequirements(context, operation, resource);
@@ -88,11 +84,9 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         Consumer<Host> hostConsumer;
         if (isDefaultHost) {
             addCommonHost(context, aliases, serverName, virtualHostServiceName);
-            final RuntimeCapability<?>[] capabilitiesParam = new RuntimeCapability<?>[] {HostDefinition.HOST_CAPABILITY};
-            final ServiceName[] serviceNamesParam = new ServiceName[] {UndertowService.virtualHostName(serverName, name), UndertowService.DEFAULT_HOST};
-            hostConsumer = csb.provides(capabilitiesParam, serviceNamesParam);
+            hostConsumer = csb.provides(HostDefinition.HOST_CAPABILITY, UndertowService.DEFAULT_HOST);
         } else {
-            hostConsumer = csb.provides(HostDefinition.HOST_CAPABILITY, UndertowService.virtualHostName(serverName, name));
+            hostConsumer = csb.provides(HostDefinition.HOST_CAPABILITY);
         }
         final Supplier<Server> sSupplier = csb.requiresCapability(Capabilities.CAPABILITY_SERVER, Server.class, serverName);
         final Supplier<UndertowService> usSupplier = csb.requiresCapability(Capabilities.CAPABILITY_UNDERTOW, UndertowService.class);

undertow/src/main/java/org/wildfly/extension/undertow/HostDefinition.java

@@ -17,7 +17,7 @@
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleResourceDefinition;
 import org.jboss.as.controller.StringListAttributeDefinition;
-import org.jboss.as.controller.capability.DynamicNameMappers;
+import org.jboss.as.controller.capability.BinaryCapabilityNameResolver;
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.as.controller.operations.validation.IntRangeValidator;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
@@ -36,8 +36,7 @@ class HostDefinition extends PersistentResourceDefinition {
 
     static final RuntimeCapability<Void> HOST_CAPABILITY = RuntimeCapability.Builder.of(Capabilities.CAPABILITY_HOST, true, Host.class)
             .addRequirements(Capabilities.CAPABILITY_UNDERTOW)
-            //addDynamicRequirements(Capabilities.CAPABILITY_SERVER) -- has no function so don't use it
-            .setDynamicNameMapper(DynamicNameMappers.PARENT)
+            .setDynamicNameMapper(BinaryCapabilityNameResolver.PARENT_CHILD)
             .build();
 
 

undertow/src/main/java/org/wildfly/extension/undertow/HttpInvokerDefinition.java

@@ -26,12 +26,11 @@
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleResourceDefinition;
 import org.jboss.as.controller.access.management.SensitiveTargetAccessConstraintDefinition;
-import org.jboss.as.controller.capability.DynamicNameMappers;
+import org.jboss.as.controller.capability.BinaryCapabilityNameResolver;
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
-import org.jboss.msc.service.ServiceName;
 import org.wildfly.security.auth.server.HttpAuthenticationFactory;
 
 /**
@@ -42,8 +41,7 @@ public class HttpInvokerDefinition extends PersistentResourceDefinition {
     static final PathElement PATH_ELEMENT = PathElement.pathElement(Constants.SETTING, Constants.HTTP_INVOKER);
     static final RuntimeCapability<Void> HTTP_INVOKER_HOST_CAPABILITY =
                 RuntimeCapability.Builder.of(CAPABILITY_HTTP_INVOKER_HOST, true, Void.class)
-                        .setDynamicNameMapper(DynamicNameMappers.PARENT)
-                        //.addDynamicRequirements(Capabilities.CAPABILITY_HOST)
+                        .setDynamicNameMapper(BinaryCapabilityNameResolver.GRANDPARENT_PARENT)
                         .addRequirements(Capabilities.CAPABILITY_HTTP_INVOKER)
                         .build();
 
@@ -79,8 +77,8 @@ public class HttpInvokerDefinition extends PersistentResourceDefinition {
 
     HttpInvokerDefinition() {
         super(new SimpleResourceDefinition.Parameters(PATH_ELEMENT, UndertowExtension.getResolver(PATH_ELEMENT.getValue()))
-                .setAddHandler(new HttpInvokerAdd())
-                .setRemoveHandler(new HttpInvokerRemove())
+                .setAddHandler(HttpInvokerAdd.INSTANCE)
+                .setRemoveHandler(new ServiceRemoveStepHandler(HttpInvokerAdd.INSTANCE))
                 .setCapabilities(HTTP_INVOKER_HOST_CAPABILITY)
         );
     }
@@ -91,10 +89,7 @@ public Collection<AttributeDefinition> getAttributes() {
     }
 
     private static final class HttpInvokerAdd extends AbstractAddStepHandler {
-
-        HttpInvokerAdd() {
-            super(ATTRIBUTES);
-        }
+        static final AbstractAddStepHandler INSTANCE = new HttpInvokerAdd();
 
         @Override
         protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException {
@@ -125,15 +120,4 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
             sb.install();
         }
     }
-
-    private static final class HttpInvokerRemove extends ServiceRemoveStepHandler {
-        HttpInvokerRemove() {
-            super(new HttpInvokerAdd());
-        }
-
-        @Override
-        protected ServiceName serviceName(String name, PathAddress address) {
-            return HTTP_INVOKER_HOST_CAPABILITY.getCapabilityServiceName(address);
-        }
-    }
 }