refactored Cachefactory bean to work with Gemfire 6 and some enhancements to region data policy validation

src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java

@@ -134,7 +134,7 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 			}
 
 			if (gatewayConflictResolver != null) {
-				cacheImpl.setGatewayConflictResolver(gatewayConflictResolver);
+				cacheImpl.setGatewayConflictResolver((GatewayConflictResolver) gatewayConflictResolver);
 			}
 		}
 	}
@@ -267,7 +267,8 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 
 	protected List<Function> functions;
 
-	protected GatewayConflictResolver gatewayConflictResolver;
+	// Defined this way for backward compatibility
+	protected Object gatewayConflictResolver;
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
@@ -632,7 +633,12 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 		this.functions = functions;
 	}
 
-	public void setGatewayConflictResolver(GatewayConflictResolver gatewayConflictResolver) {
+	/**
+	 * 
+	 * @param gatewayConflictResolver defined as Object for backward
+	 * compatibility with Gemfire 6 compatibility
+	 */
+	public void setGatewayConflictResolver(Object gatewayConflictResolver) {
 		this.gatewayConflictResolver = gatewayConflictResolver;
 	}
 

src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.gemfire;
+
+import org.springframework.core.convert.converter.Converter;
+
+import com.gemstone.gemfire.cache.DataPolicy;
+
+/**
+ * @author David Turanski
+ * 
+ */
+public class DataPolicyConverter implements Converter<String, DataPolicy> {
+	private static enum Policy {
+		EMPTY, DEFAULT, NORMAL, PERSISTENT_PARTITION, PERSISTENT_REPLICATE, PRELOADED, REPLICATE;
+		public DataPolicy toDataPolicy() {
+			DataPolicy dataPolicy = null;
+			switch (this) {
+			case EMPTY:
+				dataPolicy = DataPolicy.EMPTY;
+				break;
+			case DEFAULT:
+				dataPolicy = DataPolicy.DEFAULT;
+				break;
+			case NORMAL:
+				dataPolicy = DataPolicy.NORMAL;
+				break;
+			case PERSISTENT_PARTITION:
+				dataPolicy = DataPolicy.PERSISTENT_PARTITION;
+				break;
+			case PERSISTENT_REPLICATE:
+				dataPolicy = DataPolicy.PERSISTENT_REPLICATE;
+				break;
+			case PRELOADED:
+				dataPolicy = DataPolicy.PRELOADED;
+				break;
+			case REPLICATE:
+				dataPolicy = DataPolicy.REPLICATE;
+				break;
+			}
+			return dataPolicy;
+		}
+
+		public static Policy getValue(String value) {
+			Policy policy = null;
+			try {
+				policy = valueOf(value);
+			}
+			catch (Exception e) {
+			}
+			return policy;
+		}
+	};
+
+	@Override
+	public DataPolicy convert(String source) {
+		if (source == null) {
+			return null;
+		}
+		source = source.toUpperCase();
+		return Policy.getValue(source) == null ? null : Policy.getValue(source).toDataPolicy();
+	}
+
+}

src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java

@@ -17,27 +17,44 @@ package org.springframework.data.gemfire;
 
 import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.Scope;
 
 /**
  * @author David Turanski
  * 
  */
 public class LocalRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
+	@Override
+	public void setScope(Scope scope) {
+		throw new UnsupportedOperationException("setScope() is not allowed for Local Regions");
+	}
 
 	@Override
-	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent, String dataPolicyName) {
-		if (dataPolicyName != null) {
-			if ("NORMAL".equals(dataPolicyName) || dataPolicyName == null) {
+	public void setPersistent(boolean persistent) {
+		throw new UnsupportedOperationException("setPersistent() is not allowed for Local Regions");
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		super.setScope(Scope.LOCAL);
+		super.afterPropertiesSet();
+	}
+
+	@Override
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, String dataPolicy) {
+		if (dataPolicy != null) {
+			dataPolicy = dataPolicy.toUpperCase();
+			if ("NORMAL".equals(dataPolicy) || dataPolicy == null) {
 				regionFactory.setDataPolicy(DataPolicy.NORMAL);
 			}
-			else if ("PRELOADED".equals(dataPolicyName)) {
+			else if ("PRELOADED".equals(dataPolicy)) {
 				regionFactory.setDataPolicy(DataPolicy.PRELOADED);
 			}
-			else if ("EMPTY".equals(dataPolicyName)) {
+			else if ("EMPTY".equals(dataPolicy)) {
 				regionFactory.setDataPolicy(DataPolicy.EMPTY);
 			}
 			else {
-				throw new IllegalArgumentException("Data policy '" + dataPolicyName
+				throw new IllegalArgumentException("Data policy '" + dataPolicy
 						+ "' is unsupported or invalid for local regions.");
 			}
 		}

src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java

@@ -17,6 +17,8 @@ package org.springframework.data.gemfire;
 
 import java.util.concurrent.ConcurrentMap;
 
+import org.springframework.util.Assert;
+
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Region;
@@ -29,8 +31,23 @@ import com.gemstone.gemfire.cache.RegionFactory;
 public class PartitionedRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
 
 	@Override
-	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent, String dataPolicyName) {
-		if (persistent) {
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, String dataPolicy) {
+		if (dataPolicy != null) {
+			DataPolicy dp = new DataPolicyConverter().convert(dataPolicy);
+			Assert.notNull(dp, "Data policy " + dataPolicy + " is invalid");
+			Assert.isTrue(dp.withPartitioning(), "Data Policy " + dp.toString()
+					+ " is not supported in partitioned regions");
+			if (!isPersistent()) {
+				regionFactory.setDataPolicy(dp);
+			}
+			else {
+				Assert.isTrue(dp.withPersistence(), "Data Policy " + dp.toString()
+						+ "is invalid when persistent is false");
+				regionFactory.setDataPolicy(dp);
+			}
+			return;
+		}
+		if (isPersistent()) {
 			// check first for GemFire 6.5
 			if (ConcurrentMap.class.isAssignableFrom(Region.class)) {
 				regionFactory.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);

src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java

@@ -34,6 +34,7 @@ import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheListener;
 import com.gemstone.gemfire.cache.CacheLoader;
 import com.gemstone.gemfire.cache.CacheWriter;
+import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.GemFireCache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
@@ -54,7 +55,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender;
  * @author Costin Leau
  * @author David Turanski
  */
-public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> implements DisposableBean {
+public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> implements DisposableBean {
 
 	protected final Log log = LogFactory.getLog(getClass());
 
@@ -70,15 +71,15 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 
 	private CacheWriter<K, V> cacheWriter;
 
-	private GatewaySender gatewaySenders[];
+	private Object gatewaySenders[];
 
-	private AsyncEventQueue asyncEventQueues[];
+	private Object asyncEventQueues[];
 
 	private RegionAttributes<K, V> attributes;
 
 	private Scope scope;
 
-	private boolean persistent;
+	private Boolean persistent;
 
 	private Boolean enableGateway;
 
@@ -86,7 +87,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 
 	private String diskStoreName;
 
-	private String dataPolicyName;
+	private String dataPolicy;
 
 	private Region<K, V> region;
 
@@ -131,14 +132,14 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 			Assert.isTrue(
 					hubId == null,
 					"It is invalid to configure a region with both a hubId and gatewaySenders. Note that the enableGateway and hubId properties are deprecated since Gemfire 7.0");
-			for (GatewaySender gatewaySender : gatewaySenders) {
-				regionFactory.addGatewaySender(gatewaySender);
+			for (Object gatewaySender : gatewaySenders) {
+				regionFactory.addGatewaySender((GatewaySender) gatewaySender);
 			}
 		}
 
 		if (!ObjectUtils.isEmpty(asyncEventQueues)) {
-			for (AsyncEventQueue asyncEventQueue : asyncEventQueues) {
-				regionFactory.addAsyncEventQueue(asyncEventQueue);
+			for (Object asyncEventQueue : asyncEventQueues) {
+				regionFactory.addAsyncEventQueue((AsyncEventQueue) asyncEventQueue);
 			}
 		}
 
@@ -150,7 +151,7 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 			regionFactory.setCacheWriter(cacheWriter);
 		}
 
-		resolveDataPolicy(regionFactory, persistent, dataPolicyName);
+		resolveDataPolicy(regionFactory, persistent, dataPolicy);
 
 		if (scope != null) {
 			regionFactory.setScope(scope);
@@ -180,8 +181,31 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 		return reg;
 	}
 
-	protected abstract void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent,
-			String dataPolicyName);
+	/**
+	 * This validates the configured data policy and may override it, taking
+	 * into account the persistent attribute and constraints for the region type
+	 * @param regionFactory
+	 * @param persistent
+	 * @param dataPolicy requested data policy
+	 */
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, String dataPolicy) {
+		if (dataPolicy == null) {
+			if (isPersistent()) {
+				regionFactory.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
+			}
+			else {
+				regionFactory.setDataPolicy(DataPolicy.DEFAULT);
+			}
+			return;
+		}
+
+		DataPolicy dp = new DataPolicyConverter().convert(dataPolicy);
+		Assert.notNull(dp, "Data policy " + dataPolicy + " is invalid");
+		if (dp.withPersistence()) {
+			Assert.isTrue(!isNotPersistent(), "Data policy " + dataPolicy + " is invalid when persistent is false");
+		}
+		regionFactory.setDataPolicy(dp);
+	}
 
 	@SuppressWarnings("unchecked")
 	private AttributesFactory<K, V> findAttrFactory(RegionFactory<K, V> regionFactory) {
@@ -330,10 +354,10 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 	/**
 	 * Sets the dataPolicy as a String. Required to support property
 	 * placeholders
-	 * @param dataPolicyName the dataPolicy name (NORMAL, PRELOADED, etc)
+	 * @param dataPolicy the dataPolicy name (NORMAL, PRELOADED, etc)
 	 */
-	public void setDataPolicyName(String dataPolicyName) {
-		this.dataPolicyName = dataPolicyName;
+	public void setDataPolicy(String dataPolicyName) {
+		this.dataPolicy = dataPolicyName;
 	}
 
 	/**
@@ -344,11 +368,21 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 		this.diskStoreName = diskStoreName;
 	}
 
-	public void setGatewaySenders(GatewaySender[] gatewaySenders) {
+	/**
+	 * 
+	 * @param gatewaySenders defined as Object for backward compatibility with
+	 * Gemfire 6
+	 */
+	public void setGatewaySenders(Object[] gatewaySenders) {
 		this.gatewaySenders = gatewaySenders;
 	}
 
-	public void setAsyncEventQueues(AsyncEventQueue[] asyncEventQueues) {
+	/**
+	 * 
+	 * @param asyncEventQueues defined as Object for backward compatibility with
+	 * Gemfire 6
+	 */
+	public void setAsyncEventQueues(Object[] asyncEventQueues) {
 		this.asyncEventQueues = asyncEventQueues;
 	}
 
@@ -370,4 +404,12 @@ public abstract class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K,
 	public void setAttributes(RegionAttributes<K, V> attributes) {
 		this.attributes = attributes;
 	}
+
+	protected boolean isPersistent() {
+		return persistent != null && persistent;
+	}
+
+	protected boolean isNotPersistent() {
+		return persistent != null && !persistent;
+	}
 }

src/main/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBean.java

@@ -26,22 +26,28 @@ import com.gemstone.gemfire.cache.RegionFactory;
  */
 public class ReplicatedRegionFactoryBean<K, V> extends RegionFactoryBean<K, V> {
 	@Override
-	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, boolean persistent, String dataPolicyName) {
-
-		DataPolicy dataPolicy = null;
-		if (dataPolicyName != null) {
-			if ("EMPTY".equals(dataPolicyName)) {
-				Assert.isTrue(!persistent, "Cannot have persistence on an empty region");
-				dataPolicy = DataPolicy.EMPTY;
+	protected void resolveDataPolicy(RegionFactory<K, V> regionFactory, Boolean persistent, String dataPolicy) {
+		DataPolicy dp = null;
+		if (dataPolicy != null) {
+			dataPolicy = dataPolicy.toUpperCase();
+			if ("EMPTY".equals(dataPolicy)) {
+				Assert.isTrue(persistent == null || !persistent, "Cannot have persistence on an empty region");
+				dp = DataPolicy.EMPTY;
 			}
 			else {
-				throw new IllegalArgumentException("Data policy '" + dataPolicyName
-						+ "' is unsupported or invalid for replicated regions.");
+				dp = new DataPolicyConverter().convert(dataPolicy);
+				Assert.notNull(dp, "Data policy " + dataPolicy + " is invalid");
+				Assert.isTrue(dp.withReplication(), "Data policy " + dataPolicy
+						+ " is invalid or unsupported in replicated regions");
+				if (isPersistent()) {
+					Assert.isTrue(dp.withPersistence(), "Data policy " + dataPolicy
+							+ " is invalid when persistent is false");
+				}
 			}
 		}
 		else {
-			dataPolicy = persistent ? DataPolicy.PERSISTENT_REPLICATE : DataPolicy.REPLICATE;
+			dp = (isPersistent()) ? DataPolicy.PERSISTENT_REPLICATE : DataPolicy.REPLICATE;
 		}
-		regionFactory.setDataPolicy(dataPolicy);
+		regionFactory.setDataPolicy(dp);
 	}
 }

src/main/java/org/springframework/data/gemfire/config/AbstractRegionParser.java

@@ -108,7 +108,7 @@ abstract class AbstractRegionParser extends AliasReplacingBeanDefinitionParser {
 			ParsingUtils.setPropertyValue(element, builder, "persistent");
 		}
 		// set the data policy
-		ParsingUtils.setPropertyValue(element, builder, "data-policy", "dataPolicyName");
+		ParsingUtils.setPropertyValue(element, builder, "data-policy");
 
 		if (StringUtils.hasText(element.getAttribute("disk-store-ref"))) {
 			ParsingUtils.setPropertyValue(element, builder, "disk-store-ref", "diskStoreName");

src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java

@@ -22,12 +22,9 @@ import org.springframework.data.gemfire.LocalRegionFactoryBean;
 import org.springframework.data.gemfire.RegionAttributesFactoryBean;
 import org.w3c.dom.Element;
 
-import com.gemstone.gemfire.cache.Scope;
-
 /**
- * Parser for <replicated-region;gt; definitions.
+ * Parser for <local-region;gt; definitions.
  * 
- * @author Costin Leau
  * @author David Turanski
  */
 class LocalRegionParser extends AbstractRegionParser {
@@ -35,8 +32,6 @@ class LocalRegionParser extends AbstractRegionParser {
 	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
 			boolean subRegion) {
 
-		builder.addPropertyValue("scope", Scope.LOCAL);
-
 		BeanDefinitionBuilder attrBuilder = subRegion ? builder : BeanDefinitionBuilder
 				.genericBeanDefinition(RegionAttributesFactoryBean.class);