Merge pull request #10127 from ctomc/parser

WFLY-8864 Fix wrong parser code
wildfly · Jun 1, 2017 · b3faf96 · b3faf96
2 parents 244c73b + 62ef3d7
commit b3faf96
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/ee/src/main/java/org/jboss/as/ee/subsystem/GlobalModulesDefinition.java b/ee/src/main/java/org/jboss/as/ee/subsystem/GlobalModulesDefinition.java
@@ -88,9 +88,9 @@ public class GlobalModulesDefinition {
         @Override
         public void marshallAsElement(AttributeDefinition attribute, ModelNode resourceModel, boolean marshallDefault, XMLStreamWriter writer) throws XMLStreamException {
             if (resourceModel.isDefined()) {
-                writer.writeEmptyElement(attribute.getXmlName());
+                writer.writeEmptyElement(Element.MODULE.getLocalName());
                 for (SimpleAttributeDefinition valueType : VALUE_TYPE_FIELDS) {
-                    valueType.marshallAsAttribute(resourceModel, writer);
+                    valueType.getAttributeMarshaller().marshall(valueType, resourceModel, true, writer);
                 }
             }
         }

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/StaticEJBDiscoveryDefinition.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/StaticEJBDiscoveryDefinition.java
@@ -78,9 +78,9 @@ public class StaticEJBDiscoveryDefinition {
         @Override
         public void marshallAsElement(AttributeDefinition attribute, ModelNode resourceModel, boolean marshallDefault, XMLStreamWriter writer) throws XMLStreamException {
             if (resourceModel.isDefined()) {
-                writer.writeEmptyElement(attribute.getXmlName());
+                writer.writeEmptyElement(EJB3SubsystemXMLElement.MODULE.getLocalName());
                 for (SimpleAttributeDefinition valueType : VALUE_TYPE_FIELDS) {
-                    valueType.marshallAsAttribute(resourceModel, writer);
+                    valueType.getAttributeMarshaller().marshall(valueType, resourceModel, true, writer);
                 }
             }
         }

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/deployment/TimerAttributeDefinition.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/deployment/TimerAttributeDefinition.java
@@ -42,11 +42,11 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.jboss.as.controller.ListAttributeDefinition;
+import org.jboss.as.controller.ObjectListAttributeDefinition;
 import org.jboss.as.controller.client.helpers.MeasurementUnit;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
 import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
 import org.jboss.as.controller.operations.validation.ModelTypeValidator;
-import org.jboss.as.controller.registry.AttributeAccess;
 import org.jboss.as.ejb3.logging.EjbLogger;
 import org.jboss.as.ejb3.component.EJBComponent;
 import org.jboss.dmr.ModelNode;
@@ -59,7 +59,7 @@
 // TODO Convert to ObjectListAttributeDefinition
 public class TimerAttributeDefinition extends ListAttributeDefinition {
 
-    public static final TimerAttributeDefinition INSTANCE = new TimerAttributeDefinition();
+    public static final TimerAttributeDefinition INSTANCE = new TimerAttributeDefinition.Builder().build();
 
     public static final String TIME_REMAINING = "time-remaining";
     public static final String NEXT_TIMEOUT = "next-timeout";
@@ -77,9 +77,23 @@ public class TimerAttributeDefinition extends ListAttributeDefinition {
     public static final String START = "start";
     public static final String END = "end";
 
-    private TimerAttributeDefinition() {
-        super("timers", false, new ModelTypeValidator(ModelType.OBJECT), AttributeAccess.Flag.STORAGE_RUNTIME);
+    private TimerAttributeDefinition(Builder builder) {
+        super(builder);
     }
+    public static final class Builder extends ListAttributeDefinition.Builder<ObjectListAttributeDefinition.Builder, TimerAttributeDefinition>{
+        public Builder() {
+            super("timers", false);
+        }
+
+        @Override
+        public TimerAttributeDefinition build() {
+            setValidator(new ModelTypeValidator(ModelType.OBJECT));
+            setStorageRuntime();
+
+            return new TimerAttributeDefinition(this);
+        }
+    }
+
 
     @Override
     protected void addValueTypeDescription(ModelNode node, ResourceBundle bundle) {

diff --git a/.../src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java b/.../src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java
@@ -44,12 +44,10 @@
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.RunningMode;
-import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
 import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
-import org.jboss.as.controller.registry.AttributeAccess;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
@@ -70,11 +68,12 @@ public class ActiveMQServerControlHandler extends AbstractRuntimeOnlyHandler {
             .setStorageRuntime()
             .build();
 
-    public static final AttributeDefinition STARTED = new SimpleAttributeDefinition(CommonAttributes.STARTED, ModelType.BOOLEAN,
-            false, AttributeAccess.Flag.STORAGE_RUNTIME);
+    public static final AttributeDefinition STARTED = new SimpleAttributeDefinitionBuilder(CommonAttributes.STARTED, ModelType.BOOLEAN,
+            false).setStorageRuntime().build();
 
-    public static final AttributeDefinition VERSION = new SimpleAttributeDefinition(CommonAttributes.VERSION, ModelType.STRING,
-            true, AttributeAccess.Flag.STORAGE_RUNTIME);
+
+    public static final AttributeDefinition VERSION = new SimpleAttributeDefinitionBuilder(CommonAttributes.VERSION, ModelType.STRING,
+            true).setStorageRuntime().build();
 
     private static final AttributeDefinition[] ATTRIBUTES = { STARTED, VERSION, ACTIVE };
     public static final String GET_CONNECTORS_AS_JSON = "get-connectors-as-json";