replace init function with setters

Signed-off-by: Alexandra Oberaigner <[email protected]>

Author: alexandraoberaigner

src/main/java/dev/openfeature/sdk/HookSupportData.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Encapsulates data for hook execution per flag evaluation.
@@ -13,16 +14,22 @@ class HookSupportData {
 
     private List<Pair<Hook, HookContext>> hooks;
     private EvaluationContext evaluationContext;
+
+    @Setter
     private Map<String, Object> hints;
-    private boolean isInitialized = false;
 
     HookSupportData() {}
 
-    void initialize(
-            List<Hook> hooks,
-            SharedHookContext sharedContext,
-            EvaluationContext evaluationContext,
-            Map<String, Object> hints) {
+    public void setEvaluationContext(EvaluationContext evaluationContext) {
+        this.evaluationContext = evaluationContext;
+        if (hooks != null) {
+            for (Pair<Hook, HookContext> hookContextPair : hooks) {
+                hookContextPair.getValue().setCtx(evaluationContext);
+            }
+        }
+    }
+
+    public void setHooks(List<Hook> hooks, SharedHookContext sharedContext, EvaluationContext evaluationContext) {
         List<Pair<Hook, HookContext>> hookContextPairs = new ArrayList<>();
         for (Hook hook : hooks) {
             if (hook.supportsFlagValueType(sharedContext.getType())) {
@@ -32,14 +39,5 @@ void initialize(
         }
         this.hooks = hookContextPairs;
         this.evaluationContext = evaluationContext;
-        this.hints = hints;
-        isInitialized = true;
-    }
-
-    public void setEvaluationContext(EvaluationContext evaluationContext) {
-        this.evaluationContext = evaluationContext;
-        for (Pair<Hook, HookContext> hookContextPair : hooks) {
-            hookContextPair.getValue().setCtx(evaluationContext);
-        }
     }
 }

src/main/java/dev/openfeature/sdk/OpenFeatureClient.java

@@ -160,12 +160,13 @@ public EvaluationContext getEvaluationContext() {
                     + "Instead, we return an evaluation result with the appropriate error code.")
     private <T> FlagEvaluationDetails<T> evaluateFlag(
             FlagValueType type, String key, T defaultValue, EvaluationContext ctx, FlagEvaluationOptions options) {
+        FlagEvaluationDetails<T> details = null;
+        HookSupportData hookSupportData = new HookSupportData();
+
         var flagOptions = ObjectUtils.defaultIfNull(
                 options, () -> FlagEvaluationOptions.builder().build());
         var hints = Collections.unmodifiableMap(flagOptions.getHookHints());
-
-        FlagEvaluationDetails<T> details = null;
-        HookSupportData hookSupportData = new HookSupportData();
+        hookSupportData.setHints(hints);
 
         try {
             final var stateManager = openfeatureApi.getFeatureProviderStateManager(this.domain);
@@ -179,7 +180,7 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
             var sharedHookContext =
                     new SharedHookContext(key, type, this.getMetadata(), provider.getMetadata(), defaultValue);
 
-            hookSupportData.initialize(mergedHooks, sharedHookContext, ctx, hints);
+            hookSupportData.setHooks(mergedHooks, sharedHookContext, ctx);
 
             var evalContext = mergeEvaluationContext(ctx);
             hookSupportData.setEvaluationContext(evalContext);
@@ -217,11 +218,11 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
             }
             details.setErrorMessage(e.getMessage());
             enrichDetailsWithErrorDefaults(defaultValue, details);
-            if (hookSupportData.isInitialized()) {
+            if (hookSupportData.getHooks() != null && hookSupportData.getHints() != null) {
                 hookSupport.executeErrorHooks(hookSupportData, e);
             }
         } finally {
-            if (hookSupportData.isInitialized()) {
+            if (hookSupportData.getHooks() != null && hookSupportData.getHints() != null) {
                 hookSupport.executeAfterAllHooks(hookSupportData, details);
             }
         }

src/test/java/dev/openfeature/sdk/HookSupportTest.java

@@ -8,7 +8,6 @@
 
 import dev.openfeature.sdk.fixtures.HookFixtures;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,11 +34,8 @@ void shouldMergeEvaluationContextsOnBeforeHooksCorrectly() {
         when(hook2.before(any(), any())).thenReturn(Optional.of(evaluationContextWithValue("foo", "bar")));
 
         var hookSupportData = new HookSupportData();
-        hookSupportData.initialize(
-                Arrays.asList(hook1, hook2),
-                getBaseHookContextForType(FlagValueType.STRING),
-                baseContext,
-                Collections.emptyMap());
+        hookSupportData.setHooks(
+                Arrays.asList(hook1, hook2), getBaseHookContextForType(FlagValueType.STRING), baseContext);
 
         hookSupport.executeBeforeHooks(hookSupportData);
 
@@ -57,11 +53,8 @@ void shouldAlwaysCallGenericHook(FlagValueType flagValueType) {
         Hook<?> genericHook = mockGenericHook();
 
         var hookSupportData = new HookSupportData();
-        hookSupportData.initialize(
-                List.of(genericHook),
-                getBaseHookContextForType(flagValueType),
-                ImmutableContext.EMPTY,
-                Collections.emptyMap());
+        hookSupportData.setHooks(
+                List.of(genericHook), getBaseHookContextForType(flagValueType), ImmutableContext.EMPTY);
 
         callAllHooks(hookSupportData);
 
@@ -77,11 +70,7 @@ void shouldAlwaysCallGenericHook(FlagValueType flagValueType) {
     void shouldPassDataAcrossStages(FlagValueType flagValueType) {
         var testHook = new TestHookWithData();
         var hookSupportData = new HookSupportData();
-        hookSupportData.initialize(
-                List.of(testHook),
-                getBaseHookContextForType(flagValueType),
-                ImmutableContext.EMPTY,
-                Collections.emptyMap());
+        hookSupportData.setHooks(List.of(testHook), getBaseHookContextForType(flagValueType), ImmutableContext.EMPTY);
 
         hookSupport.executeBeforeHooks(hookSupportData);
         assertHookData(testHook, "before");
@@ -106,11 +95,8 @@ void shouldIsolateDataBetweenHooks(FlagValueType flagValueType) {
         var testHook2 = new TestHookWithData(2);
 
         var hookSupportData = new HookSupportData();
-        hookSupportData.initialize(
-                List.of(testHook1, testHook2),
-                getBaseHookContextForType(flagValueType),
-                ImmutableContext.EMPTY,
-                Collections.emptyMap());
+        hookSupportData.setHooks(
+                List.of(testHook1, testHook2), getBaseHookContextForType(flagValueType), ImmutableContext.EMPTY);
 
         callAllHooks(hookSupportData);