fixup: pr comments

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

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

@@ -4,7 +4,6 @@
 
 /**
  * A interface to hold immutable context that {@link Hook} instances use.
- *
  */
 public interface HookContext<T> {
     /**
@@ -18,7 +17,6 @@ public interface HookContext<T> {
      * @param defaultValue     Fallback value
      * @param <T>              type that the flag is evaluating against
      * @return resulting context for hook
-     *
      * @deprecated this should not be instantiated outside the SDK anymore
      */
     @Deprecated
@@ -29,14 +27,7 @@ static <T> HookContext<T> from(
             Metadata providerMetadata,
             EvaluationContext ctx,
             T defaultValue) {
-        return HookContextWithoutData.<T>builder()
-                .flagKey(key)
-                .type(type)
-                .clientMetadata(clientMetadata)
-                .providerMetadata(providerMetadata)
-                .ctx(ctx)
-                .defaultValue(defaultValue)
-                .build();
+        return new HookContextWithoutData<>(key, type, defaultValue, ctx, clientMetadata, providerMetadata);
     }
 
     /**

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

@@ -1,11 +1,6 @@
 package dev.openfeature.sdk;
 
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.Setter;
-import lombok.With;
+import lombok.*;
 
 /**
  * A data class to hold immutable context that {@link Hook} instances use.
@@ -36,25 +31,13 @@ class HookContextWithoutData<T> implements HookContext<T> {
      * @param type             flag value type
      * @param clientMetadata   info on which client is calling
      * @param providerMetadata info on the provider
-     * @param ctx              Evaluation Context for the request
      * @param defaultValue     Fallback value
      * @param <T>              type that the flag is evaluating against
      * @return resulting context for hook
      */
     static <T> HookContextWithoutData<T> from(
-            String key,
-            FlagValueType type,
-            ClientMetadata clientMetadata,
-            Metadata providerMetadata,
-            EvaluationContext ctx,
-            T defaultValue) {
-        return HookContextWithoutData.<T>builder()
-                .flagKey(key)
-                .type(type)
-                .clientMetadata(clientMetadata)
-                .providerMetadata(providerMetadata)
-                .ctx(ImmutableContext.EMPTY)
-                .defaultValue(defaultValue)
-                .build();
+            String key, FlagValueType type, ClientMetadata clientMetadata, Metadata providerMetadata, T defaultValue) {
+        return new HookContextWithoutData<>(
+                key, type, defaultValue, ImmutableContext.EMPTY, clientMetadata, providerMetadata);
     }
 }

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

@@ -47,20 +47,20 @@ static HookData create() {
     /**
      * Default implementation of HookData.
      */
-    public class DefaultHookData implements HookData {
+    class DefaultHookData implements HookData {
         private Map<String, Object> data;
 
         @Override
         public void set(String key, Object value) {
-            if(data == null) {
+            if (data == null) {
                 data = new HashMap<>();
             }
             data.put(key, value);
         }
 
         @Override
         public Object get(String key) {
-            if(data == null) {
+            if (data == null) {
                 return null;
             }
             return data.get(key);

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

@@ -173,9 +173,11 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
             // provider must be accessed once to maintain a consistent reference
             final var provider = stateManager.getProvider();
             final var state = stateManager.getState();
-            hookContext = HookContextWithoutData.from(
-                    key, type, this.getMetadata(), provider.getMetadata(), null, defaultValue);
+            hookContext =
+                    HookContextWithoutData.from(key, type, this.getMetadata(), provider.getMetadata(), defaultValue);
 
+            // we are setting the evaluation context one after the other, so that we have a hook context in each
+            // possible exception case.
             hookContext.setCtx(mergeEvaluationContext(ctx));
 
             mergedHooks = ObjectUtils.merge(

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

@@ -9,14 +9,6 @@ private Pair(K key, V value) {
         this.value = value;
     }
 
-    public K getKey() {
-        return key;
-    }
-
-    public V getValue() {
-        return value;
-    }
-
     public K getLeft() {
         return key;
     }

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

@@ -35,7 +35,7 @@ void shouldCreateHookContextWithHookData() {
         HookData hookData = HookData.create();
         hookData.set("test", "value");
 
-        HookContext<String> context = HookContextWithData.of(null, hookData);
+        HookContextWithData context = HookContextWithData.of(mock(HookContext.class), hookData);
 
         assertNotNull(context.getHookData());
         assertEquals("value", context.getHookData().get("test"));