WFCORE-6407 Remove use of deprecated AbstractAddStepHandler construct…

…or in discovery subsystem. Use static OperationStepHandler instances wherever possible.
wildfly · Jun 25, 2023 · 80e55fc · 80e55fc
1 parent 6937832
commit 80e55fc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/...y/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderAddHandler.java b/...y/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderAddHandler.java
@@ -44,10 +44,6 @@
  */
 class AggregateDiscoveryProviderAddHandler extends AbstractAddStepHandler {
 
-    AggregateDiscoveryProviderAddHandler() {
-        super(new Parameters().addAttribute(AggregateDiscoveryProviderDefinition.PROVIDER_NAMES));
-    }
-
     @Override
     protected void performRuntime(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
         ServiceName name = DiscoveryExtension.DISCOVERY_PROVIDER_CAPABILITY.getCapabilityServiceName(context.getCurrentAddress());

diff --git a/...y/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderDefinition.java b/...y/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderDefinition.java
@@ -58,6 +58,6 @@ final class AggregateDiscoveryProviderDefinition extends SimpleResourceDefinitio
 
     @Override
     public void registerAttributes(final ManagementResourceRegistration resourceRegistration) {
-        resourceRegistration.registerReadWriteAttribute(PROVIDER_NAMES, null, new ReloadRequiredWriteAttributeHandler(PROVIDER_NAMES));
+        resourceRegistration.registerReadWriteAttribute(PROVIDER_NAMES, null, ReloadRequiredWriteAttributeHandler.INSTANCE);
     }
 }
diff --git a/discovery/src/main/java/org/wildfly/extension/discovery/DiscoverySubsystemDefinition.java b/discovery/src/main/java/org/wildfly/extension/discovery/DiscoverySubsystemDefinition.java
@@ -50,7 +50,7 @@ static TransformationDescription buildTransformers(ModelVersion version) {
 
     DiscoverySubsystemDefinition() {
         super(new Parameters(PATH, DiscoveryExtension.SUBSYSTEM_RESOLVER)
-            .setAddHandler(new ModelOnlyAddStepHandler())
+            .setAddHandler(ModelOnlyAddStepHandler.INSTANCE)
             .setRemoveHandler(ReloadRequiredRemoveStepHandler.INSTANCE)
         );
     }

diff --git a/...very/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderAddHandler.java b/...very/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderAddHandler.java
@@ -47,10 +47,6 @@
  */
 class StaticDiscoveryProviderAddHandler extends AbstractAddStepHandler {
 
-    StaticDiscoveryProviderAddHandler() {
-        super(new Parameters().addAttribute(StaticDiscoveryProviderDefinition.SERVICES));
-    }
-
     @Override
     protected void performRuntime(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
         List<ModelNode> services = StaticDiscoveryProviderDefinition.SERVICES.resolveModelAttribute(context, resource.getModel()).asListOrEmpty();

diff --git a/...very/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderDefinition.java b/...very/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderDefinition.java
@@ -90,6 +90,6 @@ final class StaticDiscoveryProviderDefinition extends SimpleResourceDefinition {
 
     @Override
     public void registerAttributes(final ManagementResourceRegistration resourceRegistration) {
-        resourceRegistration.registerReadWriteAttribute(SERVICES, null, new ReloadRequiredWriteAttributeHandler(SERVICES));
+        resourceRegistration.registerReadWriteAttribute(SERVICES, null, ReloadRequiredWriteAttributeHandler.INSTANCE);
     }
 }