SGF-458 - Enable resolution of GemFire's DistributedSystem and System properties to be overridden in PoolFactoryBean.

(cherry picked from commit 10fadc0d9a92d007a7bff85045c5169f2d8797f7)
Signed-off-by: John Blum <jblum@pivotal.io>
This commit is contained in:
John Blum
2016-01-08 15:10:00 -08:00
parent a4bbf2f342
commit a6ab1cf804
2 changed files with 20 additions and 5 deletions

View File

@@ -183,15 +183,30 @@ public class PoolFactoryBean implements FactoryBean<Pool>, 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();

View File

@@ -155,7 +155,7 @@ public class PoolUsingLocatorsAndServersPropertyPlaceholdersTest {
}
@Override
void resolveDistributedSystem() {
protected void resolveDistributedSystem() {
}
}