Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-121 - Fixed issue with data-policy

Browse Source
This commit is contained in:
David Turanski
2012-08-29 12:08:23 -04:00
parent b7ee809ecc
commit bf2c68f9b6
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
View File

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.core.io.Resource;
import org.springframework.data.gemfire.DataPolicyConverter;
import org.springframework.data.gemfire.RegionLookupFactoryBean;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
@@ -75,6 +76,8 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
private String diskStoreName;
private String dataPolicyName;
@Override
public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
@@ -90,6 +93,14 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
if (cache instanceof GemFireCacheImpl) {
Assert.isTrue(((GemFireCacheImpl) cache).isClient(), "A client-cache instance is required");
}
Assert.isTrue(!(StringUtils.hasText(dataPolicyName) && dataPolicy != null), "Only one of 'dataPolicy' or 'dataPolicyName' can be set");
if (StringUtils.hasText(dataPolicyName)) {
dataPolicy = new DataPolicyConverter().convert(dataPolicyName);
Assert.notNull(dataPolicy, "Data policy " + dataPolicyName + " is invalid");
}
// first look at shortcut
ClientRegionShortcut s = null;
@@ -349,6 +360,16 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
public void setDataPolicy(DataPolicy dataPolicy) {
this.dataPolicy = dataPolicy;
}
/**
* An alternative way to set the data policy as a string. Useful for
* property placeholders, etc.
*
* @param dataPolicyName
*/
public void setDataPolicyName(String dataPolicyName) {
this.dataPolicyName = dataPolicyName;
}
/**
* Sets the name of disk store to use for overflow and persistence

8
src/main/java/org/springframework/data/gemfire/config/ClientRegionParser.java
View File

@@ -55,10 +55,10 @@ class ClientRegionParser extends AliasReplacingBeanDefinitionParser {
// setting the cache/DS to a be 'loner' isn't feasible
// so to prevent both client and p2p communication in the region,
// the scope is fixed to local
ParsingUtils.setPropertyValue(element, builder, "data-policy", "dataPolicy");
ParsingUtils.setPropertyValue(element, builder, "name", "name");
ParsingUtils.setPropertyValue(element, builder, "pool-name", "poolName");
ParsingUtils.setPropertyValue(element, builder, "shortcut", "shortcut");
ParsingUtils.setPropertyValue(element, builder, "data-policy", "dataPolicyName");
ParsingUtils.setPropertyValue(element, builder, "name");
ParsingUtils.setPropertyValue(element, builder, "pool-name");
ParsingUtils.setPropertyValue(element, builder, "shortcut");
// set the persistent policy
String attr = element.getAttribute("persistent");