KeyCloak/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-05-26 13:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: consistently resetting the configuration (#47870)

Browse Source 
closes: #47869

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins
2026-04-09 12:47:47 -04:00
committed by GitHub
parent 74a6109ce3
commit e9b38d0a86
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java
+2 -4
View File
@@ -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
</persistence>
""";
@@ -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();
}
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java
+1
View File
@@ -108,6 +108,7 @@ public final class Configuration {
public static void resetConfig() {
config = null;
KeycloakConfigSourceProvider.reload();
}
/**
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakConfigSourceProvider.java
+1 -1
View File
@@ -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();
}
quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java
-2
View File
@@ -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()) {
quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java
-1
View File
@@ -88,7 +88,6 @@ public abstract class AbstractConfigurationTest {
static protected SmallRyeConfig createConfig() {
Configuration.resetConfig();
KeycloakConfigSourceProvider.reload();
Environment.getCurrentOrCreateFeatureProfile();
return Configuration.getConfig();
}