Merge branch 'main' into extract-vmlens-version

Signed-off-by: chrfwow <[email protected]>

Author: chrfwow

.github/workflows/merge.yml

@@ -22,8 +22,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      with:
+        fetch-depth: 0
+        submodules: recursive
     - 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

@@ -20,16 +20,19 @@ jobs:
     steps:
       - name: Check out the code
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+        with:
+          fetch-depth: 0
+          submodules: recursive
 
       - 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'
             cache: maven
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@573acd9552f33577783abde4acb66a1058e762e5
+        uses: github/codeql-action/init@0337c4c06e7e00d0d6e64396c13b9dc18dd6d8c5
         with:
           languages: java
 
@@ -55,4 +58,4 @@ jobs:
           verbose: true # optional (default = false)
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@573acd9552f33577783abde4acb66a1058e762e5
+        uses: github/codeql-action/analyze@0337c4c06e7e00d0d6e64396c13b9dc18dd6d8c5

.github/workflows/release.yml

@@ -38,9 +38,12 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+        with:
+          fetch-depth: 0
+          submodules: recursive
 
       - name: Set up JDK 17
-        uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
+        uses: actions/setup-java@ead9eaa3cfe0b0fc2fa749519ae09c3d4f4080b0
         with:
           java-version: '17'
           distribution: 'temurin'

.github/workflows/static-code-scanning.yaml

@@ -33,12 +33,12 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@573acd9552f33577783abde4acb66a1058e762e5
+        uses: github/codeql-action/init@0337c4c06e7e00d0d6e64396c13b9dc18dd6d8c5
         with:
           languages: java
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@573acd9552f33577783abde4acb66a1058e762e5
+        uses: github/codeql-action/autobuild@0337c4c06e7e00d0d6e64396c13b9dc18dd6d8c5
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@573acd9552f33577783abde4acb66a1058e762e5
+        uses: github/codeql-action/analyze@0337c4c06e7e00d0d6e64396c13b9dc18dd6d8c5

.release-please-manifest.json

@@ -1 +1 @@
-{".":"1.18.0"}
+{".":"1.18.1"}

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.18.1](https://github.com/open-feature/java-sdk/compare/v1.18.0...v1.18.1) (2025-09-17)
+
+
+### 🐛 Bug Fixes
+
+* **deps:** update dependency com.fasterxml.jackson:jackson-bom to v2.20.0 ([#1604](https://github.com/open-feature/java-sdk/issues/1604)) ([b693390](https://github.com/open-feature/java-sdk/commit/b69339067a75a524911dded9798a06e58d628bce))
+* **deps:** update dependency com.github.spotbugs:spotbugs to v4.9.6 ([#1609](https://github.com/open-feature/java-sdk/issues/1609)) ([45ff89f](https://github.com/open-feature/java-sdk/commit/45ff89f530e8c73636618676b9db46c61235df57))
+* revert hook data to resolve bytecode incompatibility ([#1613](https://github.com/open-feature/java-sdk/issues/1613)) ([9845601](https://github.com/open-feature/java-sdk/commit/984560196d4a34fb21c8946d1dc675cf6565e90f))
+
+
+### 🧹 Chore
+
+* **deps:** update actions/setup-java digest to ead9eaa ([#1608](https://github.com/open-feature/java-sdk/issues/1608)) ([a40667e](https://github.com/open-feature/java-sdk/commit/a40667e9cb635f9ba31f6975ba72bc5932fca094))
+* **deps:** update dependency com.github.spotbugs:spotbugs-maven-plugin to v4.9.6.0 ([#1612](https://github.com/open-feature/java-sdk/issues/1612)) ([fa23e96](https://github.com/open-feature/java-sdk/commit/fa23e960ff9dc52b5c44b56e521485ca03e0e650))
+* **deps:** update dependency com.vmlens:vmlens-maven-plugin to v1.2.14 ([#1606](https://github.com/open-feature/java-sdk/issues/1606)) ([a92a367](https://github.com/open-feature/java-sdk/commit/a92a367fef71cc9ec26f6b1b6609fb8e6b2543bc))
+* **deps:** update dependency dev.cel:cel to v0.11.0 ([#1603](https://github.com/open-feature/java-sdk/issues/1603)) ([e792221](https://github.com/open-feature/java-sdk/commit/e7922212d8cd964a8a24dacc518ff31c77fcfae6))
+* **deps:** update github/codeql-action digest to 573acd9 ([#1600](https://github.com/open-feature/java-sdk/issues/1600)) ([6fb139f](https://github.com/open-feature/java-sdk/commit/6fb139f8425fb76368b1e1baa745aa182f8c13f7))
+* fix checkout ([#1614](https://github.com/open-feature/java-sdk/issues/1614)) ([fbf2a75](https://github.com/open-feature/java-sdk/commit/fbf2a752647817d3e25d4f8b67893ba5e8f89b7a))
+* relax coverage ([69c5a12](https://github.com/open-feature/java-sdk/commit/69c5a1244283d22af0119f534270726a8c520367))
+
 ## [1.18.0](https://github.com/open-feature/java-sdk/compare/v1.17.0...v1.18.0) (2025-09-16)
 
 

README.md

@@ -18,8 +18,8 @@
   </a>
   <!-- x-release-please-start-version -->
 
-  <a href="https://github.com/open-feature/java-sdk/releases/tag/v1.18.0">
-    <img alt="Release" src="https://img.shields.io/static/v1?label=release&message=v1.18.0&color=blue&style=for-the-badge" />
+  <a href="https://github.com/open-feature/java-sdk/releases/tag/v1.18.1">
+    <img alt="Release" src="https://img.shields.io/static/v1?label=release&message=v1.18.1&color=blue&style=for-the-badge" />
   </a>  
 
   <!-- x-release-please-end -->
@@ -59,7 +59,7 @@ Note that this library is intended to be used in server-side contexts and has no
 <dependency>
     <groupId>dev.openfeature</groupId>
     <artifactId>sdk</artifactId>
-    <version>1.18.0</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 <!-- x-release-please-end-version -->
@@ -84,7 +84,7 @@ If you would like snapshot builds, this is the relevant repository information:
 <!-- x-release-please-start-version -->
 ```groovy
 dependencies {
-    implementation 'dev.openfeature:sdk:1.18.0'
+    implementation 'dev.openfeature:sdk:1.18.1'
 }
 ```
 <!-- x-release-please-end-version -->

pom.xml

@@ -5,15 +5,15 @@
 
     <groupId>dev.openfeature</groupId>
     <artifactId>sdk</artifactId>
-    <version>1.18.0</version> <!--x-release-please-version -->
+    <version>1.18.1</version> <!--x-release-please-version -->
 
     <properties>
         <toolchain.jdk.version>[17,)</toolchain.jdk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
-        <org.mockito.version>5.19.0</org.mockito.version>
         <com.vmlens.version>1.2.14</com.vmlens.version>
+        <org.mockito.version>5.20.0</org.mockito.version>
         <!-- exclusion expression for e2e tests -->
         <testExclusions>**/e2e/*.java</testExclusions>
         <module-name>${project.groupId}.${project.artifactId}</module-name>
@@ -53,15 +53,15 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.40</version>
+            <version>1.18.42</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <!-- 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>
 
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.4</version>
+            <version>3.27.5</version>
             <scope>test</scope>
         </dependency>
 
@@ -151,7 +151,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.4.8-jre</version>
+            <version>33.5.0-jre</version>
             <scope>test</scope>
         </dependency>
 
@@ -349,7 +349,7 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
+                    <!--<plugin>
                         <groupId>com.vmlens</groupId>
                         <artifactId>vmlens-maven-plugin</artifactId>
                         <version>${com.vmlens.version}</version>
@@ -364,7 +364,7 @@
                                 </configuration>
                             </execution>
                         </executions>
-                    </plugin>
+                    </plugin>-->
                     <plugin>
                         <artifactId>maven-dependency-plugin</artifactId>
                         <version>3.8.1</version>
@@ -445,7 +445,7 @@
                                                 <limit>
                                                     <counter>LINE</counter>
                                                     <value>COVEREDRATIO</value>
-                                                    <minimum>0.80</minimum>
+                                                    <minimum>0.70</minimum>
                                                 </limit>
                                             </limits>
                                         </rule>
@@ -458,7 +458,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>
@@ -474,7 +474,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();
     }
 }