Merge branch 'main' into feature/flagd-http-connector

chrfwow · web-flow · commit 45768167caa1 · 2025-04-24T08:22:43.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,8 +16,8 @@ jobs:
           build:
               - java: 21
                 profile: codequality
-              - java: 8
-                profile: java8
+              - java: 11
+                profile: java11
 
     name: with Java ${{ matrix.build.java }}
     runs-on: ${{ matrix.os}}
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Set up JDK ${{ matrix.build.java }}
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           java-version: ${{ matrix.build.java }}
           distribution: 'temurin'
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -5,6 +5,7 @@ on:
 name: Run Release Please
 jobs:
   release-please:
+    environment: publish
     runs-on: ubuntu-latest
 
     # Release-please creates a PR that tracks all changes
@@ -21,7 +22,7 @@ jobs:
 
       - name: Set up JDK 21
         if: ${{ steps.release.outputs.releases_created }}
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           java-version: '21'
           distribution: 'temurin'
diff --git a/.gitmodules b/.gitmodules
@@ -4,7 +4,7 @@
 [submodule "providers/flagd/test-harness"]
 	path = providers/flagd/test-harness
 	url = https://github.com/open-feature/test-harness.git
-	branch = v2.7.3
+	branch = v2.8.0
 [submodule "providers/flagd/spec"]
 	path = providers/flagd/spec
 	url = https://github.com/open-feature/spec.git
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -2,7 +2,7 @@
   "providers/flagd": "0.11.8",
   "hooks/open-telemetry": "3.2.1",
   "providers/go-feature-flag": "0.4.3",
-  "providers/flagsmith": "0.0.9",
+  "providers/flagsmith": "0.0.10",
   "providers/env-var": "0.0.7",
   "providers/jsonlogic-eval-provider": "1.1.1",
   "providers/unleash": "0.1.0-alpha",
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1 +1 @@
-java=8.0.312-tem
+java=11.0.26-tem
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,11 +2,11 @@
 
 ## System Requirements
 
-Java 8+ is required for the tooling, plugins, etc. Maven 3.8+ is recommended.
+Java 11+ is required for the tooling, plugins, etc. Maven 3.8+ is recommended.
 
 ## Compilation target(s)
 
-As in the Java-SDK, we target Java 8. The parent POM configures this automatically.
+As in the Java-SDK, we target Java 11. The parent POM configures this automatically.
 
 ## Adding a module
 
diff --git a/pom.xml b/pom.xml
@@ -62,22 +62,22 @@
         </surefireArgLine>
         <skip.tests>false</skip.tests>
         <!-- this will throw an error if we use APIs not available in the specified version -->
-        <maven.compiler.release>8</maven.compiler.release>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.12.1</version>
+                <version>5.12.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-bom</artifactId>
-                <version>7.21.1</version>
+                <version>7.22.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.36</version>
+            <version>1.18.38</version>
             <scope>provided</scope>
         </dependency>
 
@@ -292,8 +292,7 @@
                     </excludePackageNames>
                     <doclint>all,-missing
                     </doclint>  <!-- ignore missing javadoc, these are enforced with more customizability in the checkstyle plugin -->
-
-                    <source>8</source>
+                    <legacyMode>true</legacyMode>
                 </configuration>
                 <executions>
                     <execution>
@@ -368,7 +367,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <excludes>
                         <!-- tests to exclude -->
@@ -411,7 +410,7 @@
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>10.21.4</version>
+                                <version>10.23.0</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -454,7 +453,7 @@
                                 <plugin>
                                     <groupId>com.h3xstream.findsecbugs</groupId>
                                     <artifactId>findsecbugs-plugin</artifactId>
-                                    <version>1.13.0</version>
+                                    <version>1.14.0</version>
                                 </plugin>
                             </plugins>
                         </configuration>
@@ -481,7 +480,7 @@
                     <plugin>
                         <groupId>com.diffplug.spotless</groupId>
                         <artifactId>spotless-maven-plugin</artifactId>
-                        <version>2.44.3</version>
+                        <version>2.44.4</version>
                         <configuration>
                             <!-- optional: limit format enforcement to just the files changed by this feature branch -->
                             <!--                <ratchetFrom>origin/main</ratchetFrom>-->
@@ -529,14 +528,14 @@
             </build>
         </profile>
 
-        <!-- profile for running tests under java 8 (used mostly in CI) -->
+        <!-- profile for running tests under java 11 (used mostly in CI) -->
         <!-- selected automatically by JDK activeation (see https://maven.apache.org/guides/introduction/introduction-to-profiles.html#implicit-profile-activation) -->
         <profile>
-            <id>java8</id>
-            <!-- with the next block we can define a set of artifacts which still support java 8, if any of the artifacts is not supporting java 8 anymore -->
+            <id>java11</id>
+            <!-- with the next block we can define a set of artifacts which still support java 11, if any of the artifacts is not supporting java 11 anymore -->
             <!--<modules><module></module></modules>-->
             <properties>
-                <toolchain.jdk.version>(1.8,9)</toolchain.jdk.version>
+                <toolchain.jdk.version>[11,)</toolchain.jdk.version>
                 <skip.tests>true</skip.tests>
             </properties>
 
@@ -557,7 +556,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.5.2</version>
+                        <version>3.5.3</version>
                         <configuration>
                             <skipTests>${skip.tests}</skipTests>
                         </configuration>
diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.4</version>
+            <version>4.5.0</version>
         </dependency>
 
         <dependency>
@@ -141,19 +141,19 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.12.1</version>
+            <version>5.12.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.20.6</version>
+            <version>1.21.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.20.6</version>
+            <version>1.21.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/providers/flagd/schemas b/providers/flagd/schemas
@@ -1 +1 @@
-Subproject commit 9b0ee43ecc477e277d41770034fa495ec78838fe
+Subproject commit c707f563d0a1b35ebea802568c6d3151633bde31
diff --git a/providers/flagd/spec b/providers/flagd/spec
@@ -1 +1 @@
-Subproject commit 27e4461b452429ec64bcb89af0301f7664cb702a
+Subproject commit 36944c68dd60e874661f5efd022ccafb9af76535
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java
@@ -210,7 +210,7 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
                         onConfigurationChanged(flagdProviderEvent);
                         break;
                     }
-                    // intentional fall through
+                // intentional fall through
                 case PROVIDER_READY:
                     /*
                      * Sync metadata is used to enrich the context, and is immutable in flagd,
diff --git a/providers/flagd/test-harness b/providers/flagd/test-harness
@@ -1 +1 @@
-Subproject commit 5f3f6893108daed3b510952e97c5429ad1897d8e
+Subproject commit 8dca72ca3877e009b3b76664749f3f604403dfd6
diff --git a/providers/flagsmith/CHANGELOG.md b/providers/flagsmith/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.0.10](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagsmith-v0.0.9...dev.openfeature.contrib.providers.flagsmith-v0.0.10) (2025-04-14)
+
+
+### 🐛 Bug Fixes
+
+* **deps:** update dependency com.flagsmith:flagsmith-java-client to v7.4.3 ([#1098](https://github.com/open-feature/java-sdk-contrib/issues/1098)) ([a4b7809](https://github.com/open-feature/java-sdk-contrib/commit/a4b7809b03ae5384cc150c74fc7f7fb8068537d8))
+* graceful flagsmith provider shutdown ([#1305](https://github.com/open-feature/java-sdk-contrib/issues/1305)) ([36d1001](https://github.com/open-feature/java-sdk-contrib/commit/36d1001b0d3c20a65cfd582936b82635cda83b8a))
+
 ## [0.0.9](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagsmith-v0.0.8...dev.openfeature.contrib.providers.flagsmith-v0.0.9) (2024-09-13)
 
 
diff --git a/providers/flagsmith/README.md b/providers/flagsmith/README.md
@@ -12,7 +12,7 @@ Flagsmith provides an all-in-one platform for developing, implementing, and mana
 <dependency>
     <groupId>dev.openfeature.contrib.providers</groupId>
     <artifactId>flagsmith</artifactId>
-    <version>0.0.9</version>
+    <version>0.0.10</version>
 </dependency>
 ```
 
diff --git a/providers/flagsmith/pom.xml b/providers/flagsmith/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>dev.openfeature.contrib.providers</groupId>
     <artifactId>flagsmith</artifactId>
-    <version>0.0.9</version> <!--x-release-please-version -->
+    <version>0.0.10</version> <!--x-release-please-version -->
 
     <name>flagsmith</name>
     <description>Flagsmith provider for Java</description>
diff --git a/providers/flagsmith/src/main/java/dev.openfeature.contrib.providers.flagsmith/FlagsmithProvider.java b/providers/flagsmith/src/main/java/dev.openfeature.contrib.providers.flagsmith/FlagsmithProvider.java
@@ -244,4 +244,12 @@ private Structure mapToStructure(Map<String, Object> map) {
                 .filter(e -> e.getValue() != null)
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> objectToValue(e.getValue()))));
     }
+
+    @Override
+    public void shutdown() {
+        log.info("Flagsmith Provider shutting down");
+        if (flagsmith != null) {
+            flagsmith.close();
+        }
+    }
 }
diff --git a/providers/flagsmith/version.txt b/providers/flagsmith/version.txt
@@ -1 +1 @@
-0.0.9
+0.0.10
diff --git a/providers/go-feature-flag/src/test/java/dev/openfeature/contrib/providers/gofeatureflag/GoFeatureFlagProviderTest.java b/providers/go-feature-flag/src/test/java/dev/openfeature/contrib/providers/gofeatureflag/GoFeatureFlagProviderTest.java
@@ -236,6 +236,7 @@ void should_throw_an_error_if_endpoint_not_available() {
         FlagEvaluationDetails<Boolean> got = client.getBooleanDetails("fail_500", false, this.evaluationContext);
         FlagEvaluationDetails<Boolean> want = FlagEvaluationDetails.<Boolean>builder()
                 .value(false)
+                .flagKey("fail_500")
                 .reason(Reason.ERROR.name())
                 .errorCode(ErrorCode.GENERAL)
                 .errorMessage("unknown error while retrieving flag fail_500")
@@ -257,6 +258,7 @@ void should_throw_an_error_if_invalid_api_key() {
         FlagEvaluationDetails<Boolean> got = client.getBooleanDetails("fail_401", false, this.evaluationContext);
         FlagEvaluationDetails<Boolean> want = FlagEvaluationDetails.<Boolean>builder()
                 .value(false)
+                .flagKey("fail_401")
                 .reason(Reason.ERROR.name())
                 .errorCode(ErrorCode.GENERAL)
                 .errorMessage("authentication/authorization error")
@@ -277,6 +279,7 @@ void should_throw_an_error_if_flag_does_not_exists() {
         FlagEvaluationDetails<Boolean> got = client.getBooleanDetails("flag_not_found", false, this.evaluationContext);
         FlagEvaluationDetails<Boolean> want = FlagEvaluationDetails.<Boolean>builder()
                 .value(false)
+                .flagKey("flag_not_found")
                 .reason(Reason.ERROR.name())
                 .errorCode(ErrorCode.FLAG_NOT_FOUND)
                 .errorMessage("Flag flag_not_found was not found in your configuration")
@@ -297,6 +300,7 @@ void should_throw_an_error_if_we_expect_a_boolean_and_got_another_type() {
         FlagEvaluationDetails<Boolean> got = client.getBooleanDetails("string_key", false, this.evaluationContext);
         FlagEvaluationDetails<Boolean> want = FlagEvaluationDetails.<Boolean>builder()
                 .value(false)
+                .flagKey("string_key")
                 .reason(Reason.ERROR.name())
                 .errorCode(ErrorCode.TYPE_MISMATCH)
                 .errorMessage(
@@ -515,6 +519,7 @@ void should_throw_an_error_if_we_expect_a_string_and_got_another_type() {
                 client.getStringDetails("bool_targeting_match", "defaultValue", this.evaluationContext);
         FlagEvaluationDetails<String> want = FlagEvaluationDetails.<String>builder()
                 .value("defaultValue")
+                .flagKey("bool_targeting_match")
                 .reason(Reason.ERROR.name())
                 .errorMessage(
                         "Flag value bool_targeting_match had unexpected type class java.lang.Boolean, expected class java.lang.String.")
@@ -579,6 +584,7 @@ void should_throw_an_error_if_we_expect_a_integer_and_got_another_type() {
                 client.getIntegerDetails("bool_targeting_match", 200, this.evaluationContext);
         FlagEvaluationDetails<Integer> want = FlagEvaluationDetails.<Integer>builder()
                 .value(200)
+                .flagKey("bool_targeting_match")
                 .reason(Reason.ERROR.name())
                 .errorMessage(
                         "Flag value bool_targeting_match had unexpected type class java.lang.Boolean, expected class java.lang.Integer.")
@@ -641,6 +647,7 @@ void should_throw_an_error_if_we_expect_a_integer_and_double_type() {
         FlagEvaluationDetails<Integer> got = client.getIntegerDetails("double_key", 200, this.evaluationContext);
         FlagEvaluationDetails<Integer> want = FlagEvaluationDetails.<Integer>builder()
                 .value(200)
+                .flagKey("double_key")
                 .reason(Reason.ERROR.name())
                 .errorMessage(
                         "Flag value double_key had unexpected type class java.lang.Double, expected class java.lang.Integer.")
@@ -727,8 +734,10 @@ void should_resolve_a_valid_value_flag_with_TARGETING_MATCH_reason() {
                 .value(new Value(new MutableStructure()
                         .add("test", "test1")
                         .add("test2", false)
+                        .add("test5", new Value())
                         .add("test3", 123.3)
                         .add("test4", 1)))
+                .flagKey("object_key")
                 .reason(Reason.TARGETING_MATCH.name())
                 .variant("True")
                 .flagMetadata(defaultMetadata)
@@ -772,6 +781,7 @@ void should_throw_an_error_if_no_targeting_key() {
                 client.getObjectDetails("string_key", new Value("CC0000"), new MutableContext());
         FlagEvaluationDetails<Value> want = FlagEvaluationDetails.<Value>builder()
                 .value(new Value("CC0000"))
+                .flagKey("string_key")
                 .errorCode(ErrorCode.TARGETING_KEY_MISSING)
                 .reason(Reason.ERROR.name())
                 .build();
diff --git a/providers/jsonlogic-eval-provider/pom.xml b/providers/jsonlogic-eval-provider/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.8.6</version>
+            <version>4.9.3</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/tools/junit-openfeature/pom.xml b/tools/junit-openfeature/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.junit-pioneer</groupId>
             <artifactId>junit-pioneer</artifactId>
-            <version>1.9.1</version>
+            <version>2.3.0</version>
         </dependency>
     </dependencies>
 
