fix: possible race condition with test-provider

Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
open-feature · Sep 27, 2024 · b3164d1 · b3164d1
1 parent 6cdea81
commit b3164d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/...re/src/main/java/dev/openfeature/contrib/tools/junitopenfeature/OpenFeatureExtension.java b/...re/src/main/java/dev/openfeature/contrib/tools/junitopenfeature/OpenFeatureExtension.java
@@ -119,7 +119,7 @@ public void beforeEach(ExtensionContext extensionContext) throws Exception {
                     ((TestProvider) api.getProvider(domain))
                             .addConfigurationForTest(getNamespace(extensionContext), stringMapEntry.getValue());
                 } else {
-                    api.setProvider(domain, new TestProvider(
+                    api.setProviderAndWait(domain, new TestProvider(
                             getNamespace(extensionContext),
                             stringMapEntry.getValue()));
                 }
@@ -128,7 +128,7 @@ public void beforeEach(ExtensionContext extensionContext) throws Exception {
                     ((TestProvider) api.getProvider())
                             .addConfigurationForTest(getNamespace(extensionContext), stringMapEntry.getValue());
                 } else {
-                    api.setProvider(new TestProvider(
+                    api.setProviderAndWait(new TestProvider(
                             getNamespace(extensionContext),
                             stringMapEntry.getValue()));
                 }

diff --git a/...penfeature/src/main/java/dev/openfeature/contrib/tools/junitopenfeature/TestProvider.java b/...penfeature/src/main/java/dev/openfeature/contrib/tools/junitopenfeature/TestProvider.java
@@ -1,21 +1,21 @@
 package dev.openfeature.contrib.tools.junitopenfeature;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+
 import dev.openfeature.sdk.EvaluationContext;
 import dev.openfeature.sdk.EventProvider;
 import dev.openfeature.sdk.ImmutableContext;
 import dev.openfeature.sdk.Metadata;
 import dev.openfeature.sdk.ProviderEvaluation;
-import dev.openfeature.sdk.ProviderState;
 import dev.openfeature.sdk.Value;
 import dev.openfeature.sdk.providers.memory.Flag;
 import dev.openfeature.sdk.providers.memory.InMemoryProvider;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * TestProvider based on InMemoryProvider but with another dimension added to the maps of flags.
@@ -102,23 +102,6 @@ public ProviderEvaluation<Value> getObjectEvaluation(String key, Value defaultVa
                 .getObjectEvaluation(key, defaultValue, evaluationContext);
     }
 
-    @Override
-    public ProviderState getState() {
-        return providerMap
-                .values()
-                .stream()
-                .map(InMemoryProvider::getState)
-                .reduce(
-                        (providerState, providerState2) -> {
-                            if (providerState.ordinal() < providerState2.ordinal()) {
-                                return providerState2;
-                            }
-                            return providerState;
-                        }
-                )
-                .orElse(ProviderState.READY);
-    }
-
     public static void setCurrentNamespace(ExtensionContext.Namespace namespace) {
         CURRENT_NAMESPACE.set(namespace);
     }