[WFCORE-5234] Avoid ModelNode.asPropertyList() in high level hornetq …

…marshaling
wildfly · Aug 31, 2015 · 1e2d667 · 1e2d667
1 parent b46c5ed
commit 1e2d667
Showing 1 changed file with 24 additions and 33 deletions.
diff --git a/legacy/messaging/src/main/java/org/jboss/as/messaging/MessagingXMLWriter.java b/legacy/messaging/src/main/java/org/jboss/as/messaging/MessagingXMLWriter.java
@@ -92,8 +92,8 @@ public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingCon
         if (node.hasDefined(HORNETQ_SERVER)) {
             final ModelNode servers = node.get(HORNETQ_SERVER);
             boolean first = true;
-            for (Property prop : servers.asPropertyList()) {
+            for (String name : servers.keys()) {
-                writeHornetQServer(writer, prop.getName(), prop.getValue());
+                writeHornetQServer(writer, name, servers.get(name));
                 if (!first) {
                     writeNewLine(writer);
                 } else {
@@ -105,8 +105,8 @@ public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingCon
         if (node.hasDefined(JMS_BRIDGE)) {
             final ModelNode jmsBridges = node.get(JMS_BRIDGE);
             boolean first = true;
-            for (Property prop : jmsBridges.asPropertyList()) {
+            for (String name : jmsBridges.keys()) {
-                writeJmsBridge(writer, prop.getName(), prop.getValue());
+                writeJmsBridge(writer, name, jmsBridges.get(name));
                 if (!first) {
                     writeNewLine(writer);
                 } else {
@@ -357,13 +357,12 @@ private static void writeQueues(final XMLExtendedStreamWriter writer, final Mode
         if (!node.isDefined()) {
             return;
         }
-        List<Property> properties = node.asPropertyList();
+        if (node.asInt() > 0) {
-        if (!properties.isEmpty()) {
             writer.writeStartElement(Element.CORE_QUEUES.getLocalName());
-            for (Property queueProp : properties) {
+            for (String queueName : node.keys()) {
                 writer.writeStartElement(Element.QUEUE.getLocalName());
-                writer.writeAttribute(Attribute.NAME.getLocalName(), queueProp.getName());
+                writer.writeAttribute(Attribute.NAME.getLocalName(), queueName);
-                final ModelNode queue = queueProp.getValue();
+                final ModelNode queue = node.get(queueName);
                 QueueDefinition.ADDRESS.marshallAsElement(queue, writer);
                 writeFilter(writer, queue);
                 DURABLE.marshallAsElement(queue, writer);
@@ -614,14 +613,12 @@ private static void writeConnectorServices(XMLExtendedStreamWriter writer, Model
     }
 
     private static void writeConnectionFactories(final XMLExtendedStreamWriter writer, final ModelNode node) throws XMLStreamException {
-        if (!node.isDefined() || node.keys().size() == 0) {
+        if (!node.isDefined()) {
             return;
         }
-        List<Property> properties = node.asPropertyList();
+        if (node.asInt() > 0) {
-        if (!properties.isEmpty()) {
+            for (String name : node.keys()) {
-            for (Property prop : properties) {
+                final ModelNode factory = node.get(name);
-                final String name = prop.getName();
-                final ModelNode factory = prop.getValue();
                 if (factory.isDefined()) {
                     writer.writeStartElement(Element.CONNECTION_FACTORY.getLocalName());
                     writer.writeAttribute(Attribute.NAME.getLocalName(), name);
@@ -637,14 +634,12 @@ private static void writeConnectionFactories(final XMLExtendedStreamWriter write
     }
 
     private static void writePooledConnectionFactories(final XMLExtendedStreamWriter writer, final ModelNode node) throws XMLStreamException {
-        if (!node.isDefined() || node.keys().size() == 0) {
+        if (!node.isDefined()) {
             return;
         }
-        List<Property> properties = node.asPropertyList();
+        if (node.asInt() > 0) {
-        if (!properties.isEmpty()) {
+            for (String name : node.keys()) {
-            for (Property prop : properties) {
+                final ModelNode factory = node.get(name);
-                final String name = prop.getName();
-                final ModelNode factory = prop.getValue();
                 if (factory.isDefined()) {
                     writer.writeStartElement(Element.POOLED_CONNECTION_FACTORY.getLocalName());
 
@@ -684,14 +679,12 @@ private static boolean hasDefinedInboundConfigAttributes(ModelNode pcf) {
     }
 
     private static void writeJmsQueues(final XMLExtendedStreamWriter writer, final ModelNode node) throws XMLStreamException {
-        if (!node.isDefined() || node.keys().size() == 0) {
+        if (!node.isDefined()) {
             return;
         }
-        List<Property> properties = node.asPropertyList();
+        if (node.asInt() > 0) {
-        if (!properties.isEmpty()) {
+            for (String name : node.keys()) {
-            for (Property prop : properties) {
+                final ModelNode queue = node.get(name);
-                final String name = prop.getName();
-                final ModelNode queue = prop.getValue();
                 if (queue.isDefined()) {
                     writer.writeStartElement(Element.JMS_QUEUE.getLocalName());
                     writer.writeAttribute(Attribute.NAME.getLocalName(), name);
@@ -707,14 +700,12 @@ private static void writeJmsQueues(final XMLExtendedStreamWriter writer, final M
     }
 
     private static void writeTopics(final XMLExtendedStreamWriter writer, final ModelNode node) throws XMLStreamException {
-        if (!node.isDefined() || node.keys().size() == 0) {
+        if (!node.isDefined()) {
             return;
         }
-        List<Property> properties = node.asPropertyList();
+        if (node.asInt() > 0) {
-        if (!properties.isEmpty()) {
+            for (String name : node.keys()) {
-            for (Property prop : properties) {
+                final ModelNode topic = node.get(name);
-                final String name = prop.getName();
-                final ModelNode topic = prop.getValue();
                 if (topic.isDefined()) {
                     writer.writeStartElement(Element.JMS_TOPIC.getLocalName());
                     writer.writeAttribute(Attribute.NAME.getLocalName(), name);