Avoid possible concurrency issues with RestClientsConfig.RestClientKe…

…ysProvider.KEYS in build time
quarkusio · Nov 6, 2024 · c992add · c992add
1 parent e124f18
commit c992add
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...g/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java b/...g/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java
@@ -53,17 +53,29 @@
 public abstract class AbstractRestClientConfigBuilder implements ConfigBuilder {
     private static final String REST_CLIENT_PREFIX = "quarkus.rest-client.";
 
+    private final boolean runtime;
+
+    public AbstractRestClientConfigBuilder() {
+        this.runtime = true;
+        RestClientsConfig.RestClientKeysProvider.KEYS.clear();
+    }
+
+    public AbstractRestClientConfigBuilder(boolean runtime) {
+        this.runtime = runtime;
+    }
+
     @Override
     public SmallRyeConfigBuilder configBuilder(final SmallRyeConfigBuilder builder) {
-        RestClientsConfig.RestClientKeysProvider.KEYS.clear();
         List<RegisteredRestClient> restClients = getRestClients();
 
         Map<String, String> quarkusFallbacks = new HashMap<>();
         Map<String, String> microProfileFallbacks = new HashMap<>();
         // relocates [All Combinations] -> quarkus.rest-client."FQN".*
         Map<String, String> relocates = new HashMap<>();
         for (RegisteredRestClient restClient : restClients) {
-            RestClientsConfig.RestClientKeysProvider.KEYS.add(restClient.getFullName());
+            if (runtime) {
+                RestClientsConfig.RestClientKeysProvider.KEYS.add(restClient.getFullName());
+            }
 
             // FQN -> Simple Name
             String quotedFullName = "\"" + restClient.getFullName() + "\"";

diff --git a/...config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsBuildTimeConfig.java b/...config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsBuildTimeConfig.java
@@ -143,7 +143,7 @@ private ConfigSource getDefaultsSource() {
                 .withCustomizers(new SmallRyeConfigBuilderCustomizer() {
                     @Override
                     public void configBuilder(final SmallRyeConfigBuilder builder) {
-                        new AbstractRestClientConfigBuilder() {
+                        new AbstractRestClientConfigBuilder(false) {
                             @Override
                             public List<RegisteredRestClient> getRestClients() {
                                 return restClients;