chore: Use setProviderAndWait now that it is available

Signed-off-by: Thomas Poignant <[email protected]>
thomaspoignant · Sep 24, 2024 · 1aa9b68 · 1aa9b68
1 parent cb8350e
commit 1aa9b68
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/...ava-integration-tests/src/test/java/org/gofeatureflag/integrationtests/ProviderTests.java b/...ava-integration-tests/src/test/java/org/gofeatureflag/integrationtests/ProviderTests.java
@@ -45,10 +45,9 @@ void init() throws InvalidOptions, ExecutionException, InterruptedException {
 
  GoFeatureFlagProviderOptions options = GoFeatureFlagProviderOptions.builder().endpoint(relayProxyEndpoint).build();
  GoFeatureFlagProvider provider = new GoFeatureFlagProvider(options);
- OpenFeatureAPI.getInstance().setProvider(provider);
+ OpenFeatureAPI.getInstance().setProviderAndWait(provider);
  OpenFeatureAPI api = OpenFeatureAPI.getInstance();
  goffClient = api.getClient();
- this.waitProviderReady();
  }
 
  @AfterEach
@@ -333,10 +332,9 @@ void authenticatedRelayProxyValid() throws InvalidOptions, ExecutionException, I
  GoFeatureFlagProviderOptions options = GoFeatureFlagProviderOptions.builder()
  .apiKey("authorized_token").endpoint(relayProxyAuthenticatedEndpoint).build();
  GoFeatureFlagProvider provider = new GoFeatureFlagProvider(options);
- OpenFeatureAPI.getInstance().setProvider(provider);
+ OpenFeatureAPI.getInstance().setProviderAndWait(provider);
  OpenFeatureAPI api = OpenFeatureAPI.getInstance();
  goffClient = api.getClient();
- this.waitProviderReady();
 
  String flagKey = "bool_targeting_match";
  FlagEvaluationDetails expected = FlagEvaluationDetails.builder()
@@ -356,10 +354,9 @@ void authenticatedRelayProxyEmptyToken() throws InvalidOptions, ExecutionExcepti
  GoFeatureFlagProviderOptions options = GoFeatureFlagProviderOptions.builder()
  .apiKey("").endpoint(relayProxyAuthenticatedEndpoint).build();
  GoFeatureFlagProvider provider = new GoFeatureFlagProvider(options);
- OpenFeatureAPI.getInstance().setProvider(provider);
+ OpenFeatureAPI.getInstance().setProviderAndWait(provider);
  OpenFeatureAPI api = OpenFeatureAPI.getInstance();
  goffClient = api.getClient();
- this.waitProviderReady();
 
  String flagKey = "bool_targeting_match";
  FlagEvaluationDetails expected = FlagEvaluationDetails.builder()
@@ -379,10 +376,9 @@ void authenticatedRelayProxyInvalidToken() throws InvalidOptions, ExecutionExcep
  GoFeatureFlagProviderOptions options = GoFeatureFlagProviderOptions.builder()
  .apiKey("invalid-api-key").endpoint(relayProxyAuthenticatedEndpoint).build();
  GoFeatureFlagProvider provider = new GoFeatureFlagProvider(options);
- OpenFeatureAPI.getInstance().setProvider(provider);
+ OpenFeatureAPI.getInstance().setProviderAndWait(provider);
  OpenFeatureAPI api = OpenFeatureAPI.getInstance();
  goffClient = api.getClient();
- this.waitProviderReady();
 
  String flagKey = "bool_targeting_match";
  FlagEvaluationDetails expected = FlagEvaluationDetails.builder()
@@ -394,17 +390,6 @@ void authenticatedRelayProxyInvalidToken() throws InvalidOptions, ExecutionExcep
  FlagEvaluationDetails<Boolean> got = goffClient.getBooleanDetails(flagKey, false, defaultEvaluationContext);
  assertEquals(expected, got);
  }
-
- private void waitProviderReady() throws ExecutionException, InterruptedException {
- CompletableFuture<EventDetails> completableFuture = new CompletableFuture<>();
- OpenFeatureAPI.getInstance().onProviderReady(new Consumer<EventDetails>() {
- @Override
- public void accept(EventDetails eventDetails) {
- completableFuture.complete(eventDetails);
- }
- });
- completableFuture.get();
- }
 }