From 5ae1712f73645a810ec22b7c1fe450aed4f56172 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Mon, 22 Apr 2024 13:38:46 +0200 Subject: [PATCH] Fixing the condition for remote TLS and username/password (#28950) Closes #28949 Signed-off-by: Alexander Schwartz --- .../runtime/configuration/mappers/CachingPropertyMappers.java | 4 ++-- .../storage/legacy/infinispan/CacheManagerFactory.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java index e8fe37d722..832557d922 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java @@ -6,7 +6,7 @@ import org.keycloak.quarkus.runtime.Environment; import io.smallrye.config.ConfigSourceInterceptorContext; import static java.util.Optional.of; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalValue; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; import java.io.File; @@ -79,7 +79,7 @@ final class CachingPropertyMappers { } private static boolean remoteHostSet() { - return getOptionalValue(CachingOptions.CACHE_REMOTE_HOST_PROPERTY).isPresent(); + return getOptionalKcValue(CachingOptions.CACHE_REMOTE_HOST_PROPERTY).isPresent(); } private static Optional resolveConfigFile(Optional value, ConfigSourceInterceptorContext context) { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java index 2f63124350..b29f0a33d4 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/infinispan/CacheManagerFactory.java @@ -147,8 +147,8 @@ public class CacheManagerFactory { } private static boolean isRemoteAuthenticationEnabled() { - return Configuration.getOptionalValue(CACHE_REMOTE_USERNAME_PROPERTY).isPresent() || - Configuration.getOptionalValue(CACHE_REMOTE_PASSWORD_PROPERTY).isPresent(); + return Configuration.getOptionalKcValue(CACHE_REMOTE_USERNAME_PROPERTY).isPresent() || + Configuration.getOptionalKcValue(CACHE_REMOTE_PASSWORD_PROPERTY).isPresent(); } private static SSLContext createSSLContext() {