extract common code

Signed-off-by: christian.lutnik <christian.lutnik@dynatrace.com>
open-feature · chrfwow · Sep 15, 2025 · Sep 15, 2025 · Oct 15, 2025 · Oct 15, 2025
commit ba8f6bca9526a8951f91aeeb1fa0d40b36791c8d
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -26,10 +28,10 @@
     */
    public void setHooks(
            HookSupportData hookSupportData,
            List<Hook> providerHooks,
            List<Hook> flagOptionsHooks,
            ConcurrentLinkedQueue<Hook> clientHooks,
            ConcurrentLinkedQueue<Hook> apiHooks) {
        var lengthEstimate = 0;

        if (providerHooks != null) {
@@ -45,7 +47,7 @@
            lengthEstimate += apiHooks.size();
        }

        ArrayList<Pair<Hook, HookContext>> hookContextPairs = new ArrayList<>(lengthEstimate);

        addAll(hookContextPairs, providerHooks);
        addAll(hookContextPairs, flagOptionsHooks);
@@ -55,12 +57,12 @@
        hookSupportData.hooks = hookContextPairs;
    }

    private void addAll(List<Pair<Hook, HookContext>> accumulator, Collection<Hook> toAdd) {
        if (toAdd == null || toAdd.isEmpty()) {
            return;
        }

        for (Hook hook : toAdd) {
            accumulator.add(Pair.of(hook, null));
        }
    }
@@ -156,4 +158,26 @@
             }
         }
     }
+
+    static void addHooks(Map<FlagValueType, ConcurrentLinkedQueue<Hook>> hookMap, Hook... hooksToAdd) {
+        var types = FlagValueType.values();
+        for (int i = 0; i < hooksToAdd.length; i++) {
+            var current = hooksToAdd[i];
+            for (int j = 0; j < types.length; j++) {
+                var type = types[j];
+                if (current.supportsFlagValueType(type)) {
+                    hookMap.get(type).add(current);
+                }
+            }
+        }
+    }
+
+    static ArrayList<Hook> getAllUniqueHooks(Map<FlagValueType, ConcurrentLinkedQueue<Hook>> hookMap) {
+        // Hooks can be duplicated if they support multiple FlagValueTypes
+        var allHooks = new HashSet<Hook>();
+        for (var queue : hookMap.values()) {
+            allHooks.addAll(queue);
+        }
+        return new ArrayList<>(allHooks);
+    }
 }
@@ -3,8 +3,6 @@
 import dev.openfeature.sdk.exceptions.OpenFeatureError;
 import dev.openfeature.sdk.internal.AutoCloseableLock;
 import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -24,7 +22,7 @@
 public class OpenFeatureAPI implements EventBus<OpenFeatureAPI> {
    // package-private multi-read/single-write lock
    static AutoCloseableReentrantReadWriteLock lock = new AutoCloseableReentrantReadWriteLock();
    private final ConcurrentHashMap<FlagValueType, ConcurrentLinkedQueue<Hook>> apiHooks;
    private ProviderRepository providerRepository;
    private EventSupport eventSupport;
    private final AtomicReference<EvaluationContext> evaluationContext = new AtomicReference<>();
@@ -308,16 +306,7 @@
      * @param hooks The hook to add.
      */
     public void addHooks(Hook... hooks) {
-        var types = FlagValueType.values();
-        for (int i = 0; i < hooks.length; i++) {
-            var current = hooks[i];
-            for (int j = 0; j < types.length; j++) {
-                var type = types[j];
-                if (current.supportsFlagValueType(type)) {
-                    this.apiHooks.get(type).add(current);
-                }
-            }
-        }
+        HookSupport.addHooks(apiHooks, hooks);
     }
 
     /**
@@ -326,12 +315,7 @@
      * @return A list of {@link Hook}s.
      */
     public List<Hook> getHooks() {
-        // Hooks can be duplicated if they support multiple FlagValueTypes
-        var allHooks = new HashSet<Hook>();
-        for (var queue : this.apiHooks.values()) {
-            allHooks.addAll(queue);
-        }
-        return new ArrayList<>(allHooks);
+        return HookSupport.getAllUniqueHooks(apiHooks);
     }
 
     /**
@@ -339,7 +323,7 @@
     *
     * @return A list of {@link Hook}s.
     */
    ConcurrentLinkedQueue<Hook> getHooks(FlagValueType type) {
        return apiHooks.get(type);
    }


@@ -7,10 +7,8 @@
 import dev.openfeature.sdk.exceptions.ProviderNotReadyError;
 import dev.openfeature.sdk.internal.ObjectUtils;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -31,11 +29,11 @@
  */
 @Slf4j
 @SuppressWarnings({
-    "PMD.DataflowAnomalyAnalysis",
-    "PMD.BeanMembersShouldSerialize",
-    "PMD.UnusedLocalVariable",
-    "unchecked",
-    "rawtypes"
+        "PMD.DataflowAnomalyAnalysis",
+        "PMD.BeanMembersShouldSerialize",
+        "PMD.UnusedLocalVariable",
+        "unchecked",
+        "rawtypes"
 })
 @Deprecated() // TODO: eventually we will make this non-public. See issue #872
 public class OpenFeatureClient implements Client {
@@ -130,16 +128,7 @@ public void track(String trackingEventName, EvaluationContext context, TrackingE
      */
     @Override
     public OpenFeatureClient addHooks(Hook... hooks) {
-        var types = FlagValueType.values();
-        for (int i = 0; i < hooks.length; i++) {
-            var current = hooks[i];
-            for (int j = 0; j < types.length; j++) {
-                var type = types[j];
-                if (current.supportsFlagValueType(type)) {
-                    this.clientHooks.get(type).add(current);
-                }
-            }
-        }
+        HookSupport.addHooks(clientHooks, hooks);
         return this;
     }
 
@@ -148,11 +137,7 @@ public OpenFeatureClient addHooks(Hook... hooks) {
      */
     @Override
     public List<Hook> getHooks() {
-        var allHooks = new HashSet<Hook>();
-        for (var queue : this.clientHooks.values()) {
-            allHooks.addAll(queue);
-        }
-        return new ArrayList<>(allHooks);
+        return HookSupport.getAllUniqueHooks(clientHooks);
     }
 
     /**