From 62ef3d78c2d57ad6d8bd13b51257879fe5480f32 Mon Sep 17 00:00:00 2001 From: Tomaz Cerar Date: Wed, 31 May 2017 17:43:12 +0200 Subject: [PATCH] WFLY-8864 Fix wrong parser code --- .../ee/subsystem/GlobalModulesDefinition.java | 4 ++-- .../StaticEJBDiscoveryDefinition.java | 4 ++-- .../deployment/TimerAttributeDefinition.java | 22 +++++++++++++++---- .../ActiveMQServerControlHandler.java | 11 +++++----- 4 files changed, 27 insertions(+), 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 index 8b6d803026a7..2737aaf03775 100644 --- 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 index c6d63782d311..e2b8dbfb6e67 100644 --- 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 index 99e06787e1b7..21a87608f2e3 100644 --- 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{ + 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/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java index d2862131ffbb..654118e3f82d 100644 --- a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java +++ b/messaging-activemq/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";