🐛 Fix RedisAutoConfig Exclusion logic to exclude if redis session… (#…

…10728) * 🐛 Fix RedisAutoConfig Exclusion logic to exclude if redis session host is set * Update property to be spring.session.store-type
cBioPortal · Apr 1, 2024 · 8361b0a · 8361b0a
1 parent 14e00a6
commit 8361b0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/cbioportal/security/config/AutoconfigureExcludeConfig.java b/src/main/java/org/cbioportal/security/config/AutoconfigureExcludeConfig.java
@@ -27,9 +27,11 @@ public static class Saml {}
     @ConditionalOnProperty(name = "authenticate", havingValue = "oauth2")
     @EnableAutoConfiguration(exclude=Saml2RelyingPartyAutoConfiguration.class)
     public static class OAuth2 {}
-    
+
     @Configuration
-    @ConditionalOnProperty(name = "persistence.cache_type", havingValue = "redis", isNot = true)
+    @ConditionalOnExpression(
+        "T(org.apache.commons.lang3.StringUtils).isEmpty('${spring.session.store-type:}')"
+    )
     @EnableAutoConfiguration(exclude=RedisAutoConfiguration.class)
     public static class Redis {}
 

diff --git a/src/main/resources/application.properties.EXAMPLE b/src/main/resources/application.properties.EXAMPLE
@@ -397,8 +397,6 @@ logging.level.root=INFO
 
 ## Redis HTTP Session Store
 # Redis Session
-## Comment out the line below to enable redis caching
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration
 #spring.data.redis.host=localhost
 #spring.data.redis.port=6379