Migrate IO subsystem to SubsystemResourceXMLSchema.

io/subsystem/src/main/java/org/wildfly/extension/io/BufferPoolResourceDefinition.java

@@ -103,7 +103,7 @@ class BufferPoolResourceDefinition extends PersistentResourceDefinition {
     );
 
     BufferPoolResourceDefinition() {
-        super(new SimpleResourceDefinition.Parameters(PATH, IOSubsystemRegistrar.RESOLVER.createChildResolver(PATH))
+        super(new SimpleResourceDefinition.Parameters(PATH, IOSubsystemResourceRegistrar.RESOLVER.createChildResolver(PATH))
                 .setAddHandler(new BufferPoolAdd())
                 .setRemoveHandler(ReloadRequiredRemoveStepHandler.INSTANCE)
                 .addCapabilities(IO_POOL_RUNTIME_CAPABILITY,

io/subsystem/src/main/java/org/wildfly/extension/io/IOExtension.java

@@ -17,6 +17,6 @@
 public class IOExtension extends SubsystemExtension<IOSubsystemSchema> {
 
     public IOExtension() {
-        super(SubsystemConfiguration.of(IOSubsystemRegistrar.NAME, IOSubsystemModel.CURRENT, IOSubsystemRegistrar::new), SubsystemPersistence.of(IOSubsystemSchema.CURRENT));
+        super(SubsystemConfiguration.of(IOSubsystemResourceRegistration.INSTANCE, IOSubsystemModel.CURRENT, IOSubsystemResourceRegistrar::new), SubsystemPersistence.of(IOSubsystemSchema.CURRENT));
     }
 }

io/subsystem/src/main/java/org/wildfly/extension/io/IOExtensionTransformerRegistration.java

@@ -13,6 +13,6 @@
 public class IOExtensionTransformerRegistration extends SubsystemExtensionTransformerRegistration {
 
     public IOExtensionTransformerRegistration() {
-        super(IOSubsystemRegistrar.NAME, IOSubsystemModel.CURRENT, IOSubsystemTransformationDescriptionFactory.INSTANCE);
+        super(IOSubsystemResourceRegistration.INSTANCE, IOSubsystemModel.CURRENT, IOSubsystemTransformationDescriptionFactory.INSTANCE);
     }
 }

io/subsystem/src/main/java/org/wildfly/extension/io/IOSubsystemRegistrar.java → io/subsystem/src/main/java/org/wildfly/extension/io/IOSubsystemResourceRegistrar.java

@@ -11,9 +11,7 @@
 
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.ResourceDefinition;
-import org.jboss.as.controller.ResourceRegistration;
 import org.jboss.as.controller.SubsystemRegistration;
 import org.jboss.as.controller.capability.RuntimeCapability;
 import org.jboss.as.controller.descriptions.ParentResourceDescriptionResolver;
@@ -38,28 +36,26 @@
 /**
  * @author <a href="mailto:[email protected]">Tomaz Cerar</a> (c) 2013 Red Hat Inc.
  */
-class IOSubsystemRegistrar implements SubsystemResourceDefinitionRegistrar, ResourceServiceConfigurator {
+class IOSubsystemResourceRegistrar implements SubsystemResourceDefinitionRegistrar, ResourceServiceConfigurator {
 
-    static final String NAME = "io";
-    static final PathElement PATH = SubsystemResourceDefinitionRegistrar.pathElement(NAME);
-    static final ParentResourceDescriptionResolver RESOLVER = new SubsystemResourceDescriptionResolver(NAME, IOSubsystemRegistrar.class);
-
-    static final RuntimeCapability<Void> MAX_THREADS_CAPABILITY = RuntimeCapability.Builder.of(IOServiceDescriptor.MAX_THREADS).build();
+    static final ParentResourceDescriptionResolver RESOLVER = new SubsystemResourceDescriptionResolver(IOSubsystemResourceRegistration.INSTANCE.getName(), IOSubsystemResourceRegistrar.class);
 
     static final RuntimeCapability<Void> DEFAULT_WORKER_CAPABILITY = RuntimeCapability.Builder.of(IOServiceDescriptor.DEFAULT_WORKER).build();
 
-    static final ModelNode LEGACY_DEFAULT_WORKER = new ModelNode("default");
-
     static final CapabilityReferenceAttributeDefinition<XnioWorker> DEFAULT_WORKER = new CapabilityReferenceAttributeDefinition.Builder<>("default-worker", CapabilityReference.builder(DEFAULT_WORKER_CAPABILITY, IOServiceDescriptor.NAMED_WORKER).build())
             .setRequired(false)
             .build();
 
+    static final RuntimeCapability<Void> MAX_THREADS_CAPABILITY = RuntimeCapability.Builder.of(IOServiceDescriptor.MAX_THREADS).build();
+
+    static final ModelNode LEGACY_DEFAULT_WORKER = new ModelNode("default");
+
     // Tracks max-threads for all workers
     private final AtomicInteger maxThreads = new AtomicInteger();
 
     @Override
     public ManagementResourceRegistration register(SubsystemRegistration parent, ManagementResourceRegistrationContext context) {
-        ManagementResourceRegistration registration = parent.registerSubsystemModel(ResourceDefinition.builder(ResourceRegistration.of(PATH), RESOLVER).build());
+        ManagementResourceRegistration registration = parent.registerSubsystemModel(ResourceDefinition.builder(IOSubsystemResourceRegistration.INSTANCE, RESOLVER).build());
 
         ResourceDescriptor descriptor = ResourceDescriptor.builder(RESOLVER)
                 .addAttributes(List.of(DEFAULT_WORKER))

io/subsystem/src/main/java/org/wildfly/extension/io/IOSubsystemResourceRegistration.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.wildfly.extension.io;
+
+import org.jboss.as.controller.SubsystemResourceRegistration;
+
+/**
+ * Describes the IO subsystem resource.
+ */
+public enum IOSubsystemResourceRegistration implements SubsystemResourceRegistration {
+    INSTANCE;
+
+    @Override
+    public String getName() {
+        return "io";
+    }
+}

io/subsystem/src/main/java/org/wildfly/extension/io/IOSubsystemSchema.java

@@ -6,33 +6,36 @@
 package org.wildfly.extension.io;
 
 import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import java.util.function.UnaryOperator;
 
-import org.jboss.as.controller.PathAddress;
-import org.jboss.as.controller.PersistentResourceXMLDescription;
-import org.jboss.as.controller.PersistentSubsystemSchema;
+import org.jboss.as.controller.ResourceRegistration;
 import org.jboss.as.controller.SubsystemSchema;
+import org.jboss.as.controller.persistence.xml.ResourceModelXMLChoice;
+import org.jboss.as.controller.persistence.xml.ResourceXMLElement;
+import org.jboss.as.controller.persistence.xml.ResourceXMLParticleFactory;
+import org.jboss.as.controller.persistence.xml.SubsystemResourceXMLSchema;
 import org.jboss.as.controller.xml.VersionedNamespace;
+import org.jboss.as.controller.xml.XMLCardinality;
+import org.jboss.as.controller.xml.XMLChoice;
 import org.jboss.dmr.ModelNode;
 import org.jboss.staxmapper.IntVersion;
-import org.wildfly.io.OptionAttributeDefinition;
 
 /**
  * Enumerates the supported schemas of the IO subsystem.
  */
-public enum IOSubsystemSchema implements PersistentSubsystemSchema<IOSubsystemSchema> {
+public enum IOSubsystemSchema implements SubsystemResourceXMLSchema<IOSubsystemSchema> {
     VERSION_1_1(1, 1), // WildFly 8.1 - 10.1
     VERSION_2_0(2, 0), // WildFly 11 - 12
     VERSION_3_0(3, 0), // WildFly 13 - 31
     VERSION_4_0(4, 0), // WildFly 32-present
     ;
     static final IOSubsystemSchema CURRENT = VERSION_4_0;
 
+    private final ResourceXMLParticleFactory factory = ResourceXMLParticleFactory.newInstance(this);
     private final VersionedNamespace<IntVersion, IOSubsystemSchema> namespace;
 
     IOSubsystemSchema(int major, int minor) {
-        this.namespace = SubsystemSchema.createLegacySubsystemURN(IOSubsystemRegistrar.NAME, new IntVersion(major, minor));
+        this.namespace = SubsystemSchema.createLegacySubsystemURN(IOSubsystemResourceRegistration.INSTANCE.getName(), new IntVersion(major, minor));
     }
 
     @Override
@@ -41,32 +44,35 @@ public VersionedNamespace<IntVersion, IOSubsystemSchema> getNamespace() {
     }
 
     @Override
-    public PersistentResourceXMLDescription getXMLDescription() {
-        PersistentResourceXMLDescription.Factory factory = PersistentResourceXMLDescription.factory(this);
-        PersistentResourceXMLDescription.Builder builder = factory.builder(IOSubsystemRegistrar.PATH);
+    public ResourceXMLElement getSubsystemResourceXMLElement() {
+        ResourceXMLElement.Builder builder = this.factory.element(IOSubsystemResourceRegistration.INSTANCE);
         if (this.since(VERSION_4_0)) {
-            builder.addAttribute(IOSubsystemRegistrar.DEFAULT_WORKER);
+            builder.addAttribute(IOSubsystemResourceRegistrar.DEFAULT_WORKER);
         } else {
-            builder.setAdditionalOperationsGenerator(new PersistentResourceXMLDescription.AdditionalOperationsGenerator() {
+            builder.withOperationTransformation(new UnaryOperator<>() {
                 @Override
-                public void additionalOperations(PathAddress address, ModelNode addOperation, List<ModelNode> operations) {
+                public ModelNode apply(ModelNode operation) {
                     // Apply "magic" default worker referenced by other subsystems
-                    addOperation.get(IOSubsystemRegistrar.DEFAULT_WORKER.getName()).set(IOSubsystemRegistrar.LEGACY_DEFAULT_WORKER);
+                    operation.get(IOSubsystemResourceRegistrar.DEFAULT_WORKER.getName()).set(IOSubsystemResourceRegistrar.LEGACY_DEFAULT_WORKER);
+                    return operation;
                 }
             });
         }
-
-        Stream<OptionAttributeDefinition> workerAttributes = Stream.of(WorkerResourceDefinition.ATTRIBUTES);
-        if (!this.since(VERSION_3_0)) {
-            workerAttributes = workerAttributes.filter(Predicate.not(WorkerResourceDefinition.WORKER_TASK_CORE_THREADS::equals));
+        ResourceXMLElement.Builder workerBuilder = this.factory.element(ResourceRegistration.of(WorkerResourceDefinition.PATH)).addAttributes(List.of(
+                WorkerResourceDefinition.WORKER_IO_THREADS,
+                WorkerResourceDefinition.WORKER_TASK_KEEPALIVE,
+                WorkerResourceDefinition.WORKER_TASK_MAX_THREADS,
+                WorkerResourceDefinition.STACK_SIZE));
+        if (this.since(VERSION_3_0)) {
+            workerBuilder.addAttribute(WorkerResourceDefinition.WORKER_TASK_CORE_THREADS);
         }
-        PersistentResourceXMLDescription.Builder workerBuilder = factory.builder(WorkerResourceDefinition.PATH).addAttributes(workerAttributes);
         if (this.since(VERSION_2_0)) {
-            workerBuilder.addChild(factory.builder(OutboundBindAddressResourceDefinition.PATH).addAttributes(OutboundBindAddressResourceDefinition.ATTRIBUTES.stream()).build());
+            workerBuilder.withContent(XMLChoice.singleton(this.factory.element(ResourceRegistration.of(OutboundBindAddressResourceDefinition.PATH)).addAttributes(OutboundBindAddressResourceDefinition.ATTRIBUTES).build()));
         }
-
-        return builder.addChild(workerBuilder.build())
-                .addChild(factory.builder(BufferPoolResourceDefinition.PATH).addAttributes(BufferPoolResourceDefinition.ATTRIBUTES.stream()).build())
+        ResourceModelXMLChoice content = this.factory.choice().withCardinality(XMLCardinality.Unbounded.REQUIRED)
+                .addElement(workerBuilder.build())
+                .addElement(this.factory.element(ResourceRegistration.of(BufferPoolResourceDefinition.PATH)).addAttributes(BufferPoolResourceDefinition.ATTRIBUTES).build())
                 .build();
+        return builder.withContent(content).build();
     }
 }

io/subsystem/src/main/java/org/wildfly/extension/io/IOSubsystemTransformationDescriptionFactory.java

@@ -25,8 +25,8 @@ public TransformationDescription apply(ModelVersion version) {
         ResourceTransformationDescriptionBuilder builder = TransformationDescriptionBuilder.Factory.createSubsystemInstance();
         if (IOSubsystemModel.VERSION_6_0_0.requiresTransformation(version)) {
             builder.getAttributeBuilder()
-                .setDiscard(new DiscardAttributeChecker.DiscardAttributeValueChecker(IOSubsystemRegistrar.LEGACY_DEFAULT_WORKER), IOSubsystemRegistrar.DEFAULT_WORKER)
-                .addRejectCheck(RejectAttributeChecker.DEFINED, IOSubsystemRegistrar.DEFAULT_WORKER)
+                .setDiscard(new DiscardAttributeChecker.DiscardAttributeValueChecker(IOSubsystemResourceRegistrar.LEGACY_DEFAULT_WORKER), IOSubsystemResourceRegistrar.DEFAULT_WORKER)
+                .addRejectCheck(RejectAttributeChecker.DEFINED, IOSubsystemResourceRegistrar.DEFAULT_WORKER)
                 .end();
         }
         return builder.build();

io/subsystem/src/main/java/org/wildfly/extension/io/OutboundBindAddressResourceDefinition.java

@@ -54,7 +54,7 @@ public class OutboundBindAddressResourceDefinition extends PersistentResourceDef
     static final OutboundBindAddressResourceDefinition INSTANCE = new OutboundBindAddressResourceDefinition();
 
     private OutboundBindAddressResourceDefinition() {
-        super(new SimpleResourceDefinition.Parameters(PATH, IOSubsystemRegistrar.RESOLVER.createChildResolver(PATH))
+        super(new SimpleResourceDefinition.Parameters(PATH, IOSubsystemResourceRegistrar.RESOLVER.createChildResolver(PATH))
             .setAddHandler(new OutboundBindAddressAddHandler())
             .setRemoveHandler(new OutboundBindAddressRemoveHandler())
         );

io/subsystem/src/main/java/org/wildfly/extension/io/WorkerResourceDefinition.java

@@ -101,7 +101,7 @@ class WorkerResourceDefinition extends PersistentResourceDefinition {
     private static final AttributeDefinition BUSY_WORKER_THREAD_COUNT = new SimpleAttributeDefinitionBuilder("busy-task-thread-count", ModelType.INT).build();
 
     WorkerResourceDefinition(AtomicInteger maxThreads) {
-        super(new SimpleResourceDefinition.Parameters(PATH, IOSubsystemRegistrar.RESOLVER.createChildResolver(PATH))
+        super(new SimpleResourceDefinition.Parameters(PATH, IOSubsystemResourceRegistrar.RESOLVER.createChildResolver(PATH))
                 .setAddHandler(new WorkerAdd(maxThreads))
                 .setRemoveHandler(ReloadRequiredRemoveStepHandler.INSTANCE)
                 .addCapabilities(CAPABILITY));

io/subsystem/src/main/java/org/wildfly/extension/io/WorkerServerDefinition.java

@@ -43,7 +43,7 @@ public class WorkerServerDefinition extends SimpleResourceDefinition {
     static final ModelNode NO_METRICS = new ModelNode(IOLogger.ROOT_LOGGER.noMetrics());
 
     WorkerServerDefinition() {
-        super(new Parameters(PATH, IOSubsystemRegistrar.RESOLVER.createChildResolver(PathElement.pathElement(WorkerResourceDefinition.PATH.getKey(), PATH.getKey())))
+        super(new Parameters(PATH, IOSubsystemResourceRegistrar.RESOLVER.createChildResolver(PathElement.pathElement(WorkerResourceDefinition.PATH.getKey(), PATH.getKey())))
                 .setRuntime());
     }
 

io/tests/src/test/java/org/wildfly/extension/io/IOSubsystemTestCase.java

@@ -45,7 +45,7 @@ public static Iterable<IOSubsystemSchema> parameters() {
     }
 
     public IOSubsystemTestCase(IOSubsystemSchema schema) {
-        super(IOSubsystemRegistrar.NAME, new IOExtension(), schema, IOSubsystemSchema.CURRENT);
+        super(IOSubsystemResourceRegistration.INSTANCE.getName(), new IOExtension(), schema, IOSubsystemSchema.CURRENT);
     }
 
     @Test

io/tests/src/test/java/org/wildfly/extension/io/IOSubsystemTransformerTestCase.java

@@ -40,7 +40,7 @@ public static Iterable<ModelTestControllerVersion> parameters() {
     private final ModelVersion version;
 
     public IOSubsystemTransformerTestCase(ModelTestControllerVersion controller) {
-        super(IOSubsystemRegistrar.NAME, new IOExtension());
+        super(IOSubsystemResourceRegistration.INSTANCE.getName(), new IOExtension());
         this.controller = controller;
         this.version = this.getModelVersion().getVersion();
         this.additionalInitialization = AdditionalInitialization.MANAGEMENT;
@@ -129,10 +129,10 @@ public void testRejections() throws Exception {
 
     private FailedOperationTransformationConfig createFailedOperationTransformationConfig() {
         FailedOperationTransformationConfig config = new FailedOperationTransformationConfig();
-        PathAddress subsystemAddress = PathAddress.pathAddress(IOSubsystemRegistrar.PATH);
+        PathAddress subsystemAddress = PathAddress.pathAddress(IOSubsystemResourceRegistration.INSTANCE.getPathElement());
 
         if (IOSubsystemModel.VERSION_6_0_0.requiresTransformation(this.version)) {
-            config.addFailedAttribute(subsystemAddress, new FailedOperationTransformationConfig.NewAttributesConfig(IOSubsystemRegistrar.DEFAULT_WORKER.getName()));
+            config.addFailedAttribute(subsystemAddress, new FailedOperationTransformationConfig.NewAttributesConfig(IOSubsystemResourceRegistrar.DEFAULT_WORKER.getName()));
         }
 
         return config;