diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java index ff1f5c22..fa43de2f 100644 --- a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java @@ -183,15 +183,30 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis return PoolManager.createFactory(); } - /* (non-Javadoc) */ - void resolveDistributedSystem() { + /** + * Attempts to find an existing, running GemFire {@link DistributedSystem} or proceeds to create + * a new {@link DistributedSystem} if one does not exist. + * + * @see DistributedSystemUtils#getDistributedSystem() + * @see #resolveGemfireProperties() + * @see #doDistributedSystemConnect(Properties) + */ + protected void resolveDistributedSystem() { if (DistributedSystemUtils.isNotConnected(DistributedSystemUtils.getDistributedSystem())) { doDistributedSystemConnect(resolveGemfireProperties()); } } - /* (non-Javadoc) */ - Properties resolveGemfireProperties() { + /** + * Attempts to resolve existing GemFire System properties from the {@link ClientCacheFactoryBean} + * if set by the user. + * + * @return a {@link Properties} object containing GemFire System properties + * or null if no properties were configured. + * @see ClientCacheFactoryBean#resolveProperties() + * @see java.util.Properties + */ + protected Properties resolveGemfireProperties() { try { ClientCacheFactoryBean clientCacheFactoryBean = beanFactory.getBean(ClientCacheFactoryBean.class); return clientCacheFactoryBean.resolveProperties(); diff --git a/src/test/java/org/springframework/data/gemfire/client/PoolUsingLocatorsAndServersPropertyPlaceholdersTest.java b/src/test/java/org/springframework/data/gemfire/client/PoolUsingLocatorsAndServersPropertyPlaceholdersTest.java index 54e54372..4ebdf71c 100644 --- a/src/test/java/org/springframework/data/gemfire/client/PoolUsingLocatorsAndServersPropertyPlaceholdersTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/PoolUsingLocatorsAndServersPropertyPlaceholdersTest.java @@ -155,7 +155,7 @@ public class PoolUsingLocatorsAndServersPropertyPlaceholdersTest { } @Override - void resolveDistributedSystem() { + protected void resolveDistributedSystem() { } }