Merge branch 'main' into fix/flacky_e2e_tests

Author: aepfli

.github/workflows/merge.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
     - name: Set up JDK 17
-      uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
+      uses: actions/setup-java@ead9eaa3cfe0b0fc2fa749519ae09c3d4f4080b0
       with:
         java-version: '17'
         distribution: 'temurin'

.github/workflows/pullrequest.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
 
       - name: Set up JDK ${{ matrix.build.java }}
-        uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
+        uses: actions/setup-java@ead9eaa3cfe0b0fc2fa749519ae09c3d4f4080b0
         with:
             java-version: ${{ matrix.build.java }}
             distribution: 'temurin'

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
 
       - name: Set up JDK 17
-        uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
+        uses: actions/setup-java@ead9eaa3cfe0b0fc2fa749519ae09c3d4f4080b0
         with:
           java-version: '17'
           distribution: 'temurin'

pom.xml

@@ -60,7 +60,7 @@
             <!-- used so that lombok can generate suppressions for spotbugs. It needs to find it on the relevant classpath -->
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs</artifactId>
-            <version>4.9.5</version>
+            <version>4.9.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -348,7 +348,7 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
+                    <!--<plugin>
                         <groupId>com.vmlens</groupId>
                         <artifactId>vmlens-maven-plugin</artifactId>
                         <version>1.2.14</version>
@@ -363,7 +363,7 @@
                                 </configuration>
                             </execution>
                         </executions>
-                    </plugin>
+                    </plugin>-->
                     <plugin>
                         <artifactId>maven-dependency-plugin</artifactId>
                         <version>3.8.1</version>
@@ -457,7 +457,7 @@
                     <plugin>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-maven-plugin</artifactId>
-                        <version>4.9.5.0</version>
+                        <version>4.9.6.0</version>
                         <configuration>
                             <excludeFilterFile>spotbugs-exclusions.xml</excludeFilterFile>
                             <plugins>
@@ -473,7 +473,7 @@
                             <dependency>
                                 <groupId>com.github.spotbugs</groupId>
                                 <artifactId>spotbugs</artifactId>
-                                <version>4.9.5</version>
+                                <version>4.9.6</version>
                             </dependency>
                         </dependencies>
                         <executions>

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

@@ -1,13 +1,32 @@
 package dev.openfeature.sdk;
 
-import dev.openfeature.sdk.HookContextWithoutData.HookContextWithoutDataBuilder;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+import lombok.With;
 
 /**
- * A interface to hold immutable context that {@link Hook} instances use.
+ * A data class to hold immutable context that {@link Hook} instances use.
+ *
+ * @param <T> the type for the flag being evaluated
  */
-public interface HookContext<T> {
+@Value
+@Builder
+@With
+public class HookContext<T> {
+    @NonNull String flagKey;
+
+    @NonNull FlagValueType type;
+
+    @NonNull T defaultValue;
+
+    @NonNull EvaluationContext ctx;
+
+    ClientMetadata clientMetadata;
+    Metadata providerMetadata;
+
     /**
-     * Builds a {@link HookContextWithoutData} instances from request data.
+     * Builds a {@link HookContext} instances from request data.
      *
      * @param key              feature flag key
      * @param type             flag value type
@@ -17,39 +36,21 @@ 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
-    static <T> HookContext<T> from(
+    public static <T> HookContext<T> from(
             String key,
             FlagValueType type,
             ClientMetadata clientMetadata,
             Metadata providerMetadata,
             EvaluationContext ctx,
             T defaultValue) {
-        return new HookContextWithoutData<>(key, type, defaultValue, ctx, clientMetadata, providerMetadata);
-    }
-
-    /**
-     * Returns a builder for our default HookContext object.
-     */
-    static <T> HookContextWithoutDataBuilder<T> builder() {
-        return HookContextWithoutData.<T>builder();
-    }
-
-    String getFlagKey();
-
-    FlagValueType getType();
-
-    T getDefaultValue();
-
-    EvaluationContext getCtx();
-
-    ClientMetadata getClientMetadata();
-
-    Metadata getProviderMetadata();
-
-    default HookData getHookData() {
-        return null;
+        return HookContext.<T>builder()
+                .flagKey(key)
+                .type(type)
+                .clientMetadata(clientMetadata)
+                .providerMetadata(providerMetadata)
+                .ctx(ctx)
+                .defaultValue(defaultValue)
+                .build();
     }
 }