From e9b38d0a86ccdb5d4fa9ce4012dd66dc38f1ffb5 Mon Sep 17 00:00:00 2001 From: Steven Hawkins Date: Thu, 9 Apr 2026 12:47:47 -0400 Subject: [PATCH] fix: consistently resetting the configuration (#47870) closes: #47869 Signed-off-by: Steve Hawkins --- .../quarkus/deployment/PersistenceXmlDatasourcesTest.java | 6 ++---- .../quarkus/runtime/configuration/Configuration.java | 1 + .../runtime/configuration/KeycloakConfigSourceProvider.java | 2 +- .../java/org/keycloak/quarkus/runtime/cli/PicocliTest.java | 2 -- .../runtime/configuration/AbstractConfigurationTest.java | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java b/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java index 15fb99e8f80..39d1426c117 100644 --- a/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java +++ b/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java @@ -10,7 +10,6 @@ import org.keycloak.Config; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource; import org.keycloak.quarkus.runtime.configuration.Configuration; -import org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider; import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; import io.smallrye.config.SmallRyeConfig; @@ -37,9 +36,9 @@ public class PersistenceXmlDatasourcesTest { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.0"> - + %s - + """; @@ -230,7 +229,6 @@ public class PersistenceXmlDatasourcesTest { // inspired in AbstractConfigurationTest in quarkus/runtime private static SmallRyeConfig createConfig() { Configuration.resetConfig(); - KeycloakConfigSourceProvider.reload(); Environment.getCurrentOrCreateFeatureProfile(); return Configuration.getConfig(); } diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java index ceccb3a7af7..d825f089a17 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java @@ -108,6 +108,7 @@ public final class Configuration { public static void resetConfig() { config = null; + KeycloakConfigSourceProvider.reload(); } /** diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakConfigSourceProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakConfigSourceProvider.java index b9f9b042394..2be2d75921b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakConfigSourceProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakConfigSourceProvider.java @@ -72,7 +72,7 @@ public class KeycloakConfigSourceProvider implements ConfigSourceProvider, Confi /** * For test purposes */ - public static void reload() { + static void reload() { CONFIG_SOURCES.clear(); CONFIG_SOURCE_DISPLAY_NAMES.clear(); } diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java index 1cd15636606..eb4b0102710 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java @@ -38,7 +38,6 @@ import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; import org.keycloak.quarkus.runtime.cli.command.AbstractCommand; import org.keycloak.quarkus.runtime.configuration.AbstractConfigurationTest; import org.keycloak.quarkus.runtime.configuration.Configuration; -import org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider; import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource; import io.smallrye.config.SmallRyeConfig; @@ -109,7 +108,6 @@ public class PicocliTest extends AbstractConfigurationTest { @Override public void initConfig(AbstractCommand command) { - KeycloakConfigSourceProvider.reload(); boolean checkBuild = Environment.isRebuildCheck(); super.initConfig(command); if (!checkBuild && PersistedConfigSource.getInstance().getConfigValueProperties().isEmpty()) { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java index 01bce863b11..46bac7dc3a6 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java @@ -88,7 +88,6 @@ public abstract class AbstractConfigurationTest { static protected SmallRyeConfig createConfig() { Configuration.resetConfig(); - KeycloakConfigSourceProvider.reload(); Environment.getCurrentOrCreateFeatureProfile(); return Configuration.getConfig(); }