Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions core/src/main/java/dev/faststats/SimpleFeatureFlagService.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,15 @@ final class SimpleFeatureFlagService extends SubmissionService implements Featur

@SuppressWarnings("unchecked")
<T> CompletableFuture<T> fetch(final SimpleFeatureFlag<T> flag) {
return (CompletableFuture<T>) fetchesInProgress.computeIfAbsent(flag.getId(), ignored -> createFetch(flag));
final var future = new CompletableFuture<T>();
final var existing = fetchesInProgress.putIfAbsent(flag.getId(), future);
if (existing != null) return (CompletableFuture<T>) existing;
createFetch(flag).whenComplete((value, throwable) -> {
fetchesInProgress.remove(flag.getId(), future);
if (throwable != null) future.completeExceptionally(throwable);
else future.complete(value);
});
return future;
}

<T> CompletableFuture<T> optIn(final SimpleFeatureFlag<T> flag) {
Expand All @@ -72,8 +80,7 @@ private <T> CompletableFuture<T> createFetch(final SimpleFeatureFlag<T> flag) {
final var request = createRequest(CHECK_PATH, requestBody);
logger.info("Fetching %s: %s", request.uri(), requestBody.toString());
return HTTP_CLIENT.sendAsync(request, HttpResponse.BodyHandlers.ofString())
.thenApply(response -> handleFetchResponse(flag, response))
.whenComplete((ignored, throwable) -> fetchesInProgress.remove(flag.getId()));
.thenApply(response -> handleFetchResponse(flag, response));
}

private JsonObject createRequestBody(final SimpleFeatureFlag<?> flag) {
Expand Down
4 changes: 1 addition & 3 deletions core/src/test/java/dev/faststats/FeatureFlagTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,7 @@ private void handle(final Socket client) {
}

final var body = new String(bodyChars, 0, read);
final var e = new Request(path, headers, body.isEmpty() ? new JsonObject() : JsonParser.parseString(body).getAsJsonObject());
System.out.println("parsed body: " + body + ", " + e.body);
requests.add(e);
requests.add(new Request(path, headers, body.isEmpty() ? new JsonObject() : JsonParser.parseString(body).getAsJsonObject()));

final var response = responses.poll(1, TimeUnit.SECONDS);
if (response == null) throw new AssertionError("No response enqueued");
Expand Down
Loading