From 18b1f10b93a398fb308760bd6342f3c264adb488 Mon Sep 17 00:00:00 2001 From: Paul Ferraro Date: Sun, 25 Jun 2023 14:48:32 +0100 Subject: [PATCH] WFCORE-6407 Remove use of deprecated AbstractAddStepHandler constructor in discovery subsystem. Use static OperationStepHandler instances wherever possible. --- .../discovery/AggregateDiscoveryProviderAddHandler.java | 4 ---- .../discovery/AggregateDiscoveryProviderDefinition.java | 2 +- .../extension/discovery/DiscoverySubsystemDefinition.java | 2 +- .../discovery/StaticDiscoveryProviderAddHandler.java | 4 ---- .../discovery/StaticDiscoveryProviderDefinition.java | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/discovery/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderAddHandler.java b/discovery/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderAddHandler.java index 707870377c8..2970fb3ee53 100644 --- a/discovery/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderAddHandler.java +++ b/discovery/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/discovery/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderDefinition.java b/discovery/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderDefinition.java index 80b6175dfe5..dc076c2e508 100644 --- a/discovery/src/main/java/org/wildfly/extension/discovery/AggregateDiscoveryProviderDefinition.java +++ b/discovery/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 index 1ff5fb5f2ae..3966d471880 100644 --- 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/discovery/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderAddHandler.java b/discovery/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderAddHandler.java index 97252406130..388914e1d91 100644 --- a/discovery/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderAddHandler.java +++ b/discovery/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 services = StaticDiscoveryProviderDefinition.SERVICES.resolveModelAttribute(context, resource.getModel()).asListOrEmpty(); diff --git a/discovery/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderDefinition.java b/discovery/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderDefinition.java index d6b674b525b..f55a8418a6f 100644 --- a/discovery/src/main/java/org/wildfly/extension/discovery/StaticDiscoveryProviderDefinition.java +++ b/discovery/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); } }