Merge pull request #5983 from pferraro/WFCORE-6792

WFCORE-6792 Fix missing CapabilityServiceInstaller.Builder.async() -> blocking().
wildfly · Apr 27, 2024 · aacfed8 · aacfed8
2 parents a65325c + 34ee37a
commit aacfed8
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/...em/src/main/java/org/wildfly/subsystem/service/capability/CapabilityServiceInstaller.java b/...em/src/main/java/org/wildfly/subsystem/service/capability/CapabilityServiceInstaller.java
@@ -81,12 +81,7 @@ static <T, V> Builder<T, V> builder(RuntimeCapability<Void> capability, Function
      * @param <T> the source value type
      * @param <V> the service value type
      */
-    interface Builder<T, V> extends UnaryBuilder<Builder<T, V>, CapabilityServiceInstaller, CapabilityServiceTarget, RequirementServiceBuilder<?>, T, V> {
-        /**
-         * Indicates that the installed service should start and, if a stop task is configured, stop asynchronously.
-         * @return a reference to this builder
-         */
-        Builder<T, V> async();
+    interface Builder<T, V> extends BlockingBuilder<Builder<T, V>>, UnaryBuilder<Builder<T, V>, CapabilityServiceInstaller, CapabilityServiceTarget, RequirementServiceBuilder<?>, T, V> {
     }
 
     @Override
@@ -108,7 +103,7 @@ class DefaultCapabilityServiceInstaller extends DefaultInstaller<CapabilityServi
     }
 
     class DefaultBuilder<T, V> extends AbstractUnaryBuilder<Builder<T, V>, CapabilityServiceInstaller, CapabilityServiceTarget, CapabilityServiceBuilder<?>, RequirementServiceBuilder<?>, T, V> implements Builder<T, V> {
-        private volatile boolean sync = true;
+        private volatile boolean blocking = false;
 
         DefaultBuilder(RuntimeCapability<Void> capability, Function<T, V> mapper, Supplier<T> factory) {
             super(mapper, factory, new BiFunction<>() {
@@ -120,21 +115,21 @@ public Consumer<V> apply(CapabilityServiceBuilder<?> builder, Collection<Service
         }
 
         @Override
-        public Builder<T, V> async() {
-            this.sync = false;
+        public Builder<T, V> blocking() {
+            this.blocking = true;
             return this;
         }
 
         @Override
         public CapabilityServiceInstaller build() {
-            boolean sync = this.sync;
+            boolean blocking = this.blocking;
             // If no stop task is specified, we can stop synchronously
             AsyncServiceBuilder.Async async = this.hasStopTask() ? AsyncServiceBuilder.Async.START_AND_STOP : AsyncServiceBuilder.Async.START_ONLY;
             return new DefaultCapabilityServiceInstaller(this, new Function<>() {
                 @Override
                 public CapabilityServiceBuilder<?> apply(CapabilityServiceTarget target) {
                     CapabilityServiceBuilder<?> builder = target.addService();
-                    return !sync ? new AsyncCapabilityServiceBuilder<>(builder, async) : builder;
+                    return blocking ? new AsyncCapabilityServiceBuilder<>(builder, async) : builder;
                 }
             });
         }