Merge pull request #861 from bstansberry/cap-AD

Make it simpler to register a capability reference on an AttributeDef…
wildfly · Jul 4, 2015 · 9679062 · 9679062
2 parents 9e1a4ae + ac81393
commit 9679062
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/controller/src/main/java/org/jboss/as/controller/SimpleAttributeDefinitionBuilder.java b/controller/src/main/java/org/jboss/as/controller/SimpleAttributeDefinitionBuilder.java
@@ -22,6 +22,7 @@
 
 package org.jboss.as.controller;
 
+import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
@@ -96,8 +97,29 @@ public SimpleAttributeDefinitionBuilder(final String attributeName, final Simple
      * {@link org.jboss.as.controller.capability.RuntimeCapability#isDynamicallyNamed() dynamic capability}.
      * <p>
      * This method is a convenience method equivalent to calling
-     * {@link #setCapabilityReference(SimpleAttributeDefinition.CapabilityReferenceRecorder)}
-     * passing in a {@link org.jboss.as.controller.SimpleAttributeDefinition.DefaultCapabilityReferenceRecorder}
+     * {@link #setCapabilityReference(CapabilityReferenceRecorder)}
+     * passing in a {@link org.jboss.as.controller.CapabilityReferenceRecorder.DefaultCapabilityReferenceRecorder}
+     * constructed using the parameters passed to this method.
+     *
+     * @param referencedCapability the name of the dynamic capability the dynamic portion of whose name is
+     *                             represented by the attribute's value
+     * @param dependentCapability the capability that depends on {@code referencedCapability}
+     * @return the builder
+     *
+     * @see SimpleAttributeDefinition#addCapabilityRequirements(OperationContext, ModelNode)
+     * @see SimpleAttributeDefinition#removeCapabilityRequirements(OperationContext, ModelNode)
+     */
+    public SimpleAttributeDefinitionBuilder setCapabilityReference(String referencedCapability, RuntimeCapability<?> dependentCapability) {
+        return setCapabilityReference(referencedCapability, dependentCapability.getName(), dependentCapability.isDynamicallyNamed());
+    }
+
+    /**
+     * Records that this attribute's value represents a reference to an instance of a
+     * {@link org.jboss.as.controller.capability.RuntimeCapability#isDynamicallyNamed() dynamic capability}.
+     * <p>
+     * This method is a convenience method equivalent to calling
+     * {@link #setCapabilityReference(CapabilityReferenceRecorder)}
+     * passing in a {@link org.jboss.as.controller.CapabilityReferenceRecorder.DefaultCapabilityReferenceRecorder}
      * constructed using the parameters passed to this method.
      *
      * @param referencedCapability the name of the dynamic capability the dynamic portion of whose name is

diff --git a/remoting/subsystem/src/main/java/org/jboss/as/remoting/ConnectorResource.java b/remoting/subsystem/src/main/java/org/jboss/as/remoting/ConnectorResource.java
@@ -62,7 +62,7 @@ public class ConnectorResource extends SimpleResourceDefinition {
 
     static final SimpleAttributeDefinition SOCKET_BINDING = new SimpleAttributeDefinitionBuilder(CommonAttributes.SOCKET_BINDING, ModelType.STRING, false)
             .addAccessConstraint(SensitiveTargetAccessConstraintDefinition.SOCKET_BINDING_REF)
-            .setCapabilityReference(SOCKET_CAPABILITY_NAME, CONNECTOR_CAPABILITY_NAME, true)
+            .setCapabilityReference(SOCKET_CAPABILITY_NAME, CONNECTOR_CAPABILITY)
             .build();
 
     static final SimpleAttributeDefinition SECURITY_REALM = new SimpleAttributeDefinitionBuilder(CommonAttributes.SECURITY_REALM, ModelType.STRING, true)

diff --git a/...system/src/main/java/org/jboss/as/remoting/LocalOutboundConnectionResourceDefinition.java b/...system/src/main/java/org/jboss/as/remoting/LocalOutboundConnectionResourceDefinition.java
@@ -44,7 +44,7 @@ class LocalOutboundConnectionResourceDefinition extends AbstractOutboundConnecti
             .setAllowExpression(true)
             .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, false, true))
             .addAccessConstraint(SensitiveTargetAccessConstraintDefinition.SOCKET_BINDING_REF)
-            .setCapabilityReference(OUTBOUND_SOCKET_BINDING_CAPABILITY_NAME, OUTBOUND_CONNECTION_CAPABILITY_NAME, true)
+            .setCapabilityReference(OUTBOUND_SOCKET_BINDING_CAPABILITY_NAME, OUTBOUND_CONNECTION_CAPABILITY)
             .build();
 
     static final LocalOutboundConnectionResourceDefinition INSTANCE = new LocalOutboundConnectionResourceDefinition();

diff --git a/...ystem/src/main/java/org/jboss/as/remoting/RemoteOutboundConnectionResourceDefinition.java b/...ystem/src/main/java/org/jboss/as/remoting/RemoteOutboundConnectionResourceDefinition.java
@@ -48,7 +48,7 @@ class RemoteOutboundConnectionResourceDefinition extends AbstractOutboundConnect
             .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, false, true))
             .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
             .addAccessConstraint(SensitiveTargetAccessConstraintDefinition.SOCKET_BINDING_REF)
-            .setCapabilityReference(OUTBOUND_SOCKET_BINDING_CAPABILITY_NAME, OUTBOUND_CONNECTION_CAPABILITY_NAME, true)
+            .setCapabilityReference(OUTBOUND_SOCKET_BINDING_CAPABILITY_NAME, OUTBOUND_CONNECTION_CAPABILITY)
             .build();
 
     public static final SimpleAttributeDefinition USERNAME = new SimpleAttributeDefinitionBuilder(CommonAttributes.USERNAME, ModelType.STRING, true)

diff --git a/remoting/subsystem/src/main/java/org/jboss/as/remoting/RemotingEndpointResource.java b/remoting/subsystem/src/main/java/org/jboss/as/remoting/RemotingEndpointResource.java
@@ -53,7 +53,7 @@ public class RemotingEndpointResource extends PersistentResourceDefinition {
             .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
             .setValidator(new StringLengthValidator(1))
             .setDefaultValue(new ModelNode("default"))
-            .setCapabilityReference(IO_WORKER_CAPABILITY, REMOTING_ENDPOINT_CAPABILITY.getName(), false)
+            .setCapabilityReference(IO_WORKER_CAPABILITY, REMOTING_ENDPOINT_CAPABILITY)
             .build();
 
 

diff --git a/...jboss/as/server/services/net/LocalDestinationOutboundSocketBindingResourceDefinition.java b/...jboss/as/server/services/net/LocalDestinationOutboundSocketBindingResourceDefinition.java
@@ -49,7 +49,7 @@ public class LocalDestinationOutboundSocketBindingResourceDefinition extends Out
             .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, false, true))
             .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
             .addAccessConstraint(SensitiveTargetAccessConstraintDefinition.SOCKET_BINDING_REF)
-            .setCapabilityReference(SOCKET_BINDING_CAPABILITY_NAME, OutboundSocketBindingResourceDefinition.OUTBOUND_SOCKET_BINDING_CAPABILITY_NAME, true)
+            .setCapabilityReference(SOCKET_BINDING_CAPABILITY_NAME, OUTBOUND_SOCKET_BINDING_CAPABILITY)
             .build();
 
     public static final SimpleAttributeDefinition[] ATTRIBUTES = {SOURCE_PORT, SOURCE_INTERFACE, FIXED_SOURCE_PORT, SOCKET_BINDING_REF};