WFLY-5143 JGroups subsystem parser should not allow thread pool to be…

… defined per protocol

clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsSubsystemXMLReader.java

@@ -49,7 +49,6 @@ public class JGroupsSubsystemXMLReader implements XMLElementReader<List<ModelNod
         this.schema = schema;
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public void readElement(XMLExtendedStreamReader reader, List<ModelNode> result) throws XMLStreamException {
 
@@ -218,7 +217,6 @@ private void parseFork(XMLExtendedStreamReader reader, PathAddress channelAddres
         }
     }
 
-    @SuppressWarnings("deprecation")
     private void parseStacks(XMLExtendedStreamReader reader, PathAddress address, Map<PathAddress, ModelNode> operations) throws XMLStreamException {
 
         ModelNode operation = operations.get(address);
@@ -339,8 +337,42 @@ private void parseTransport(XMLExtendedStreamReader reader, PathAddress stackAdd
             }
         }
 
+        for (ThreadPoolResourceDefinition pool : ThreadPoolResourceDefinition.values()) {
+            PathAddress poolAddress = address.append(pool.getPathElement());
+            operations.put(poolAddress, Util.createAddOperation(poolAddress));
+        }
+
         while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) {
-            this.parseProtocolElement(reader, address, operations);
+            XMLElement element = XMLElement.forName(reader.getLocalName());
+            switch (element) {
+                case DEFAULT_THREAD_POOL: {
+                    if (this.schema.since(JGroupsSchema.VERSION_3_0)) {
+                        this.parseThreadPool(ThreadPoolResourceDefinition.DEFAULT, reader, address, operations);
+                        break;
+                    }
+                }
+                case INTERNAL_THREAD_POOL: {
+                    if (this.schema.since(JGroupsSchema.VERSION_3_0)) {
+                        this.parseThreadPool(ThreadPoolResourceDefinition.INTERNAL, reader, address, operations);
+                        break;
+                    }
+                }
+                case OOB_THREAD_POOL: {
+                    if (this.schema.since(JGroupsSchema.VERSION_3_0)) {
+                        this.parseThreadPool(ThreadPoolResourceDefinition.OOB, reader, address, operations);
+                        break;
+                    }
+                }
+                case TIMER_THREAD_POOL: {
+                    if (this.schema.since(JGroupsSchema.VERSION_3_0)) {
+                        this.parseThreadPool(ThreadPoolResourceDefinition.TIMER, reader, address, operations);
+                        break;
+                    }
+                }
+                default: {
+                    this.parseProtocolElement(reader, address, operations);
+                }
+            }
         }
     }
 
@@ -390,18 +422,6 @@ private void parseProtocolElement(XMLExtendedStreamReader reader, PathAddress ad
                 this.parseProperty(reader, address, operations);
                 break;
             }
-            case DEFAULT_THREAD_POOL:
-                parseThreadPool(ThreadPoolResourceDefinition.DEFAULT, reader, address, operations);
-                break;
-            case INTERNAL_THREAD_POOL:
-                parseThreadPool(ThreadPoolResourceDefinition.INTERNAL, reader, address, operations);
-                break;
-            case OOB_THREAD_POOL:
-                parseThreadPool(ThreadPoolResourceDefinition.OOB, reader, address, operations);
-                break;
-            case TIMER_THREAD_POOL:
-                parseThreadPool(ThreadPoolResourceDefinition.TIMER, reader, address, operations);
-                break;
             default: {
                 throw ParseUtils.unexpectedElement(reader);
             }
@@ -416,8 +436,7 @@ private void parseProperty(XMLExtendedStreamReader reader, PathAddress address,
 
     private void parseThreadPool(ThreadPoolResourceDefinition pool, XMLExtendedStreamReader reader, PathAddress parentAddress, Map<PathAddress, ModelNode> operations) throws XMLStreamException {
         PathAddress address = parentAddress.append(pool.getPathElement());
-        ModelNode operation = Util.createAddOperation(address);
-        operations.put(address, operation);
+        ModelNode operation = operations.get(address);
 
         for (int i = 0; i < reader.getAttributeCount(); i++) {
             XMLAttribute attribute = XMLAttribute.forName(reader.getAttributeLocalName(i));

clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsSubsystemXMLWriter.java

@@ -22,11 +22,13 @@
 
 package org.jboss.as.clustering.jgroups.subsystem;
 
+import java.util.Collection;
 import java.util.EnumSet;
 
 import javax.xml.stream.XMLStreamException;
 
 import org.jboss.as.clustering.controller.Attribute;
+import org.jboss.as.controller.PathElement;
 import org.jboss.as.controller.persistence.SubsystemMarshallingContext;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.Property;
@@ -132,11 +134,14 @@ private static void writeProtocolAttributes(XMLExtendedStreamWriter writer, Prop
     }
 
     private static void writeThreadPoolElements(XMLElement element, ThreadPoolResourceDefinition pool, XMLExtendedStreamWriter writer, ModelNode transport) throws XMLStreamException {
-        if (transport.get(pool.getPathElement().getKey()).hasDefined(pool.getPathElement().getValue())) {
-            ModelNode threadPool = transport.get(pool.getPathElement().getKeyValuePair());
-            writer.writeStartElement(element.getLocalName());
-            writeAttributes(writer, threadPool, pool.getAttributes());
-            writer.writeEndElement();
+        PathElement path = pool.getPathElement();
+        if (transport.get(path.getKey()).hasDefined(path.getValue())) {
+            ModelNode threadPool = transport.get(path.getKeyValuePair());
+            if (hasDefined(threadPool, pool.getAttributes())) {
+                writer.writeStartElement(element.getLocalName());
+                writeAttributes(writer, threadPool, pool.getAttributes());
+                writer.writeEndElement();
+            }
         }
     }
 
@@ -154,11 +159,15 @@ private static void writeRelay(XMLExtendedStreamWriter writer, ModelNode relay)
         writer.writeEndElement();
     }
 
+    private static boolean hasDefined(ModelNode model, Collection<? extends Attribute> attributes) {
+        return attributes.stream().anyMatch(attribute -> model.hasDefined(attribute.getDefinition().getName()));
+    }
+
     private static <A extends Enum<A> & Attribute> void writeAttributes(XMLExtendedStreamWriter writer, ModelNode model, Class<A> attributeClass) throws XMLStreamException {
         writeAttributes(writer, model, EnumSet.allOf(attributeClass));
     }
 
-    private static void writeAttributes(XMLExtendedStreamWriter writer, ModelNode model, Iterable<? extends Attribute> attributes) throws XMLStreamException {
+    private static void writeAttributes(XMLExtendedStreamWriter writer, ModelNode model, Collection<? extends Attribute> attributes) throws XMLStreamException {
         for (Attribute attribute : attributes) {
             writeAttribute(writer, model, attribute);
         }

clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/subsystem/ThreadPoolResourceDefinition.java

@@ -23,6 +23,7 @@
 package org.jboss.as.clustering.jgroups.subsystem;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -148,7 +149,7 @@ public void register(ManagementResourceRegistration registration) {
         registration.registerSubModel(this);
     }
 
-    Iterable<Attribute> getAttributes() {
+    Collection<Attribute> getAttributes() {
         return Arrays.asList(this.minThreads, this.maxThreads, this.queueLength, this.keepAliveTime);
     }
 

clustering/jgroups/extension/src/test/java/org/jboss/as/clustering/jgroups/subsystem/SubsystemParsingTestCase.java

@@ -70,10 +70,10 @@ public SubsystemParsingTestCase(JGroupsSchema schema, int expectedOperationCount
     @Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][] {
-                { JGroupsSchema.VERSION_1_1, 20 },
-                { JGroupsSchema.VERSION_2_0, 22 },
-                { JGroupsSchema.VERSION_3_0, 29 },
-                { JGroupsSchema.VERSION_4_0, 29 },
+                { JGroupsSchema.VERSION_1_1, 28 },
+                { JGroupsSchema.VERSION_2_0, 30 },
+                { JGroupsSchema.VERSION_3_0, 33 },
+                { JGroupsSchema.VERSION_4_0, 33 },
         };
         return Arrays.asList(data);
     }