Skip to content

Commit

Permalink
WFCORE-6914 Remove usage of deprecated AbstractAddStepHandler constru…
Browse files Browse the repository at this point in the history
…ctors in tests
  • Loading branch information
pferraro committed Jul 19, 2024
1 parent 72ea1a2 commit 5c24c9f
Showing 9 changed files with 7 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ protected void initializeExtraSubystemsAndModel(ExtensionRegistry extensionRegis

static void registerIOExtension(ExtensionRegistry extensionRegistry, ManagementResourceRegistration rootRegistration) {
ManagementResourceRegistration extReg = rootRegistration.registerSubModel(new SimpleResourceDefinition(PathElement.pathElement(EXTENSION, "org.wildfly.extension.io"),
NonResolvingResourceDescriptionResolver.INSTANCE, new ModelOnlyAddStepHandler(), ModelOnlyRemoveStepHandler.INSTANCE));
NonResolvingResourceDescriptionResolver.INSTANCE, ModelOnlyAddStepHandler.INSTANCE, ModelOnlyRemoveStepHandler.INSTANCE));
extReg.registerReadOnlyAttribute(new SimpleAttributeDefinitionBuilder("module", ModelType.STRING).build(), null);

Extension ioe = new IOExtension();
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@ protected static class TestResourceDefinition extends SimpleResourceDefinition {
protected TestResourceDefinition() {
super(SUBSYSTEM_PATH,
NonResolvingResourceDescriptionResolver.INSTANCE,
new ModelOnlyAddStepHandler(ATTRIBUTES),
ModelOnlyAddStepHandler.INSTANCE,
ModelOnlyRemoveStepHandler.INSTANCE);
}

Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ private static final class TestResourceDefinition extends SimpleResourceDefiniti
private TestResourceDefinition() {
super(SUBSYSTEM_PATH,
NonResolvingResourceDescriptionResolver.INSTANCE,
new ModelOnlyAddStepHandler(TEST),
ModelOnlyAddStepHandler.INSTANCE,
ModelOnlyRemoveStepHandler.INSTANCE);
}

@@ -88,7 +88,7 @@ private static final class PropertyResourceDefinition extends SimpleResourceDefi
private PropertyResourceDefinition() {
super(PathElement.pathElement("property"),
NonResolvingResourceDescriptionResolver.INSTANCE,
new ModelOnlyAddStepHandler(VALUE),
ModelOnlyAddStepHandler.INSTANCE,
ModelOnlyRemoveStepHandler.INSTANCE);
}

Original file line number Diff line number Diff line change
@@ -129,10 +129,6 @@ private static ServiceName createServiceName(PathAddress address) {

private static class AddSubsystemHandler extends AbstractAddStepHandler {

AddSubsystemHandler() {
super(NAME, SOCKET_BINDING);
}

@Override
protected void performRuntime(OperationContext context, ModelNode operation, Resource resource)
throws OperationFailedException {
Original file line number Diff line number Diff line change
@@ -135,10 +135,6 @@ public Collection<AttributeDefinition> getAttributes() {

public static final class AddHandler extends AbstractBoottimeAddStepHandler {

private AddHandler() {
super(ATTR);
}

@Override
protected void performBoottime(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {

Original file line number Diff line number Diff line change
@@ -81,10 +81,6 @@ private static class AddSubsystemHandler extends AbstractAddStepHandler {

private static final AbstractAddStepHandler INSTANCE = new AddSubsystemHandler();

private AddSubsystemHandler() {
super(ATTRIBUTE);
}

@Override
protected void performRuntime(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
String osb = ATTRIBUTE.resolveModelAttribute(context, resource.getModel()).asString();
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ private static class OperationTypesSubsystemResourceDefinition extends SimpleRes

private OperationTypesSubsystemResourceDefinition(ProcessType processType) {
super(new Parameters(PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME), NonResolvingResourceDescriptionResolver.INSTANCE)
.setAddHandler(new ModelOnlyAddStepHandler())
.setAddHandler(ModelOnlyAddStepHandler.INSTANCE)
.setRemoveHandler(new ModelOnlyRemoveStepHandler())
);
this.processType = processType;
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ public class CliExtCommandsSubsystemResourceDescription extends SimpleResourceDe
public static final PathElement PATH = PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, CliExtCommandsExtension.SUBSYSTEM_NAME);

public CliExtCommandsSubsystemResourceDescription() {
super(PATH, NonResolvingResourceDescriptionResolver.INSTANCE, new ModelOnlyAddStepHandler(), new AbstractRemoveStepHandler(){});
super(PATH, NonResolvingResourceDescriptionResolver.INSTANCE, ModelOnlyAddStepHandler.INSTANCE, new AbstractRemoveStepHandler(){});
}

@Override
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ public class DuplicateExtCommandSubsystemResourceDescription extends SimpleResou
public static final PathElement PATH = PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, DuplicateExtCommandsExtension.SUBSYSTEM_NAME);

public DuplicateExtCommandSubsystemResourceDescription() {
super(PATH, NonResolvingResourceDescriptionResolver.INSTANCE, new ModelOnlyAddStepHandler(), new AbstractRemoveStepHandler() {
super(PATH, NonResolvingResourceDescriptionResolver.INSTANCE, ModelOnlyAddStepHandler.INSTANCE, new AbstractRemoveStepHandler() {
});
}

0 comments on commit 5c24c9f

Please sign in to comment.