From a17b3b0201288c931d468ce32ea568b217399185 Mon Sep 17 00:00:00 2001
From: Paul Ferraro <paul.ferraro@redhat.com>
Date: Thu, 21 Dec 2023 17:56:22 -0500
Subject: [PATCH] WFCORE-6347 Consolidate ResourceServiceValueRegistry and
 ServiceValueRegistry

---
 .../ResourceServiceValueExecutorRegistry.java | 50 -------------------
 .../capture/ResourceServiceValueRegistry.java | 23 ---------
 .../service/capture/ServiceValueRegistry.java | 22 ++++++++
 3 files changed, 22 insertions(+), 73 deletions(-)
 delete mode 100644 subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueExecutorRegistry.java
 delete mode 100644 subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueRegistry.java

diff --git a/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueExecutorRegistry.java b/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueExecutorRegistry.java
deleted file mode 100644
index 0a5b29bd351..00000000000
--- a/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueExecutorRegistry.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright The WildFly Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.wildfly.subsystem.service.capture;
-
-import java.util.function.Consumer;
-
-import org.wildfly.subsystem.service.ServiceDependency;
-import org.wildfly.subsystem.service.ServiceInstaller;
-
-/**
- * A registry of captured service value executors.
- * @author Paul Ferraro
- * @param <V> the captured service value type
- */
-public interface ResourceServiceValueExecutorRegistry<V> extends ResourceServiceValueRegistry<V>, FunctionExecutorRegistry<V> {
-
-    /**
-     * Creates a new {@link ResourceServiceValueExecutorRegistry}.
-     * @param <V> the captured service value type
-     * @return a new service value executor registry
-     */
-    static <V> ResourceServiceValueExecutorRegistry<V> create() {
-        ServiceValueExecutorRegistry<V> registry = ServiceValueExecutorRegistry.create();
-        return new ResourceServiceValueExecutorRegistry<>() {
-            @Override
-            public ServiceInstaller capture(ServiceDependency<V> dependency) {
-                Consumer<V> startTask = new Consumer<>() {
-                    @Override
-                    public void accept(V value) {
-                        registry.add(dependency).accept(value);
-                    }
-                };
-                Consumer<V> stopTask = new Consumer<>() {
-                    @Override
-                    public void accept(V value) {
-                        registry.remove(dependency);
-                    }
-                };
-                return ServiceInstaller.builder(dependency).onStart(startTask).onStop(stopTask).asPassive().build();
-            }
-
-            @Override
-            public FunctionExecutor<V> getExecutor(ServiceDependency<V> dependency) {
-                return registry.getExecutor(dependency);
-            }
-        };
-    }
-}
diff --git a/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueRegistry.java b/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueRegistry.java
deleted file mode 100644
index 8638760efec..00000000000
--- a/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ResourceServiceValueRegistry.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright The WildFly Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.wildfly.subsystem.service.capture;
-
-import org.wildfly.subsystem.service.ResourceServiceInstaller;
-import org.wildfly.subsystem.service.ServiceDependency;
-
-/**
- * A registry of service values.
- * @author Paul Ferraro
- * @param <V> the captured service value type
- */
-public interface ResourceServiceValueRegistry<V> {
-
-    /**
-     * Creates a service installer to capture the value provided by the specified service dependency.
-     * @param dependency a service dependency
-     * @return a service installer
-     */
-    ResourceServiceInstaller capture(ServiceDependency<V> dependency);
-}
diff --git a/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ServiceValueRegistry.java b/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ServiceValueRegistry.java
index ceb1f778839..eecd63403a6 100644
--- a/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ServiceValueRegistry.java
+++ b/subsystem/src/main/java/org/wildfly/subsystem/service/capture/ServiceValueRegistry.java
@@ -7,6 +7,7 @@
 import java.util.function.Consumer;
 
 import org.wildfly.subsystem.service.ServiceDependency;
+import org.wildfly.subsystem.service.ServiceInstaller;
 
 /**
  * A registry of service values.
@@ -27,4 +28,25 @@ public interface ServiceValueRegistry<V> {
      * @param dependency a service dependency
      */
     void remove(ServiceDependency<V> dependency);
+
+    /**
+     * Creates a service installer to capture and release the value provided by the specified service dependency.
+     * @param dependency a service dependency
+     * @return a service installer
+     */
+    default ServiceInstaller capture(ServiceDependency<V> dependency) {
+        Consumer<V> startTask = new Consumer<>() {
+            @Override
+            public void accept(V value) {
+                ServiceValueRegistry.this.add(dependency).accept(value);
+            }
+        };
+        Consumer<V> stopTask = new Consumer<>() {
+            @Override
+            public void accept(V value) {
+                ServiceValueRegistry.this.remove(dependency);
+            }
+        };
+        return ServiceInstaller.builder(dependency).onStart(startTask).onStop(stopTask).asPassive().build();
+    }
 }