Skip to content

Commit

Permalink
using concurrent hash map and atomic integer for ids
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
  • Loading branch information
matzew authored and knative-prow-robot committed Nov 6, 2024
1 parent 962717c commit 19f0951
Showing 1 changed file with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
import io.vertx.core.Vertx;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import org.slf4j.Logger;
Expand All @@ -35,15 +36,17 @@ public class OIDCDiscoveryConfigListener implements AutoCloseable {
private final Vertx vertx;
private final FileWatcher configFeaturesWatcher;
private final int timeoutSeconds;
private final CopyOnWriteArrayList<Consumer<OIDCDiscoveryConfig>> callbacks;
private final ConcurrentHashMap<Integer, Consumer<OIDCDiscoveryConfig>> callbacks;
private final AtomicReference<OIDCDiscoveryConfig> oidcDiscoveryConfig;
private final AtomicInteger callbackIdGenerator;

public OIDCDiscoveryConfigListener(String featuresConfigPath, Vertx vertx, int timeoutSeconds) throws IOException {
this.featuresConfigPath = featuresConfigPath;
this.vertx = vertx;
this.timeoutSeconds = timeoutSeconds;
this.oidcDiscoveryConfig = new AtomicReference<>();
this.callbacks = new CopyOnWriteArrayList<>();
this.callbacks = new ConcurrentHashMap<>();
this.callbackIdGenerator = new AtomicInteger(0);

this.buildFeaturesAndOIDCDiscoveryConfig();

Expand All @@ -53,7 +56,7 @@ public OIDCDiscoveryConfigListener(String featuresConfigPath, Vertx vertx, int t
this.buildFeaturesAndOIDCDiscoveryConfig();
OIDCDiscoveryConfig config = this.oidcDiscoveryConfig.get();
if (config != null) {
this.callbacks.forEach(callback -> callback.accept(config));
this.callbacks.values().forEach(callback -> callback.accept(config));
}
}
});
Expand All @@ -66,12 +69,13 @@ public OIDCDiscoveryConfig getOidcDiscoveryConfig() {
}

public int registerCallback(Consumer<OIDCDiscoveryConfig> callback) {
this.callbacks.add(callback);
return this.callbacks.size() - 1;
int id = callbackIdGenerator.incrementAndGet();
this.callbacks.put(id, callback);
return id;
}

public void deregisterCallback(int callbackId) {
this.callbacks.set(callbackId, null);
this.callbacks.remove(callbackId);
}

private void buildOIDCDiscoveryConfig() throws ExecutionException, InterruptedException, TimeoutException {
Expand Down

0 comments on commit 19f0951

Please sign in to comment.