Update subsystem stability test to utilise SubsystemResourceXMLSchema.

Author: pferraro

subsystem-test/tests/src/test/java/org/jboss/as/subsystem/test/stability/FooSubsystemExtension.java

@@ -8,10 +8,10 @@
 
 import org.jboss.as.controller.Extension;
 import org.jboss.as.controller.ExtensionContext;
-import org.jboss.as.controller.PersistentResourceXMLDescriptionWriter;
 import org.jboss.as.controller.SubsystemRegistration;
 import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler;
 import org.jboss.as.controller.parsing.ExtensionParsingContext;
+import org.jboss.as.controller.persistence.xml.SubsystemResourceXMLElementWriter;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 
 /**
@@ -21,15 +21,15 @@ public class FooSubsystemExtension implements Extension {
 
     @Override
     public void initialize(ExtensionContext context) {
-        SubsystemRegistration subsystem = context.registerSubsystem(FooSubsystemResourceDefinition.SUBSYSTEM_NAME, FooSubsystemModel.CURRENT.getVersion());
+        SubsystemRegistration subsystem = context.registerSubsystem(FooSubsystemResourceDefinition.REGISTRATION.getName(), FooSubsystemModel.CURRENT.getVersion());
         ManagementResourceRegistration registration = subsystem.registerSubsystemModel(new FooSubsystemResourceDefinition());
         registration.registerOperationHandler(GenericSubsystemDescribeHandler.DEFINITION, GenericSubsystemDescribeHandler.INSTANCE);
 
-        subsystem.registerXMLElementWriter(new PersistentResourceXMLDescriptionWriter(FooSubsystemSchema.CURRENT.get(context.getStability())));
+        subsystem.registerXMLElementWriter(new SubsystemResourceXMLElementWriter(FooSubsystemSchema.CURRENT.get(context.getStability()).getSubsystemXMLElement()));
     }
 
     @Override
     public void initializeParsers(ExtensionParsingContext context) {
-        context.setSubsystemXmlMappings(FooSubsystemResourceDefinition.SUBSYSTEM_NAME, EnumSet.allOf(FooSubsystemSchema.class));
+        context.setSubsystemXmlMappings(FooSubsystemResourceDefinition.REGISTRATION.getName(), EnumSet.allOf(FooSubsystemSchema.class));
     }
 }

subsystem-test/tests/src/test/java/org/jboss/as/subsystem/test/stability/FooSubsystemResourceDefinition.java

@@ -8,13 +8,12 @@
 import java.util.List;
 
 import org.jboss.as.controller.AttributeDefinition;
-import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.ReloadRequiredAddStepHandler;
 import org.jboss.as.controller.ReloadRequiredRemoveStepHandler;
 import org.jboss.as.controller.ReloadRequiredWriteAttributeHandler;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.SimpleResourceDefinition;
-import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
+import org.jboss.as.controller.SubsystemResourceRegistration;
 import org.jboss.as.controller.descriptions.NonResolvingResourceDescriptionResolver;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.as.version.Stability;
@@ -25,8 +24,7 @@
  * @author Paul Ferraro
  */
 public class FooSubsystemResourceDefinition extends SimpleResourceDefinition {
-    static final String SUBSYSTEM_NAME = "foo";
-    static final PathElement PATH = PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, SUBSYSTEM_NAME);
+    static final SubsystemResourceRegistration REGISTRATION = SubsystemResourceRegistration.of("foo");
 
     static final AttributeDefinition EXPERIMENTAL = new SimpleAttributeDefinitionBuilder("experimental", ModelType.STRING)
             .setRequired(false)
@@ -36,7 +34,7 @@ public class FooSubsystemResourceDefinition extends SimpleResourceDefinition {
     static final Collection<AttributeDefinition> ATTRIBUTES = List.of(EXPERIMENTAL);
 
     FooSubsystemResourceDefinition() {
-        super(new Parameters(PATH, NonResolvingResourceDescriptionResolver.INSTANCE)
+        super(new Parameters(REGISTRATION.getPathElement(), NonResolvingResourceDescriptionResolver.INSTANCE)
                 .setAddHandler(ReloadRequiredAddStepHandler.INSTANCE)
                 .setRemoveHandler(ReloadRequiredRemoveStepHandler.INSTANCE));
     }

subsystem-test/tests/src/test/java/org/jboss/as/subsystem/test/stability/FooSubsystemSchema.java

@@ -8,31 +8,34 @@
 import java.util.Map;
 
 import org.jboss.as.controller.Feature;
-import org.jboss.as.controller.PersistentResourceXMLDescription;
-import org.jboss.as.controller.PersistentSubsystemSchema;
 import org.jboss.as.controller.SubsystemSchema;
+import org.jboss.as.controller.persistence.xml.ResourceRegistrationXMLElement;
+import org.jboss.as.controller.persistence.xml.ResourceXMLParticleFactory;
+import org.jboss.as.controller.persistence.xml.SubsystemResourceRegistrationXMLElement;
+import org.jboss.as.controller.persistence.xml.SubsystemResourceXMLSchema;
 import org.jboss.as.controller.xml.VersionedNamespace;
 import org.jboss.as.version.Stability;
 import org.jboss.staxmapper.IntVersion;
 
 /**
  * @author Paul Ferraro
  */
-public enum FooSubsystemSchema implements PersistentSubsystemSchema<FooSubsystemSchema> {
+public enum FooSubsystemSchema implements SubsystemResourceXMLSchema<FooSubsystemSchema> {
     VERSION_1_0(1),
     VERSION_1_0_PREVIEW(1, Stability.PREVIEW),
     VERSION_1_0_EXPERIMENTAL(1, Stability.EXPERIMENTAL),
     ;
     static final Map<Stability, FooSubsystemSchema> CURRENT = Feature.map(EnumSet.of(VERSION_1_0, VERSION_1_0_PREVIEW, VERSION_1_0_EXPERIMENTAL));
 
     private final VersionedNamespace<IntVersion, FooSubsystemSchema> namespace;
+    private final ResourceXMLParticleFactory factory = ResourceXMLParticleFactory.newInstance(this);
 
     FooSubsystemSchema(int major) {
-        this.namespace = SubsystemSchema.createSubsystemURN(FooSubsystemResourceDefinition.SUBSYSTEM_NAME, new IntVersion(major));
+        this(major, Stability.DEFAULT);
     }
 
     FooSubsystemSchema(int major, Stability stability) {
-        this.namespace = SubsystemSchema.createSubsystemURN(FooSubsystemResourceDefinition.SUBSYSTEM_NAME, stability, new IntVersion(major));
+        this.namespace = SubsystemSchema.createSubsystemURN(FooSubsystemResourceDefinition.REGISTRATION.getName(), stability, new IntVersion(major));
     }
 
     @Override
@@ -41,11 +44,13 @@ public VersionedNamespace<IntVersion, FooSubsystemSchema> getNamespace() {
     }
 
     @Override
-    public PersistentResourceXMLDescription getXMLDescription() {
-        PersistentResourceXMLDescription.Factory factory = PersistentResourceXMLDescription.factory(this);
-        PersistentResourceXMLDescription.Builder builder = factory.builder(FooSubsystemResourceDefinition.PATH);
-        builder.addAttributes(FooSubsystemResourceDefinition.ATTRIBUTES.stream());
-        builder.addChild(factory.builder(BarResourceDefinition.REGISTRATION).addAttribute(BarResourceDefinition.TYPE).build());
-        return builder.build();
+    public SubsystemResourceRegistrationXMLElement getSubsystemXMLElement() {
+        ResourceRegistrationXMLElement barElement = this.factory.namedElement(BarResourceDefinition.REGISTRATION)
+                .addAttribute(BarResourceDefinition.TYPE)
+                .build();
+        return this.factory.subsystemElement(FooSubsystemResourceDefinition.REGISTRATION)
+                .addAttributes(FooSubsystemResourceDefinition.ATTRIBUTES)
+                .withContent(this.factory.sequence().addElement(barElement).build())
+                .build();
     }
 }

subsystem-test/tests/src/test/java/org/jboss/as/subsystem/test/stability/MixedStabilitySubsystemTestCase.java

@@ -22,6 +22,6 @@ public static Iterable<FooSubsystemSchema> getParameters() {
     }
 
     public MixedStabilitySubsystemTestCase(FooSubsystemSchema schema) {
-        super(FooSubsystemResourceDefinition.SUBSYSTEM_NAME, new FooSubsystemExtension(), schema, FooSubsystemSchema.CURRENT.get(schema.getStability()));
+        super(FooSubsystemResourceDefinition.REGISTRATION.getName(), new FooSubsystemExtension(), schema, FooSubsystemSchema.CURRENT.get(schema.getStability()));
     }
 }