Merge pull request wildfly#6563 from pferraro/WFCORE-7402

WFCORE-7402 Only apply legacy default worker value if such a worker resource was present.

Author: yersan

io/subsystem/src/main/java/org/wildfly/extension/io/IOSubsystemSchema.java

@@ -7,8 +7,10 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 
 import org.jboss.as.controller.SubsystemSchema;
+import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.ResourceRegistration;
 import org.jboss.as.controller.persistence.xml.ResourceXMLChoice;
 import org.jboss.as.controller.persistence.xml.ResourceXMLParticleFactory;
@@ -18,6 +20,7 @@
 import org.jboss.as.controller.persistence.xml.ResourceRegistrationXMLElement;
 import org.jboss.as.controller.xml.VersionedNamespace;
 import org.jboss.as.controller.xml.XMLCardinality;
+import org.jboss.dmr.ModelNode;
 import org.jboss.staxmapper.IntVersion;
 
 /**
@@ -49,8 +52,16 @@ public SubsystemResourceRegistrationXMLElement getSubsystemXMLElement() {
         if (this.since(VERSION_4_0)) {
             builder.addAttribute(IOSubsystemResourceDefinitionRegistrar.DEFAULT_WORKER);
         } else {
-            // Apply "magic" default worker referenced by other subsystems
-            builder.withDefaultValues(Map.of(IOSubsystemResourceDefinitionRegistrar.DEFAULT_WORKER, IOSubsystemResourceDefinitionRegistrar.LEGACY_DEFAULT_WORKER));
+            builder.withOperationTransformation(new BiConsumer<>() {
+                @Override
+                public void accept(Map<PathAddress, ModelNode> operations, PathAddress address) {
+                    // Apply "magic" default worker referenced by other subsystems
+                    // but only if such a worker actually exists
+                    if (operations.containsKey(address.append(WorkerResourceDefinition.pathElement(IOSubsystemResourceDefinitionRegistrar.LEGACY_DEFAULT_WORKER.asString())))) {
+                        operations.get(address).get(IOSubsystemResourceDefinitionRegistrar.DEFAULT_WORKER.getName()).set(IOSubsystemResourceDefinitionRegistrar.LEGACY_DEFAULT_WORKER);
+                    }
+                }
+            });
         }
         ResourceXMLChoice content = this.factory.choice().withCardinality(XMLCardinality.Unbounded.REQUIRED)
                 .addElement(this.workerElement())

io/subsystem/src/main/java/org/wildfly/extension/io/WorkerResourceDefinition.java

@@ -55,7 +55,10 @@
  */
 class WorkerResourceDefinition extends PersistentResourceDefinition {
 
-    static final PathElement PATH = PathElement.pathElement(Constants.WORKER);
+    static final PathElement PATH = pathElement(PathElement.WILDCARD_VALUE);
+    static final PathElement pathElement(String name) {
+        return PathElement.pathElement(Constants.WORKER, name);
+    }
     static final RuntimeCapability<Void> CAPABILITY = RuntimeCapability.Builder.of(IOServiceDescriptor.WORKER).build();
 
     static final OptionAttributeDefinition WORKER_TASK_CORE_THREADS = new OptionAttributeDefinition.Builder(Constants.WORKER_TASK_CORE_THREADS, Options.WORKER_TASK_CORE_THREADS)