From cd160b45740489f7e7514a4f91a70ae93c6b728d Mon Sep 17 00:00:00 2001 From: Paul Ferraro Date: Wed, 25 Apr 2018 09:39:48 -0400 Subject: [PATCH] Split DynamicCapabilityNameResolver into separate classes for unary vs binary names. --- ...java => BinaryCapabilityNameResolver.java} | 22 +------ .../BinaryRequirementCapability.java | 14 ++--- .../ResourceCapabilityReference.java | 4 +- .../UnaryCapabilityNameResolver.java | 59 +++++++++++++++++++ .../UnaryRequirementCapability.java | 14 ++--- .../ClusteredCacheResourceDefinition.java | 7 ++- ...InfinispanSubsystemResourceDefinition.java | 11 +--- .../JGroupsTransportResourceDefinition.java | 11 +--- .../subsystem/StoreResourceDefinition.java | 4 +- .../TransportResourceDefinition.java | 11 +--- .../AuthProtocolResourceDefinition.java | 4 +- .../AuthTokenResourceDefinition.java | 4 +- .../subsystem/ProtocolResourceDefinition.java | 4 +- .../RemoteSiteResourceDefinition.java | 4 +- .../TransportResourceDefinition.java | 4 +- .../ElectionPolicyResourceDefinition.java | 4 +- ...nSecurityDomainSingleSignOnDefinition.java | 4 +- 17 files changed, 100 insertions(+), 85 deletions(-) rename clustering/common/src/main/java/org/jboss/as/clustering/controller/{DynamicCapabilityNameResolver.java => BinaryCapabilityNameResolver.java} (73%) create mode 100644 clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryCapabilityNameResolver.java diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/DynamicCapabilityNameResolver.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryCapabilityNameResolver.java similarity index 73% rename from clustering/common/src/main/java/org/jboss/as/clustering/controller/DynamicCapabilityNameResolver.java rename to clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryCapabilityNameResolver.java index f9706343174a..801a6dffb7c9 100644 --- a/clustering/common/src/main/java/org/jboss/as/clustering/controller/DynamicCapabilityNameResolver.java +++ b/clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryCapabilityNameResolver.java @@ -27,28 +27,10 @@ import org.jboss.as.controller.PathAddress; /** - * Dynamic name mapper implementations. + * Dynamic name mapper implementations for binary capability names. * @author Paul Ferraro */ -public enum DynamicCapabilityNameResolver implements Function { - DEFAULT() { - @Override - public String[] apply(PathAddress address) { - return new String[] { address.getLastElement().getValue() }; - } - }, - PARENT() { - @Override - public String[] apply(PathAddress address) { - return new String[] { address.getParent().getLastElement().getValue() }; - } - }, - GRANDPARENT() { - @Override - public String[] apply(PathAddress address) { - return new String[] { address.getParent().getParent().getLastElement().getValue() }; - } - }, +public enum BinaryCapabilityNameResolver implements Function { PARENT_CHILD() { @Override public String[] apply(PathAddress address) { diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryRequirementCapability.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryRequirementCapability.java index 3292b0ccd8de..ca41362353a5 100644 --- a/clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryRequirementCapability.java +++ b/clustering/common/src/main/java/org/jboss/as/clustering/controller/BinaryRequirementCapability.java @@ -22,9 +22,6 @@ package org.jboss.as.clustering.controller; - -import java.util.function.UnaryOperator; - import org.jboss.as.controller.capability.RuntimeCapability; import org.wildfly.clustering.service.BinaryRequirement; @@ -41,7 +38,7 @@ public class BinaryRequirementCapability implements Capability { * @param requirement the requirement basis */ public BinaryRequirementCapability(BinaryRequirement requirement) { - this(requirement, UnaryOperator.identity()); + this(requirement, BinaryCapabilityNameResolver.PARENT_CHILD); } /** @@ -49,12 +46,11 @@ public BinaryRequirementCapability(BinaryRequirement requirement) { * @param requirement the requirement basis * @param configurator configures the capability */ - public BinaryRequirementCapability(final BinaryRequirement requirement, UnaryOperator> configurator) { - RuntimeCapability.Builder builder = RuntimeCapability.Builder.of(requirement.getName(), true) + public BinaryRequirementCapability(BinaryRequirement requirement, BinaryCapabilityNameResolver resolver) { + this.definition = RuntimeCapability.Builder.of(requirement.getName(), true) .setServiceType(requirement.getType()) - .setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT_CHILD) - ; - this.definition = configurator.apply(builder).build(); + .setDynamicNameMapper(resolver) + .build(); } @Override diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/ResourceCapabilityReference.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/ResourceCapabilityReference.java index 9e13192b07e5..e35ac992d3e6 100644 --- a/clustering/common/src/main/java/org/jboss/as/clustering/controller/ResourceCapabilityReference.java +++ b/clustering/common/src/main/java/org/jboss/as/clustering/controller/ResourceCapabilityReference.java @@ -57,7 +57,7 @@ public ResourceCapabilityReference(Capability capability, Requirement requiremen * @param requirement the requirement of the specified capability * @param requirementNameResolver function for resolving the dynamic elements of the requirement name */ - public ResourceCapabilityReference(Capability capability, UnaryRequirement requirement, Function requirementNameResolver) { + public ResourceCapabilityReference(Capability capability, UnaryRequirement requirement, UnaryCapabilityNameResolver requirementNameResolver) { this(capability, (Requirement) requirement, requirementNameResolver); } @@ -67,7 +67,7 @@ public ResourceCapabilityReference(Capability capability, UnaryRequirement requi * @param requirement the requirement of the specified capability * @param requirementNameResolver function for resolving the dynamic elements of the requirement name */ - public ResourceCapabilityReference(Capability capability, BinaryRequirement requirement, Function requirementNameResolver) { + public ResourceCapabilityReference(Capability capability, BinaryRequirement requirement, BinaryCapabilityNameResolver requirementNameResolver) { this(capability, (Requirement) requirement, requirementNameResolver); } diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryCapabilityNameResolver.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryCapabilityNameResolver.java new file mode 100644 index 000000000000..f7b1dfffa1fe --- /dev/null +++ b/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryCapabilityNameResolver.java @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2018, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.as.clustering.controller; + +import java.util.function.Function; + +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.descriptions.ModelDescriptionConstants; + +/** + * Dynamic name mapper implementations for unary capability names. + * @author Paul Ferraro + */ +public enum UnaryCapabilityNameResolver implements Function { + DEFAULT() { + @Override + public String[] apply(PathAddress address) { + return new String[] { address.getLastElement().getValue() }; + } + }, + PARENT() { + @Override + public String[] apply(PathAddress address) { + return new String[] { address.getParent().getLastElement().getValue() }; + } + }, + GRANDPARENT() { + @Override + public String[] apply(PathAddress address) { + return new String[] { address.getParent().getParent().getLastElement().getValue() }; + } + }, + LOCAL() { + @Override + public String[] apply(PathAddress address) { + return new String[] { ModelDescriptionConstants.LOCAL }; + } + }, +} diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryRequirementCapability.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryRequirementCapability.java index 902a8930d0ad..a6d4887f9dc1 100644 --- a/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryRequirementCapability.java +++ b/clustering/common/src/main/java/org/jboss/as/clustering/controller/UnaryRequirementCapability.java @@ -22,8 +22,6 @@ package org.jboss.as.clustering.controller; -import java.util.function.UnaryOperator; - import org.jboss.as.controller.capability.RuntimeCapability; import org.wildfly.clustering.service.UnaryRequirement; @@ -40,20 +38,18 @@ public class UnaryRequirementCapability implements Capability { * @param requirement the unary requirement basis */ public UnaryRequirementCapability(UnaryRequirement requirement) { - this(requirement, UnaryOperator.identity()); + this(requirement, UnaryCapabilityNameResolver.DEFAULT); } /** * Creates a new capability based on the specified unary requirement * @param requirement the unary requirement basis - * @param configurator configures the capability */ - public UnaryRequirementCapability(UnaryRequirement requirement, UnaryOperator> configurator) { - RuntimeCapability.Builder builder = RuntimeCapability.Builder.of(requirement.getName(), true) + public UnaryRequirementCapability(UnaryRequirement requirement, UnaryCapabilityNameResolver resolver) { + this.definition = RuntimeCapability.Builder.of(requirement.getName(), true) .setServiceType(requirement.getType()) - .setDynamicNameMapper(DynamicCapabilityNameResolver.DEFAULT) - ; - this.definition = configurator.apply(builder).build(); + .setDynamicNameMapper(resolver) + .build(); } @Override diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java index fd5e01d8db9f..f5bbc984837e 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ClusteredCacheResourceDefinition.java @@ -24,7 +24,8 @@ import java.util.function.UnaryOperator; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; +import org.jboss.as.clustering.controller.BinaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ManagementResourceRegistration; import org.jboss.as.clustering.controller.MetricHandler; import org.jboss.as.clustering.controller.ResourceCapabilityReference; @@ -56,7 +57,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name) { - this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT_CHILD).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(BinaryCapabilityNameResolver.PARENT_CHILD).build(); } @Override @@ -149,7 +150,7 @@ public ResourceDescriptor apply(ResourceDescriptor descriptor) { .addAttributes(Attribute.class) .addAttributes(DeprecatedAttribute.class) .addCapabilities(Capability.class) - .addResourceCapabilityReference(new ResourceCapabilityReference(Capability.TRANSPORT, JGroupsTransportResourceDefinition.Requirement.CHANNEL, DynamicCapabilityNameResolver.PARENT)) + .addResourceCapabilityReference(new ResourceCapabilityReference(Capability.TRANSPORT, JGroupsTransportResourceDefinition.Requirement.CHANNEL, UnaryCapabilityNameResolver.PARENT)) ; } } diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanSubsystemResourceDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanSubsystemResourceDefinition.java index 241693ac34f7..3872db0487a9 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanSubsystemResourceDefinition.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanSubsystemResourceDefinition.java @@ -34,8 +34,8 @@ import org.jboss.as.clustering.controller.RequirementCapability; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceHandler; -import org.jboss.as.clustering.controller.SimpleCapabilityNameResolver; import org.jboss.as.clustering.controller.SubsystemResourceDefinition; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.UnaryRequirementCapability; import org.jboss.as.clustering.infinispan.deployment.ClusteringDependencyProcessor; import org.jboss.as.controller.ModelVersion; @@ -48,7 +48,6 @@ import org.jboss.as.server.DeploymentProcessorTarget; import org.jboss.as.server.deployment.Phase; import org.wildfly.clustering.spi.ClusteringRequirement; -import org.wildfly.clustering.spi.LocalGroupBuilderProvider; /** * The root resource of the Infinispan subsystem. @@ -61,14 +60,8 @@ public class InfinispanSubsystemResourceDefinition extends SubsystemResourceDefi static final Map LOCAL_CLUSTERING_CAPABILITIES = new EnumMap<>(ClusteringRequirement.class); static { - UnaryOperator> configurator = new UnaryOperator>() { - @Override - public RuntimeCapability.Builder apply(RuntimeCapability.Builder builder) { - return builder.setDynamicNameMapper(new SimpleCapabilityNameResolver(LocalGroupBuilderProvider.LOCAL)); - } - }; for (ClusteringRequirement requirement : EnumSet.allOf(ClusteringRequirement.class)) { - LOCAL_CLUSTERING_CAPABILITIES.put(requirement, new UnaryRequirementCapability(requirement, configurator)); + LOCAL_CLUSTERING_CAPABILITIES.put(requirement, new UnaryRequirementCapability(requirement, UnaryCapabilityNameResolver.LOCAL)); } } diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportResourceDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportResourceDefinition.java index d21747e6a73e..5be311e67374 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportResourceDefinition.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/JGroupsTransportResourceDefinition.java @@ -26,7 +26,7 @@ import java.util.function.UnaryOperator; import org.jboss.as.clustering.controller.CapabilityReference; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ResourceCapabilityReference; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.SimpleAliasEntry; @@ -91,24 +91,19 @@ public Class getType() { } } - enum Capability implements org.jboss.as.clustering.controller.Capability, UnaryOperator> { + enum Capability implements org.jboss.as.clustering.controller.Capability { TRANSPORT_CHANNEL(Requirement.CHANNEL), ; private final RuntimeCapability definition; Capability(UnaryRequirement requirement) { - this.definition = new UnaryRequirementCapability(requirement, this).getDefinition(); + this.definition = new UnaryRequirementCapability(requirement, UnaryCapabilityNameResolver.PARENT).getDefinition(); } @Override public RuntimeCapability getDefinition() { return this.definition; } - - @Override - public RuntimeCapability.Builder apply(RuntimeCapability.Builder builder) { - return builder.setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT); - } } enum Attribute implements org.jboss.as.clustering.controller.Attribute, UnaryOperator { diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreResourceDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreResourceDefinition.java index 8db03c4fd9fb..b8fa34304c6c 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreResourceDefinition.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/StoreResourceDefinition.java @@ -24,8 +24,8 @@ import java.util.function.UnaryOperator; import org.infinispan.configuration.cache.PersistenceConfiguration; +import org.jboss.as.clustering.controller.BinaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ChildResourceDefinition; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; import org.jboss.as.clustering.controller.ManagementResourceRegistration; import org.jboss.as.clustering.controller.MetricHandler; import org.jboss.as.clustering.controller.Operations; @@ -75,7 +75,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name, Class type) { - this.definition = RuntimeCapability.Builder.of(name, true).setServiceType(type).setDynamicNameMapper(DynamicCapabilityNameResolver.GRANDPARENT_PARENT).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setServiceType(type).setDynamicNameMapper(BinaryCapabilityNameResolver.GRANDPARENT_PARENT).build(); } @Override diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TransportResourceDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TransportResourceDefinition.java index b29aa7ed3759..fccf8777ce2b 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TransportResourceDefinition.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/TransportResourceDefinition.java @@ -28,13 +28,12 @@ import java.util.function.UnaryOperator; import org.jboss.as.clustering.controller.ChildResourceDefinition; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceHandler; import org.jboss.as.clustering.controller.SimpleResourceRegistration; import org.jboss.as.clustering.controller.UnaryRequirementCapability; import org.jboss.as.controller.PathElement; -import org.jboss.as.controller.capability.RuntimeCapability; import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.wildfly.clustering.spi.ClusteringRequirement; @@ -50,14 +49,8 @@ static PathElement pathElement(String value) { static final Map CLUSTERING_CAPABILITIES = new EnumMap<>(ClusteringRequirement.class); static { - UnaryOperator> configurator = new UnaryOperator>() { - @Override - public RuntimeCapability.Builder apply(RuntimeCapability.Builder builder) { - return builder.setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT); - } - }; for (ClusteringRequirement requirement : EnumSet.allOf(ClusteringRequirement.class)) { - CLUSTERING_CAPABILITIES.put(requirement, new UnaryRequirementCapability(requirement, configurator)); + CLUSTERING_CAPABILITIES.put(requirement, new UnaryRequirementCapability(requirement, UnaryCapabilityNameResolver.PARENT)); } } diff --git a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthProtocolResourceDefinition.java b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthProtocolResourceDefinition.java index 155e3258c6a5..aeaa939f8b48 100644 --- a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthProtocolResourceDefinition.java +++ b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthProtocolResourceDefinition.java @@ -24,7 +24,7 @@ import java.util.function.UnaryOperator; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ResourceCapabilityReference; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory; @@ -56,7 +56,7 @@ public ResourceDescriptor apply(ResourceDescriptor descriptor) { return this.configurator.apply(descriptor) .setAddOperationTransformation(new LegacyAddOperationTransformation("auth_class")) .setOperationTransformation(LEGACY_OPERATION_TRANSFORMER) - .addResourceCapabilityReference(new ResourceCapabilityReference(Capability.PROTOCOL, AuthTokenResourceDefinition.Capability.AUTH_TOKEN, DynamicCapabilityNameResolver.PARENT)) + .addResourceCapabilityReference(new ResourceCapabilityReference(Capability.PROTOCOL, AuthTokenResourceDefinition.Capability.AUTH_TOKEN, UnaryCapabilityNameResolver.PARENT)) ; } } diff --git a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthTokenResourceDefinition.java b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthTokenResourceDefinition.java index 68d20be06bf4..8844072d0c73 100644 --- a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthTokenResourceDefinition.java +++ b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/AuthTokenResourceDefinition.java @@ -27,7 +27,7 @@ import org.jboss.as.clustering.controller.CapabilityReference; import org.jboss.as.clustering.controller.ChildResourceDefinition; import org.jboss.as.clustering.controller.CommonUnaryRequirement; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory; import org.jboss.as.clustering.controller.SimpleResourceRegistration; @@ -58,7 +58,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability, UnaryR private final RuntimeCapability definition; Capability(String name, Class type) { - this.definition = RuntimeCapability.Builder.of(name, true).setServiceType(type).setAllowMultipleRegistrations(true).setDynamicNameMapper(DynamicCapabilityNameResolver.GRANDPARENT).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setServiceType(type).setAllowMultipleRegistrations(true).setDynamicNameMapper(UnaryCapabilityNameResolver.GRANDPARENT).build(); } @Override diff --git a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/ProtocolResourceDefinition.java b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/ProtocolResourceDefinition.java index 2eadc6cb14fc..d6acbdfea3c5 100644 --- a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/ProtocolResourceDefinition.java +++ b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/ProtocolResourceDefinition.java @@ -26,7 +26,7 @@ import java.util.function.Predicate; import java.util.function.UnaryOperator; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.BinaryCapabilityNameResolver; import org.jboss.as.clustering.controller.Operations; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory; @@ -68,7 +68,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name) { - this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT_CHILD).setAllowMultipleRegistrations(true).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(BinaryCapabilityNameResolver.PARENT_CHILD).setAllowMultipleRegistrations(true).build(); } @Override diff --git a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/RemoteSiteResourceDefinition.java b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/RemoteSiteResourceDefinition.java index 9893456c726d..e373a0144f3f 100644 --- a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/RemoteSiteResourceDefinition.java +++ b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/RemoteSiteResourceDefinition.java @@ -23,9 +23,9 @@ import java.util.function.UnaryOperator; +import org.jboss.as.clustering.controller.BinaryCapabilityNameResolver; import org.jboss.as.clustering.controller.CapabilityReference; import org.jboss.as.clustering.controller.ChildResourceDefinition; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory; import org.jboss.as.clustering.controller.ResourceServiceHandler; @@ -67,7 +67,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name) { - this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(DynamicCapabilityNameResolver.GRANDPARENT_CHILD).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(BinaryCapabilityNameResolver.GRANDPARENT_CHILD).build(); } @Override diff --git a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/TransportResourceDefinition.java b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/TransportResourceDefinition.java index c7f0d7066681..d72a939925dc 100644 --- a/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/TransportResourceDefinition.java +++ b/clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/TransportResourceDefinition.java @@ -32,7 +32,7 @@ import org.jboss.as.clustering.controller.CapabilityReference; import org.jboss.as.clustering.controller.CommonUnaryRequirement; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.Operations; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory; @@ -99,7 +99,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name) { - this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(UnaryCapabilityNameResolver.PARENT).build(); } @Override diff --git a/clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/ElectionPolicyResourceDefinition.java b/clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/ElectionPolicyResourceDefinition.java index 96bb0140e5dd..b8236ee16e5a 100644 --- a/clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/ElectionPolicyResourceDefinition.java +++ b/clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/ElectionPolicyResourceDefinition.java @@ -27,7 +27,7 @@ import org.jboss.as.clustering.controller.CapabilityReference; import org.jboss.as.clustering.controller.ChildResourceDefinition; import org.jboss.as.clustering.controller.CommonUnaryRequirement; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.clustering.controller.ResourceServiceBuilderFactory; import org.jboss.as.clustering.controller.ResourceServiceHandler; @@ -60,7 +60,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name, Class type) { - this.definition = RuntimeCapability.Builder.of(name, true).setServiceType(type).setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setServiceType(type).setDynamicNameMapper(UnaryCapabilityNameResolver.PARENT).build(); } @Override diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/ApplicationSecurityDomainSingleSignOnDefinition.java b/undertow/src/main/java/org/wildfly/extension/undertow/ApplicationSecurityDomainSingleSignOnDefinition.java index 7c4f79c1d7bc..e44c23a56668 100644 --- a/undertow/src/main/java/org/wildfly/extension/undertow/ApplicationSecurityDomainSingleSignOnDefinition.java +++ b/undertow/src/main/java/org/wildfly/extension/undertow/ApplicationSecurityDomainSingleSignOnDefinition.java @@ -26,7 +26,7 @@ import org.jboss.as.clustering.controller.CapabilityReference; import org.jboss.as.clustering.controller.CommonUnaryRequirement; -import org.jboss.as.clustering.controller.DynamicCapabilityNameResolver; +import org.jboss.as.clustering.controller.UnaryCapabilityNameResolver; import org.jboss.as.clustering.controller.ReloadRequiredResourceRegistration; import org.jboss.as.clustering.controller.ResourceDescriptor; import org.jboss.as.controller.AttributeDefinition; @@ -50,7 +50,7 @@ enum Capability implements org.jboss.as.clustering.controller.Capability { private final RuntimeCapability definition; Capability(String name) { - this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(DynamicCapabilityNameResolver.PARENT).build(); + this.definition = RuntimeCapability.Builder.of(name, true).setDynamicNameMapper(UnaryCapabilityNameResolver.PARENT).build(); } @Override