Deprecate AbstractAddStepHandler/AbstractRemoveStepHandler constructo…

…rs that specify capabilities.
wildfly · Jun 1, 2018 · dd1af51 · dd1af51
1 parent 095adcf
commit dd1af51
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git a/controller/src/main/java/org/jboss/as/controller/AbstractAddStepHandler.java b/controller/src/main/java/org/jboss/as/controller/AbstractAddStepHandler.java
@@ -72,7 +72,9 @@ public AbstractAddStepHandler(Collection<? extends AttributeDefinition> attribut
      * @param capability capability to register in {@link #recordCapabilitiesAndRequirements(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
      *                     {@code null} is allowed
      * @param attributes attributes to use in {@link #populateModel(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}.attributes to use in {@link #populateModel(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
+     * @deprecated Use {@link #AbstractAddStepHandler(Collection) instead. {@link RuntimeCapability} should be registered with {@link ManagementResourceRegistration}
      */
+    @Deprecated
     public AbstractAddStepHandler(RuntimeCapability capability, Collection<? extends AttributeDefinition> attributes) {
         this(capability == null ? NULL_CAPABILITIES : Collections.singleton(capability), attributes );
     }
@@ -83,7 +85,9 @@ public AbstractAddStepHandler(RuntimeCapability capability, Collection<? extends
      * @param capabilities capabilities to register in {@link #recordCapabilitiesAndRequirements(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
      *                     {@code null} is allowed
      * @param attributes   attributes to use in {@link #populateModel(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
+     * @deprecated Use {@link #AbstractAddStepHandler(Collection) instead. {@link RuntimeCapability} should be registered with {@link ManagementResourceRegistration}
      */
+    @Deprecated
     public AbstractAddStepHandler(Set<RuntimeCapability> capabilities, Collection<? extends AttributeDefinition> attributes) {
         //Please don't add more constructors, instead use the Parameters variety
         this.attributes = attributes == null ? NULL_ATTRIBUTES : attributes;
@@ -96,7 +100,9 @@ public AbstractAddStepHandler(Set<RuntimeCapability> capabilities, Collection<?
      * @param capability capability to register in {@link #recordCapabilitiesAndRequirements(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
      *                     {@code null} is allowed
      * @param attributes attributes to use in {@link #populateModel(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
+     * @deprecated Use {@link #AbstractAddStepHandler(AttributeDefinition...) instead. {@link RuntimeCapability} should be registered with {@link ManagementResourceRegistration}
      */
+    @Deprecated
     public AbstractAddStepHandler(RuntimeCapability capability, AttributeDefinition... attributes) {
         this(capability == null ? NULL_CAPABILITIES : Collections.singleton(capability), attributes);
     }
@@ -116,7 +122,9 @@ public AbstractAddStepHandler(AttributeDefinition... attributes) {
      * @param capabilities capabilities to register in {@link #recordCapabilitiesAndRequirements(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
      *                     {@code null} is allowed
      * @param attributes attributes to use in {@link #populateModel(OperationContext, org.jboss.dmr.ModelNode, org.jboss.as.controller.registry.Resource)}
+     * @deprecated Use {@link #AbstractAddStepHandler(AttributeDefinition...) instead. {@link RuntimeCapability} should be registered with {@link ManagementResourceRegistration}
      */
+    @Deprecated
     public AbstractAddStepHandler(Set<RuntimeCapability> capabilities, AttributeDefinition... attributes) {
         this(capabilities, attributes.length > 0 ? Arrays.asList(attributes) : NULL_ATTRIBUTES);
     }
@@ -472,6 +480,7 @@ public static class Parameters {
         public Parameters() {
         }
 
+        @Deprecated
         public Parameters addRuntimeCapability(RuntimeCapability...capabilities) {
             Set<RuntimeCapability> capabilitySet = getOrCreateCapabilities();
             for (RuntimeCapability capability : capabilities) {
@@ -480,6 +489,7 @@ public Parameters addRuntimeCapability(RuntimeCapability...capabilities) {
             return this;
         }
 
+        @Deprecated
         public Parameters addRuntimeCapability(Set<RuntimeCapability> capabilities) {
             getOrCreateCapabilities().addAll(capabilities);
             return this;

diff --git a/controller/src/main/java/org/jboss/as/controller/AbstractBoottimeAddStepHandler.java b/controller/src/main/java/org/jboss/as/controller/AbstractBoottimeAddStepHandler.java
@@ -66,20 +66,23 @@ protected AbstractBoottimeAddStepHandler(Collection<? extends AttributeDefinitio
     /**
      * {@inheritDoc}
      */
+    @Deprecated
     protected AbstractBoottimeAddStepHandler(RuntimeCapability capability, Collection<? extends AttributeDefinition> attributes) {
         super(capability, attributes);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Deprecated
     protected AbstractBoottimeAddStepHandler(Set<RuntimeCapability> capabilities, Collection<? extends AttributeDefinition> attributes) {
         super(capabilities, attributes);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Deprecated
     protected AbstractBoottimeAddStepHandler(RuntimeCapability capability, AttributeDefinition... attributes) {
         super(capability, attributes);
     }
@@ -94,6 +97,7 @@ protected AbstractBoottimeAddStepHandler(AttributeDefinition... attributes) {
     /**
      * {@inheritDoc}
      */
+    @Deprecated
     protected AbstractBoottimeAddStepHandler(Set<RuntimeCapability> capabilities, AttributeDefinition... attributes) {
         super(capabilities, attributes);
     }

diff --git a/controller/src/main/java/org/jboss/as/controller/AbstractRemoveStepHandler.java b/controller/src/main/java/org/jboss/as/controller/AbstractRemoveStepHandler.java
@@ -51,13 +51,15 @@ public abstract class AbstractRemoveStepHandler implements OperationStepHandler
     private final Set<RuntimeCapability> capabilities;
 
     protected AbstractRemoveStepHandler() {
-        this(AbstractAddStepHandler.NULL_CAPABILITIES);
+        this.capabilities = AbstractAddStepHandler.NULL_CAPABILITIES;
     }
 
+    @Deprecated
     protected AbstractRemoveStepHandler(RuntimeCapability... capabilities) {
         this(capabilities.length == 0 ? AbstractAddStepHandler.NULL_CAPABILITIES : new HashSet<RuntimeCapability>(Arrays.asList(capabilities)));
     }
 
+    @Deprecated
     protected AbstractRemoveStepHandler(Set<RuntimeCapability> capabilities) {
         this.capabilities = capabilities == null ? AbstractAddStepHandler.NULL_CAPABILITIES : capabilities;
     }

diff --git a/controller/src/main/java/org/jboss/as/controller/ReloadRequiredAddStepHandler.java b/controller/src/main/java/org/jboss/as/controller/ReloadRequiredAddStepHandler.java
@@ -54,10 +54,13 @@ public ReloadRequiredAddStepHandler(AttributeDefinition... attributes) {
     public ReloadRequiredAddStepHandler(Collection<AttributeDefinition> attributes) {
         super(attributes);
     }
+
+    @Deprecated
     public ReloadRequiredAddStepHandler(RuntimeCapability capability, AttributeDefinition... attributes) {
         super(capability, attributes);
     }
 
+    @Deprecated
     public ReloadRequiredAddStepHandler(Set<RuntimeCapability> capabilities, Collection<AttributeDefinition> attributes) {
         super(capabilities, attributes);
     }

diff --git a/controller/src/main/java/org/jboss/as/controller/ReloadRequiredRemoveStepHandler.java b/controller/src/main/java/org/jboss/as/controller/ReloadRequiredRemoveStepHandler.java
@@ -41,6 +41,7 @@ public class ReloadRequiredRemoveStepHandler extends AbstractRemoveStepHandler {
      *
      * @param unavailableCapabilities capabilities to deregister
      */
+    @Deprecated
     public ReloadRequiredRemoveStepHandler(RuntimeCapability... unavailableCapabilities) {
         super(unavailableCapabilities);
     }

diff --git a/controller/src/main/java/org/jboss/as/controller/ServiceRemoveStepHandler.java b/controller/src/main/java/org/jboss/as/controller/ServiceRemoveStepHandler.java
@@ -52,6 +52,7 @@ public class ServiceRemoveStepHandler extends AbstractRemoveStepHandler {
      * @param unavailableCapabilities capabilities that will no longer be available once the remove occurs. Any services
      *          {@link RuntimeCapability#getCapabilityServiceValueType() exposed by the capabilities} will also be removed
      */
+    @Deprecated
     public ServiceRemoveStepHandler(final ServiceName baseServiceName, final AbstractAddStepHandler addOperation, final RuntimeCapability ... unavailableCapabilities) {
         super(unavailableCapabilities);
         this.baseServiceName = baseServiceName;
@@ -75,6 +76,7 @@ public ServiceRemoveStepHandler(final ServiceName baseServiceName, final Abstrac
      *          {@link RuntimeCapability#getCapabilityServiceValueType() exposed by the capabilities} will also be removed.
      *          Cannot be {@code null} or empty.
      */
+    @Deprecated
     public ServiceRemoveStepHandler(final AbstractAddStepHandler addOperation, final RuntimeCapability ... unavailableCapabilities) {
         this(null, addOperation, unavailableCapabilities);
     }