From d540500f493fec8b7e474a7ebffe42beb23ddf54 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@gopivotal.com>
Date: Mon, 7 Jul 2014 13:07:51 -0700
Subject: [PATCH] Fixes JIRA issue SGF-295 allowing all Eviction Policy Actions
 (LOCAL_DESTROY, OVERFLOW_TO_DISK) to be specified on Local Regions configured
 using the Spring Data GemFire XML namespace.  This commit resolves the issue
 in the 1.4 XSD first in order to backport the fix to the SDG 1.4.2 release.

---
 .../gemfire/config/LocalRegionParser.java     |  4 +-
 .../gemfire/config/spring-gemfire-1.4.xsd     |  3 +-
 ...WithEvictionPolicyActionNamespaceTest.java | 97 +++++++++++++++++++
 .../data/gemfire/test/MockRegionFactory.java  |  2 +-
 ...ctionPolicyActionNamespaceTest-context.xml | 22 +++++
 5 files changed, 123 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest.java
 create mode 100644 src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml

diff --git a/src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java
index e07b178b..4672475b 100644
--- a/src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/LocalRegionParser.java
@@ -23,7 +23,7 @@ import org.springframework.data.gemfire.RegionAttributesFactoryBean;
 import org.w3c.dom.Element;
 
 /**
- * Parser for &lt;local-region;gt; bean definitions.
+ * Parser for &lt;local-region&gt; bean definitions.
  *
  * @author David Turanski
  * @author John Blum
@@ -44,7 +44,7 @@ class LocalRegionParser extends AbstractRegionParser {
 		BeanDefinitionBuilder regionAttributesBuilder = BeanDefinitionBuilder.genericBeanDefinition(
 			RegionAttributesFactoryBean.class);
 
-		super.doParseCommonRegionConfiguration(element, parserContext, builder, regionAttributesBuilder, subRegion);
+		doParseCommonRegionConfiguration(element, parserContext, builder, regionAttributesBuilder, subRegion);
 
 		builder.addPropertyValue("attributes", regionAttributesBuilder.getBeanDefinition());
 	}
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
index 4853e9eb..e8129133 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd
@@ -1121,8 +1121,7 @@ Eviction policy for the replicated region.
 						<xsd:complexType>
 							<xsd:complexContent>
 								<xsd:extension base="evictionType">
-									<xsd:attribute name="action" type="evictionActionType"
-												   fixed="OVERFLOW_TO_DISK">
+									<xsd:attribute name="action" type="evictionActionType">
 										<xsd:annotation>
 											<xsd:documentation><![CDATA[
 The action to take when performing eviction.
diff --git a/src/test/java/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest.java
new file mode 100644
index 00000000..4bb5704f
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2010-2013 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.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+
+/**
+ * The LocalRegionWithEvictionPolicyActionNamespaceTest class is a test suite of tests cases testing the Eviction Policy
+ * Actions on Local Regions defined in a Spring context configuration file.
+ *
+ * @author John Blum
+ * @see org.junit.Test
+ * @see org.junit.runner.RunWith
+ * @see org.springframework.test.context.ContextConfiguration
+ * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
+ * @since 1.5.0.M1
+ * @link https://jira.spring.io/browse/SGF-295
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(initializers = GemfireTestApplicationContextInitializer.class)
+@SuppressWarnings("unused")
+public class LocalRegionWithEvictionPolicyActionNamespaceTest {
+
+	@Resource(name = "LocalDestroy")
+	private Region localDestroyRegion;
+
+	@Resource(name = "None")
+	private Region noneRegion;
+
+	@Resource(name = "Overflow")
+	private Region overflowRegion;
+
+	@Test
+	public void testLocalRegionConfigurationWithEvictionPolicyActionSetToLocalDestroy() {
+		assertNotNull("The 'LocalDestroy' Region was not properly configured and initialized!", localDestroyRegion);
+		assertEquals("LocalDestroy", localDestroyRegion.getName());
+		assertEquals("/LocalDestroy", localDestroyRegion.getFullPath());
+		assertNotNull(localDestroyRegion.getAttributes());
+		assertEquals(DataPolicy.NORMAL, localDestroyRegion.getAttributes().getDataPolicy());
+		assertEquals(Scope.LOCAL, localDestroyRegion.getAttributes().getScope());
+		assertNotNull(localDestroyRegion.getAttributes().getEvictionAttributes());
+		assertEquals(EvictionAction.LOCAL_DESTROY, localDestroyRegion.getAttributes().getEvictionAttributes().getAction());
+	}
+
+	@Test
+	public void testLocalRegionConfigurationWithEvictionPolicyActionSetToNone() {
+		assertNotNull("The 'None' Region was not properly configured and initialized!", noneRegion);
+		assertEquals("None", noneRegion.getName());
+		assertEquals("/None", noneRegion.getFullPath());
+		assertNotNull(noneRegion.getAttributes());
+		assertEquals(DataPolicy.NORMAL, noneRegion.getAttributes().getDataPolicy());
+		assertEquals(Scope.LOCAL, noneRegion.getAttributes().getScope());
+		assertNotNull(noneRegion.getAttributes().getEvictionAttributes());
+		assertEquals(EvictionAction.NONE, noneRegion.getAttributes().getEvictionAttributes().getAction());
+	}
+
+	@Test
+	public void testLocalRegionConfigurationWithEvictionPolicyActionSetToOverflowToDisk() {
+		assertNotNull("The 'Overflow' Region was not properly configured and initialized!", overflowRegion);
+		assertEquals("Overflow", overflowRegion.getName());
+		assertEquals("/Overflow", overflowRegion.getFullPath());
+		assertNotNull(overflowRegion.getAttributes());
+		assertEquals(DataPolicy.NORMAL, overflowRegion.getAttributes().getDataPolicy());
+		assertEquals(Scope.LOCAL, overflowRegion.getAttributes().getScope());
+		assertNotNull(overflowRegion.getAttributes().getEvictionAttributes());
+		assertEquals(EvictionAction.OVERFLOW_TO_DISK, overflowRegion.getAttributes().getEvictionAttributes().getAction());
+	}
+
+}
diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java
index ef28b6c7..0a6f4fc8 100644
--- a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java
+++ b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java
@@ -459,7 +459,7 @@ public class MockRegionFactory<K,V>   {
 			}
 		});
 
-		when(region.getFullPath()).thenReturn(name);
+		when(region.getFullPath()).thenReturn(Region.SEPARATOR + name);
 		when(region.getName()).thenReturn(name);
     	when(region.getRegionService()).thenReturn(mockRegionService);
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml
new file mode 100644
index 00000000..3793725c
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+">
+
+	<gfe:cache/>
+
+	<gfe:local-region id="LocalDestroy" persistent="false">
+		<gfe:eviction action="LOCAL_DESTROY"/>
+	</gfe:local-region>
+
+	<gfe:local-region id="None" persistent="false"/>
+
+	<gfe:local-region id="Overflow" persistent="false">
+		<gfe:eviction action="OVERFLOW_TO_DISK"/>
+	</gfe:local-region>
+
+</beans>