Merge branch 'main' into sideshowcoder/remove-fork-non-reuse-add-mockito-javaagent

sideshowcoder · web-flow · commit a879ab9feb26 · 2025-11-14T11:38:38.000+01:00
diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
@@ -18,6 +18,6 @@ jobs:
     name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@e49f57ce06c1747542fce2243c7a98682384bc0e
+      - uses: amannn/action-semantic-pull-request@069817c298f23fab00a8f29a2e556a5eac0f6390
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+    - uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
       with:
         fetch-depth: 0
         submodules: recursive
     - name: Set up JDK 17
-      uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190
+      uses: actions/setup-java@6ba5449b7dcda52941806a19f0cf626b6420191e
       with:
         java-version: '17'
         distribution: 'temurin'
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -19,20 +19,20 @@ jobs:
     runs-on: ${{ matrix.os}}
     steps:
       - name: Check out the code
-        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
         with:
           fetch-depth: 0
           submodules: recursive
 
       - name: Set up JDK ${{ matrix.build.java }}
-        uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190
+        uses: actions/setup-java@6ba5449b7dcda52941806a19f0cf626b6420191e
         with:
             java-version: ${{ matrix.build.java }}
             distribution: 'temurin'
             cache: maven
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8d77149e0c9e2199ac9cfc90c9e15116f5c69c48
+        uses: github/codeql-action/init@ba454b8ab46733eb6145342877cd148270bb77ab
         with:
           languages: java
 
@@ -58,4 +58,4 @@ jobs:
           verbose: true # optional (default = false)
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8d77149e0c9e2199ac9cfc90c9e15116f5c69c48
+        uses: github/codeql-action/analyze@ba454b8ab46733eb6145342877cd148270bb77ab
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,13 +37,13 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
         with:
           fetch-depth: 0
           submodules: recursive
 
       - name: Set up JDK 17
-        uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190
+        uses: actions/setup-java@6ba5449b7dcda52941806a19f0cf626b6420191e
         with:
           java-version: '17'
           distribution: 'temurin'
diff --git a/.github/workflows/static-code-scanning.yaml b/.github/workflows/static-code-scanning.yaml
@@ -29,16 +29,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8d77149e0c9e2199ac9cfc90c9e15116f5c69c48
+        uses: github/codeql-action/init@ba454b8ab46733eb6145342877cd148270bb77ab
         with:
           languages: java
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8d77149e0c9e2199ac9cfc90c9e15116f5c69c48
+        uses: github/codeql-action/autobuild@ba454b8ab46733eb6145342877cd148270bb77ab
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8d77149e0c9e2199ac9cfc90c9e15116f5c69c48
+        uses: github/codeql-action/analyze@ba454b8ab46733eb6145342877cd148270bb77ab
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <org.mockito.version>5.20.0</org.mockito.version>
-        <com.vmlens.version>1.2.21</com.vmlens.version>
+        <com.vmlens.version>1.2.22</com.vmlens.version>
         <!-- exclusion expression for e2e tests -->
         <testExclusions>**/e2e/*.java</testExclusions>
         <module-name>${project.groupId}.${project.artifactId}</module-name>
@@ -214,22 +214,22 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.17.8</version>
+                <version>1.18.1</version>
                 <scope>test</scope>
             </dependency>
 
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
-                <version>1.17.8</version>
+                <version>1.18.0</version>
                 <scope>test</scope>
             </dependency>
             <!-- End mockito workaround-->
 
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.20.0</version> <!-- Use the desired version -->
+                <version>2.20.1</version> <!-- Use the desired version -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -245,7 +245,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>6.0.0</version>
+                <version>6.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -508,7 +508,7 @@
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>11.1.0</version>
+                                <version>12.1.2</version>
                             </dependency>
                         </dependencies>
                         <executions>
diff --git a/src/main/java/dev/openfeature/sdk/EventProvider.java b/src/main/java/dev/openfeature/sdk/EventProvider.java
@@ -1,5 +1,6 @@
 package dev.openfeature.sdk;
 
+import dev.openfeature.sdk.internal.ConfigurableThreadFactory;
 import dev.openfeature.sdk.internal.TriConsumer;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -21,7 +22,8 @@
 @Slf4j
 public abstract class EventProvider implements FeatureProvider {
     private EventProviderListener eventProviderListener;
-    private final ExecutorService emitterExecutor = Executors.newCachedThreadPool();
+    private final ExecutorService emitterExecutor =
+            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-event-emitter-thread"));
 
     void setEventProviderListener(EventProviderListener eventProviderListener) {
         this.eventProviderListener = eventProviderListener;
diff --git a/src/main/java/dev/openfeature/sdk/EventSupport.java b/src/main/java/dev/openfeature/sdk/EventSupport.java
@@ -1,5 +1,6 @@
 package dev.openfeature.sdk;
 
+import dev.openfeature.sdk.internal.ConfigurableThreadFactory;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -26,7 +27,8 @@ class EventSupport {
     private static final String DEFAULT_CLIENT_UUID = UUID.randomUUID().toString();
     private final Map<String, HandlerStore> handlerStores = new ConcurrentHashMap<>();
     private final HandlerStore globalHandlerStore = new HandlerStore();
-    private final ExecutorService taskExecutor = Executors.newCachedThreadPool();
+    private final ExecutorService taskExecutor =
+            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-event-handler-thread"));
 
     /**
      * Run all the event handlers associated with this domain.
diff --git a/src/main/java/dev/openfeature/sdk/ProviderRepository.java b/src/main/java/dev/openfeature/sdk/ProviderRepository.java
@@ -2,6 +2,7 @@
 
 import dev.openfeature.sdk.exceptions.GeneralError;
 import dev.openfeature.sdk.exceptions.OpenFeatureError;
+import dev.openfeature.sdk.internal.ConfigurableThreadFactory;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -22,11 +23,8 @@ class ProviderRepository {
     private final Map<String, FeatureProviderStateManager> stateManagers = new ConcurrentHashMap<>();
     private final AtomicReference<FeatureProviderStateManager> defaultStateManger =
             new AtomicReference<>(new FeatureProviderStateManager(new NoOpProvider()));
-    private final ExecutorService taskExecutor = Executors.newCachedThreadPool(runnable -> {
-        final Thread thread = new Thread(runnable);
-        thread.setDaemon(true);
-        return thread;
-    });
+    private final ExecutorService taskExecutor =
+            Executors.newCachedThreadPool(new ConfigurableThreadFactory("openfeature-provider-thread", true));
     private final Object registerStateManagerLock = new Object();
     private final OpenFeatureAPI openFeatureAPI;
 
diff --git a/src/main/java/dev/openfeature/sdk/internal/ConfigurableThreadFactory.java b/src/main/java/dev/openfeature/sdk/internal/ConfigurableThreadFactory.java
@@ -0,0 +1,43 @@
+package dev.openfeature.sdk.internal;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * A configurable thread factory for internal use in the SDK.
+ * Allows daemon or non-daemon threads to be created with a custom name prefix.
+ */
+public final class ConfigurableThreadFactory implements ThreadFactory {
+
+    private final AtomicInteger counter = new AtomicInteger();
+    private final String namePrefix;
+    private final boolean daemon;
+
+    /**
+     * {@link ConfigurableThreadFactory}'s constructor.
+     *
+     * @param namePrefix    Prefix used for setting the new thread's name.
+     */
+    public ConfigurableThreadFactory(String namePrefix) {
+        this(namePrefix, false);
+    }
+
+    /**
+     * {@link ConfigurableThreadFactory}'s constructor.
+     *
+     * @param namePrefix    Prefix used for setting the new thread's name.
+     * @param daemon        Whether daemon or non-daemon threads will be created.
+     */
+    public ConfigurableThreadFactory(String namePrefix, boolean daemon) {
+        this.namePrefix = namePrefix;
+        this.daemon = daemon;
+    }
+
+    @Override
+    public Thread newThread(Runnable runnable) {
+        final Thread thread = new Thread(runnable);
+        thread.setDaemon(daemon);
+        thread.setName(namePrefix + "-" + counter.incrementAndGet());
+        return thread;
+    }
+}
diff --git a/src/test/java/dev/openfeature/sdk/BooleanHookTest.java b/src/test/java/dev/openfeature/sdk/BooleanHookTest.java
@@ -0,0 +1,31 @@
+package dev.openfeature.sdk;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import dev.openfeature.sdk.fixtures.HookFixtures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class BooleanHookTest implements HookFixtures {
+
+    private Hook<Boolean> hook;
+
+    @BeforeEach
+    void setupTest() {
+        hook = mockBooleanHook();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.BOOLEAN);
+
+        assertThat(hookSupported).isTrue();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsNotSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.INTEGER);
+
+        assertThat(hookSupported).isFalse();
+    }
+}
diff --git a/src/test/java/dev/openfeature/sdk/DoubleHookTest.java b/src/test/java/dev/openfeature/sdk/DoubleHookTest.java
@@ -0,0 +1,31 @@
+package dev.openfeature.sdk;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import dev.openfeature.sdk.fixtures.HookFixtures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class DoubleHookTest implements HookFixtures {
+
+    private Hook<Double> hook;
+
+    @BeforeEach
+    void setupTest() {
+        hook = mockDoubleHook();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.DOUBLE);
+
+        assertThat(hookSupported).isTrue();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsNotSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.STRING);
+
+        assertThat(hookSupported).isFalse();
+    }
+}
diff --git a/src/test/java/dev/openfeature/sdk/ImmutableContextTest.java b/src/test/java/dev/openfeature/sdk/ImmutableContextTest.java
@@ -135,6 +135,19 @@ void mergeShouldRetainItsSubkeysWhenOverridingContextHasNoTargetingKey() {
         assertArrayEquals(new Object[] {"key1_1"}, value.keySet().toArray());
     }
 
+    @DisplayName("Merge should obtain keys from the overriding context when the existing context is empty")
+    @Test
+    void mergeShouldObtainKeysFromOverridingContextWhenExistingContextIsEmpty() {
+        HashMap<String, Value> attributes = new HashMap<>();
+        attributes.put("key1", new Value("val1"));
+        attributes.put("key2", new Value("val2"));
+
+        EvaluationContext ctx = new ImmutableContext();
+        EvaluationContext overriding = new ImmutableContext(attributes);
+        EvaluationContext merge = ctx.merge(overriding);
+        assertEquals(new java.util.HashSet<>(java.util.Arrays.asList("key1", "key2")), merge.keySet());
+    }
+
     @DisplayName("Two different MutableContext objects with the different contents are not considered equal")
     @Test
     void unequalImmutableContextsAreNotEqual() {
diff --git a/src/test/java/dev/openfeature/sdk/IntegerHookTest.java b/src/test/java/dev/openfeature/sdk/IntegerHookTest.java
@@ -0,0 +1,31 @@
+package dev.openfeature.sdk;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import dev.openfeature.sdk.fixtures.HookFixtures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class IntegerHookTest implements HookFixtures {
+
+    private Hook<Integer> hook;
+
+    @BeforeEach
+    void setupTest() {
+        hook = mockIntegerHook();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.INTEGER);
+
+        assertThat(hookSupported).isTrue();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsNotSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.STRING);
+
+        assertThat(hookSupported).isFalse();
+    }
+}
diff --git a/src/test/java/dev/openfeature/sdk/ObjectHookTest.java b/src/test/java/dev/openfeature/sdk/ObjectHookTest.java
@@ -0,0 +1,31 @@
+package dev.openfeature.sdk;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import dev.openfeature.sdk.fixtures.HookFixtures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class ObjectHookTest implements HookFixtures {
+
+    private Hook<Object> hook;
+
+    @BeforeEach
+    void setupTest() {
+        hook = mockObjectHook();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.OBJECT);
+
+        assertThat(hookSupported).isTrue();
+    }
+
+    @Test
+    void verifyFlagValueTypeIsNotSupportedByHook() {
+        boolean hookSupported = hook.supportsFlagValueType(FlagValueType.INTEGER);
+
+        assertThat(hookSupported).isFalse();
+    }
+}
diff --git a/src/test/java/dev/openfeature/sdk/StringHookTest.java b/src/test/java/dev/openfeature/sdk/StringHookTest.java
diff --git a/src/test/java/dev/openfeature/sdk/fixtures/HookFixtures.java b/src/test/java/dev/openfeature/sdk/fixtures/HookFixtures.java
diff --git a/src/test/java/dev/openfeature/sdk/internal/ConfigurableThreadFactoryTest.java b/src/test/java/dev/openfeature/sdk/internal/ConfigurableThreadFactoryTest.java
