Merge pull request #5989 from pferraro/WFCORE-6816

WFCORE-6816 A resource with a deployment chain contributor should require restarting all services on removal

subsystem/src/main/java/org/wildfly/subsystem/resource/ResourceDescriptor.java

@@ -530,6 +530,7 @@ abstract static class AbstractConfigurator<C extends Configurator<C>> implements
         static final BiPredicate<OperationContext, Resource> DEFAULT_CAPABILITY_FILTER = (context, resource) -> resource.getModel().isDefined();
 
         private static final Set<OperationEntry.Flag> RESTART_FLAGS = EnumSet.of(OperationEntry.Flag.RESTART_ALL_SERVICES, OperationEntry.Flag.RESTART_JVM, OperationEntry.Flag.RESTART_NONE, OperationEntry.Flag.RESTART_RESOURCE_SERVICES);
+        private static final Set<OperationEntry.Flag> RELOAD_RESTART_FLAGS = EnumSet.of(OperationEntry.Flag.RESTART_ALL_SERVICES, OperationEntry.Flag.RESTART_JVM);
 
         private final ResourceDescriptionResolver descriptionResolver;
         private Optional<ResourceOperationRuntimeHandler> runtimeHandler = Optional.empty();
@@ -664,9 +665,13 @@ public C withResourceTransformation(UnaryOperator<Resource> transformation) {
         @Override
         public C withDeploymentChainContributor(Consumer<DeploymentProcessorTarget> contributor) {
             this.deploymentChainContributor = Optional.of(contributor);
-            if (this.addOperationRestartFlag == OperationEntry.Flag.RESTART_NONE) {
+            // If this resource contributes to the deployment chain, adding or removing it requires a reload
+            if (!RELOAD_RESTART_FLAGS.contains(this.addOperationRestartFlag)) {
                 this.addOperationRestartFlag = OperationEntry.Flag.RESTART_ALL_SERVICES;
             }
+            if (!RELOAD_RESTART_FLAGS.contains(this.removeOperationRestartFlag)) {
+                this.removeOperationRestartFlag = OperationEntry.Flag.RESTART_ALL_SERVICES;
+            }
             return this.self();
         }