Remove use of the org.apache.geode.distributed.internal.DistributionC…

…onfig class to refer to the 'gemfire.' property prefix. Resolves spring-projectsgh-70.
jxblum · Feb 22, 2020 · d9a9b7d · d9a9b7d
1 parent 295975e
commit d9a9b7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeConstants.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/GeodeConstants.java
@@ -26,6 +26,8 @@
  */
 public abstract class GeodeConstants {
 
+	public static final String GEMFIRE_PROPERTY_PREFIX = DistributionConfig.GEMFIRE_PREFIX;
+
 	// Logging Constants (referring to Properties)
 	public static final String LOG_DISK_SPACE_LIMIT = DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME;
 	public static final String LOG_FILE = DistributionConfig.LOG_FILE_NAME;

diff --git a/...de/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java b/...de/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java
@@ -32,7 +32,6 @@
 
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
-import org.apache.geode.distributed.internal.DistributionConfig;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -53,6 +52,7 @@
 import org.springframework.data.gemfire.config.annotation.EnableManager;
 import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport;
 import org.springframework.geode.security.TestSecurityManager;
+import org.springframework.geode.util.GeodeConstants;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -170,7 +170,7 @@ ClientHttpRequestInterceptor testRedirectingClientHttpRequestInterceptor() {
 	@EnableManager(start = true)
 	static class GeodeServerConfiguration {
 
-		private static final String GEODE_HOME_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "home";
+		private static final String GEODE_HOME_PROPERTY = GeodeConstants.GEMFIRE_PROPERTY_PREFIX + "home";
 
 		public static void main(String[] args) throws IOException {