PR suggestions: integration test hook data usage in client, set pair value

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

Author: alexandraoberaigner

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

@@ -42,8 +42,7 @@ public void setHookContexts(HookSupportData hookSupportData, SharedHookContext s
         for (int i = 0; i < hookSupportData.hooks.size(); i++) {
             Pair<Hook, HookContext> hookContextPair = hookSupportData.hooks.get(i);
             HookContext curHookContext = sharedContext.hookContextFor(null, new DefaultHookData());
-            Pair<Hook, HookContext> updatedPair = Pair.of(hookContextPair.getKey(), curHookContext);
-            hookSupportData.hooks.set(i, updatedPair);
+            hookContextPair.setValue(curHookContext);
         }
     }
 

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

@@ -1,11 +1,14 @@
 package dev.openfeature.sdk;
 
+import lombok.Setter;
 import lombok.ToString;
 
 @ToString
 class Pair<K, V> {
     private final K key;
-    private final V value;
+
+    @Setter
+    private V value;
 
     private Pair(K key, V value) {
         this.key = key;

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

@@ -163,42 +163,4 @@ private EvaluationContext evaluationContextWithValue(String key, String value) {
         attributes.put(key, new Value(value));
         return new ImmutableContext(attributes);
     }
-
-    private static class TestHookWithData implements Hook {
-        private final Object value;
-        HookData hookData = null;
-
-        public TestHookWithData(Object value) {
-            this.value = value;
-        }
-
-        public TestHookWithData() {
-            this("test");
-        }
-
-        @Override
-        public Optional<EvaluationContext> before(HookContext ctx, Map hints) {
-            ctx.getHookData().set("before", value);
-            hookData = ctx.getHookData();
-            return Optional.empty();
-        }
-
-        @Override
-        public void after(HookContext ctx, FlagEvaluationDetails details, Map hints) {
-            ctx.getHookData().set("after", value);
-            hookData = ctx.getHookData();
-        }
-
-        @Override
-        public void error(HookContext ctx, Exception error, Map hints) {
-            ctx.getHookData().set("error", value);
-            hookData = ctx.getHookData();
-        }
-
-        @Override
-        public void finallyAfter(HookContext ctx, FlagEvaluationDetails details, Map hints) {
-            ctx.getHookData().set("finallyAfter", value);
-            hookData = ctx.getHookData();
-        }
-    }
 }

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

@@ -16,6 +16,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 import org.simplify4u.slf4jmock.LoggerMock;
 import org.slf4j.Logger;
@@ -104,4 +106,33 @@ void shouldNotCallEvaluationMethodsWhenProviderIsInNotReadyState() {
 
         assertThat(details.getErrorCode()).isEqualTo(ErrorCode.PROVIDER_NOT_READY);
     }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    @DisplayName("Should support usage of HookData with/without error")
+    void shouldSupportUsageOfHookData(boolean isError) {
+        FeatureProvider provider = new TestEventsProvider(5000);
+        OpenFeatureAPI api = new OpenFeatureAPI();
+        if (isError) {
+            api.setProvider("shouldSupportUsageOfHookData", provider);
+        } else {
+            api.setProviderAndWait("shouldSupportUsageOfHookData", provider);
+        }
+
+        var testHook = new TestHookWithData("test-data");
+        api.addHooks(testHook);
+
+        Client client = api.getClient("shouldSupportUsageOfHookData");
+        client.getBooleanDetails("key", true);
+
+        assertThat(testHook.hookData.get("before")).isEqualTo("test-data");
+        assertThat(testHook.hookData.get("finallyAfter")).isEqualTo("test-data");
+        if (isError) {
+            assertThat(testHook.hookData.get("after")).isEqualTo(null);
+            assertThat(testHook.hookData.get("error")).isEqualTo("test-data");
+        } else {
+            assertThat(testHook.hookData.get("after")).isEqualTo("test-data");
+            assertThat(testHook.hookData.get("error")).isEqualTo(null);
+        }
+    }
 }

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

@@ -0,0 +1,42 @@
+package dev.openfeature.sdk;
+
+import java.util.Map;
+import java.util.Optional;
+
+class TestHookWithData implements Hook {
+    private final Object value;
+    HookData hookData = null;
+
+    public TestHookWithData(Object value) {
+        this.value = value;
+    }
+
+    public TestHookWithData() {
+        this("test");
+    }
+
+    @Override
+    public Optional<EvaluationContext> before(HookContext ctx, Map hints) {
+        ctx.getHookData().set("before", value);
+        hookData = ctx.getHookData();
+        return Optional.empty();
+    }
+
+    @Override
+    public void after(HookContext ctx, FlagEvaluationDetails details, Map hints) {
+        ctx.getHookData().set("after", value);
+        hookData = ctx.getHookData();
+    }
+
+    @Override
+    public void error(HookContext ctx, Exception error, Map hints) {
+        ctx.getHookData().set("error", value);
+        hookData = ctx.getHookData();
+    }
+
+    @Override
+    public void finallyAfter(HookContext ctx, FlagEvaluationDetails details, Map hints) {
+        ctx.getHookData().set("finallyAfter", value);
+        hookData = ctx.getHookData();
+    }
+}