From dd1af51f1a33d80068b48bb08f5f38e475ea6269 Mon Sep 17 00:00:00 2001 From: Paul Ferraro Date: Wed, 2 May 2018 16:40:41 -0400 Subject: [PATCH] Deprecate AbstractAddStepHandler/AbstractRemoveStepHandler constructors that specify capabilities. --- .../jboss/as/controller/AbstractAddStepHandler.java | 10 ++++++++++ .../as/controller/AbstractBoottimeAddStepHandler.java | 4 ++++ .../jboss/as/controller/AbstractRemoveStepHandler.java | 4 +++- .../as/controller/ReloadRequiredAddStepHandler.java | 3 +++ .../as/controller/ReloadRequiredRemoveStepHandler.java | 1 + .../jboss/as/controller/ServiceRemoveStepHandler.java | 2 ++ 6 files changed, 23 insertions(+), 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 index dc2a24af97a..18da9eaec04 100644 --- 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 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 attributes) { this(capability == null ? NULL_CAPABILITIES : Collections.singleton(capability), attributes ); } @@ -83,7 +85,9 @@ public AbstractAddStepHandler(RuntimeCapability capability, Collection capabilities, Collection 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 capabilities, Collection 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 capabilitySet = getOrCreateCapabilities(); for (RuntimeCapability capability : capabilities) { @@ -480,6 +489,7 @@ public Parameters addRuntimeCapability(RuntimeCapability...capabilities) { return this; } + @Deprecated public Parameters addRuntimeCapability(Set 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 index 5f788f41cc1..5f77ee1576c 100644 --- a/controller/src/main/java/org/jboss/as/controller/AbstractBoottimeAddStepHandler.java +++ b/controller/src/main/java/org/jboss/as/controller/AbstractBoottimeAddStepHandler.java @@ -66,6 +66,7 @@ protected AbstractBoottimeAddStepHandler(Collection attributes) { super(capability, attributes); } @@ -73,6 +74,7 @@ protected AbstractBoottimeAddStepHandler(RuntimeCapability capability, Collectio /** * {@inheritDoc} */ + @Deprecated protected AbstractBoottimeAddStepHandler(Set capabilities, Collection attributes) { super(capabilities, attributes); } @@ -80,6 +82,7 @@ protected AbstractBoottimeAddStepHandler(Set capabilities, Co /** * {@inheritDoc} */ + @Deprecated protected AbstractBoottimeAddStepHandler(RuntimeCapability capability, AttributeDefinition... attributes) { super(capability, attributes); } @@ -94,6 +97,7 @@ protected AbstractBoottimeAddStepHandler(AttributeDefinition... attributes) { /** * {@inheritDoc} */ + @Deprecated protected AbstractBoottimeAddStepHandler(Set 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 index 8c8c74a6f78..cbc552d930d 100644 --- 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 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(Arrays.asList(capabilities))); } + @Deprecated protected AbstractRemoveStepHandler(Set 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 index 668295f60eb..a7c3d4699d6 100644 --- 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 attributes) { super(attributes); } + + @Deprecated public ReloadRequiredAddStepHandler(RuntimeCapability capability, AttributeDefinition... attributes) { super(capability, attributes); } + @Deprecated public ReloadRequiredAddStepHandler(Set capabilities, Collection 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 index 89e696d2909..7252bf3b314 100644 --- 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 index 88b83f2d071..35f7f939999 100644 --- 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); }