From 5d1dcb4b447d9df71acb932a88e2daa883df685d Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 28 May 2018 19:16:23 -0700 Subject: [PATCH] Use 'spring.boot.data.gemfire.*' prefix for all Spring Boot Data GemFire/Geode configuration properties. --- .../data/geode/autoconfigure/SecurityAutoConfiguration.java | 2 +- .../boot/data/geode/autoconfigure/SslAutoConfiguration.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SecurityAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SecurityAutoConfiguration.java index da40e0ec..80b573d0 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SecurityAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SecurityAutoConfiguration.java @@ -70,7 +70,7 @@ import org.springframework.data.gemfire.config.annotation.support.AutoConfigured public class SecurityAutoConfiguration { public static final String SECURITY_CLOUD_ENVIRONMENT_POST_PROCESSOR_DISABLED_PROPERTY = - "spring.boot.data.geode.security.auth.environment.post-processor.disabled"; + "spring.boot.data.gemfire.security.auth.environment.post-processor.disabled"; private static final String CLOUD_CACHE_PROPERTY_SOURCE_NAME = "cloudcache-security"; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java index 8c50ad83..fa401dd8 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java @@ -85,7 +85,7 @@ import org.springframework.util.StringUtils; public class SslAutoConfiguration { public static final String SECURITY_SSL_ENVIRONMENT_POST_PROCESSOR_DISABLED_PROPERTY = - "spring.boot.data.geode.security.ssl.environment.post-processor.disabled"; + "spring.boot.data.gemfire.security.ssl.environment.post-processor.disabled"; private static final String CURRENT_WORKING_DIRECTORY = System.getProperty("user.dir"); private static final String GEMFIRE_SSL_KEYSTORE_PROPERTY = "gemfire.ssl-keystore"; @@ -96,7 +96,7 @@ public class SslAutoConfiguration { private static final String SSL_KEYSTORE_PROPERTY = "ssl-keystore"; private static final String SSL_TRUSTSTORE_PROPERTY = "ssl-truststore"; private static final String TRUSTED_KEYSTORE_FILENAME = "trusted.keystore"; - private static final String TRUSTED_KEYSTORE_FILENAME_PROPERTY = "spring.data.gemfire.security.ssl.keystore.name"; + private static final String TRUSTED_KEYSTORE_FILENAME_PROPERTY = "spring.boot.data.gemfire.security.ssl.keystore.name"; private static final String USER_HOME_DIRECTORY = System.getProperty("user.home"); private static final Logger logger = LoggerFactory.getLogger(SslAutoConfiguration.class);