SGF-589 - Reorganize and repackage Spring Data Geode API classes by functional concern.

src/test/java/org/springframework/data/gemfire/RegionShortcutWrapperTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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.support;
+package org.springframework.data.gemfire;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,7 +31,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.support.RegionShortcutWrapper
+ * @see RegionShortcutWrapper
  * @see org.apache.geode.cache.RegionShortcut
  * @since 1.4.0
  */
@@ -300,5 +301,4 @@ public class RegionShortcutWrapperTest {
 		assertTrue(RegionShortcutWrapper.REPLICATE_PROXY.isReplicate());
 		assertFalse(RegionShortcutWrapper.UNSPECIFIED.isReplicate());
 	}
-
 }

src/test/java/org/springframework/data/gemfire/SubRegionTest.java

@@ -1,98 +0,0 @@
-/*
- * 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;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.cache.Region;
-import org.junit.Test;
-
-/**
- *
- * @author David Turanski
- * @author John Blum
- */
-public class SubRegionTest extends RecreatingSpringApplicationContextTest {
-	@Override
-	protected String location() {
-		return "org/springframework/data/gemfire/basic-subregion.xml";
-	}
-
-	@Test
-	public void testAll() throws Exception {
-		testBasic();
-		testContext();
-		testChildOnly();
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private void testBasic() throws Exception {
-		CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
-
-		cacheFactoryBean.setBeanName("gemfireCache");
-		cacheFactoryBean.setUseBeanFactoryLocator(false);
-		cacheFactoryBean.afterPropertiesSet();
-
-		GemFireCache cache = cacheFactoryBean.getObject();
-
-		assertNotNull(cache);
-
-		RegionFactoryBean regionFactory = new ReplicatedRegionFactoryBean();
-
-		regionFactory.setCache(cache);
-		regionFactory.setName("Outer");
-		regionFactory.afterPropertiesSet();
-
-		Region outer = regionFactory.getObject();
-
-		assertNotNull(outer);
-		assertEquals("Outer", outer.getName());
-		assertEquals("/Outer", outer.getFullPath());
-		assertSame(outer, cache.getRegion("/Outer"));
-
-		RegionFactoryBean subRegionFactory = new RegionFactoryBean() { };
-
-		subRegionFactory.setCache(cache);
-		subRegionFactory.setParent(outer);
-		subRegionFactory.setName("/Outer/Inner");
-		subRegionFactory.setRegionName("Inner");
-		subRegionFactory.afterPropertiesSet();
-
-		Region inner = subRegionFactory.getObject();
-
-		assertNotNull(inner);
-		assertSame(inner, outer.getSubregion("Inner"));
-		assertSame(inner, cache.getRegion("/Outer/Inner"));
-	}
-
-	@SuppressWarnings("rawtypes")
-	private void testContext() throws Exception {
-		Region parent = applicationContext.getBean("parent", Region.class);
-		Region child = applicationContext.getBean("/parent/child", Region.class);
-		assertNotNull(parent.getSubregion("child"));
-		assertSame(child, parent.getSubregion("child"));
-		assertEquals("/parent/child", child.getFullPath());
-	}
-
-	@SuppressWarnings("rawtypes")
-	public void testChildOnly() throws Exception {
-		Region child = applicationContext.getBean("/parent/child", Region.class);
-		assertEquals("/parent/child", child.getFullPath());
-	}
-}

src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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.support;
+package org.springframework.data.gemfire.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

src/test/java/org/springframework/data/gemfire/cache/ClientCacheManagerTest.java

@@ -1,16 +1,20 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2016 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
+ * 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
+ *      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.
  *
- * 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.support;
+package org.springframework.data.gemfire.cache;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -25,10 +29,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author John Blum
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("/org/springframework/data/gemfire/support/cache-manager-client-cache.xml")
+@ContextConfiguration("/org/springframework/data/gemfire/cache/cache-manager-client-cache.xml")
 public class ClientCacheManagerTest {
 
-	@Autowired 
+	@Autowired
 	GemfireCacheManager cacheManager;
 
 	@Test

src/test/java/org/springframework/data/gemfire/cache/CompoundCachePutCacheEvictIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2016 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.support;
+package org.springframework.data.gemfire.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -67,8 +67,8 @@ import lombok.RequiredArgsConstructor;
  * @see org.springframework.cache.annotation.EnableCaching
  * @see org.springframework.test.context.ContextConfiguration
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
- * @see org.springframework.data.gemfire.support.GemfireCache#evict(Object)
- * @see org.springframework.data.gemfire.support.GemfireCache#put(Object, Object)
+ * @see GemfireCache#evict(Object)
+ * @see GemfireCache#put(Object, Object)
  * @see <a href="http://stackoverflow.com/questions/39830488/gemfire-entrynotfoundexception-for-cacheevict">Gemfire EntryNotFoundException on @CacheEvict</a>
  * @see <a href="https://jira.spring.io/browse/SGF-539">Change GemfireCache.evict(key) to call Region.remove(key)</a>
  * @since 1.9.0

src/test/java/org/springframework/data/gemfire/cache/GemfireCacheIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-104 the original author or authors.
+ * Copyright 2016 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.
@@ -12,9 +12,10 @@
  * 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.support;
+package org.springframework.data.gemfire.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;

src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2016 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.support;
+package org.springframework.data.gemfire.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.equalTo;

src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2016 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.
@@ -15,7 +15,7 @@
  *
  */
 
-package org.springframework.data.gemfire.support;
+package org.springframework.data.gemfire.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -49,7 +49,7 @@ import org.springframework.cache.Cache;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.runners.MockitoJUnitRunner
- * @see org.springframework.data.gemfire.support.GemfireCache
+ * @see GemfireCache
  * @see org.apache.geode.cache.Region
  * @since 1.9.0
  */

src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutConverterTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.client;
 
 import static org.junit.Assert.assertEquals;
 
@@ -27,7 +28,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.ClientRegionShortcutConverter
+ * @see ClientRegionShortcutConverter
  * @see org.apache.geode.cache.client.ClientRegionShortcut
  * @since 1.3.4
  */

src/test/java/org/springframework/data/gemfire/client/ClientRegionShortcutWrapperTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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.support;
+package org.springframework.data.gemfire.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,7 +31,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.support.ClientRegionShortcutWrapper
+ * @see ClientRegionShortcutWrapper
  * @see org.apache.geode.cache.client.ClientRegionShortcut
  * @since 1.4.0
  */

src/test/java/org/springframework/data/gemfire/config/annotation/EnableEntityDefinedRegionsConfigurationUnitTests.java

@@ -52,6 +52,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.data.gemfire.client.ClientRegionShortcutWrapper;
 import org.springframework.data.gemfire.config.annotation.test.entities.ClientRegionEntity;
 import org.springframework.data.gemfire.config.annotation.test.entities.CollocatedPartitionRegionEntity;
 import org.springframework.data.gemfire.config.annotation.test.entities.GenericRegionEntity;
@@ -61,7 +62,6 @@ import org.springframework.data.gemfire.mapping.annotation.ClientRegion;
 import org.springframework.data.gemfire.mapping.annotation.LocalRegion;
 import org.springframework.data.gemfire.mapping.annotation.PartitionRegion;
 import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion;
-import org.springframework.data.gemfire.support.ClientRegionShortcutWrapper;
 import org.springframework.data.gemfire.util.CollectionUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/config/annotation/EnableEvictionConfigurationUnitTests.java

@@ -40,11 +40,11 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.gemfire.EvictionActionType;
-import org.springframework.data.gemfire.EvictionAttributesFactoryBean;
-import org.springframework.data.gemfire.EvictionPolicyType;
 import org.springframework.data.gemfire.PartitionedRegionFactoryBean;
 import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
+import org.springframework.data.gemfire.eviction.EvictionActionType;
+import org.springframework.data.gemfire.eviction.EvictionAttributesFactoryBean;
+import org.springframework.data.gemfire.eviction.EvictionPolicyType;
 import org.springframework.data.gemfire.util.ArrayUtils;
 
 /**
@@ -55,7 +55,7 @@ import org.springframework.data.gemfire.util.ArrayUtils;
  * @see org.mockito.Mockito
  * @see org.springframework.data.gemfire.config.annotation.EnableEviction
  * @see org.springframework.data.gemfire.config.annotation.EvictionConfiguration
- * @see org.springframework.data.gemfire.EvictionAttributesFactoryBean
+ * @see EvictionAttributesFactoryBean
  * @see org.apache.geode.cache.Region
  * @see org.apache.geode.cache.EvictionAttributes
  * @since 1.9.0

src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationUnitTests.java

@@ -41,7 +41,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.gemfire.ExpirationActionType;
+import org.springframework.data.gemfire.expiration.ExpirationActionType;
 import org.springframework.data.gemfire.util.ArrayUtils;
 
 /**

src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java

@@ -31,10 +31,6 @@ import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.wan.GatewaySender;
 import org.junit.Test;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.data.gemfire.EvictionActionConverter;
-import org.springframework.data.gemfire.EvictionPolicyConverter;
-import org.springframework.data.gemfire.EvictionPolicyType;
-import org.springframework.data.gemfire.ExpirationActionConverter;
 import org.springframework.data.gemfire.IndexMaintenancePolicyConverter;
 import org.springframework.data.gemfire.IndexMaintenancePolicyType;
 import org.springframework.data.gemfire.IndexType;
@@ -42,6 +38,10 @@ import org.springframework.data.gemfire.IndexTypeConverter;
 import org.springframework.data.gemfire.InterestPolicyConverter;
 import org.springframework.data.gemfire.ScopeConverter;
 import org.springframework.data.gemfire.client.InterestResultPolicyConverter;
+import org.springframework.data.gemfire.eviction.EvictionActionConverter;
+import org.springframework.data.gemfire.eviction.EvictionPolicyConverter;
+import org.springframework.data.gemfire.eviction.EvictionPolicyType;
+import org.springframework.data.gemfire.expiration.ExpirationActionConverter;
 import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy;
 import org.springframework.data.gemfire.server.SubscriptionEvictionPolicyConverter;
 import org.springframework.data.gemfire.support.ConnectionEndpoint;

src/test/java/org/springframework/data/gemfire/config/xml/TxManagerNamespaceTest.java

@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.data.gemfire.transaction.GemfireTransactionManager;
 import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer;
+import org.springframework.data.gemfire.transaction.GemfireTransactionManager;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

src/test/java/org/springframework/data/gemfire/eviction/EvictionActionConverterUnitTests.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.eviction;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -31,7 +32,7 @@ import org.junit.rules.ExpectedException;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.EvictionActionConverter
+ * @see EvictionActionConverter
  * @see org.apache.geode.cache.EvictionAction
  * @since 1.6.0
  */

src/test/java/org/springframework/data/gemfire/eviction/EvictionActionTypeTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.eviction;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -29,7 +30,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.EvictionActionType
+ * @see EvictionActionType
  * @see org.apache.geode.cache.EvictionAction
  * @since 1.6.0
  */

src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.eviction;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -37,7 +38,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.EvictionAttributesFactoryBean
+ * @see EvictionAttributesFactoryBean
  * @see org.apache.geode.cache.EvictionAttributes
  * @since 1.3.4
  */

src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyConverterUnitTests.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.eviction;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -30,8 +31,8 @@ import org.junit.rules.ExpectedException;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.EvictionPolicyConverter
- * @see org.springframework.data.gemfire.EvictionPolicyType
+ * @see EvictionPolicyConverter
+ * @see EvictionPolicyType
  * @since 1.6.0
  */
 public class EvictionPolicyConverterUnitTests {

src/test/java/org/springframework/data/gemfire/eviction/EvictionPolicyTypeTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.eviction;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;

src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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.support;
+package org.springframework.data.gemfire.expiration;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -54,7 +55,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @see org.junit.Test
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mockito
- * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration
+ * @see AnnotationBasedExpiration
  * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer
  * @see org.springframework.test.context.ContextConfiguration
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner

src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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.support;
+package org.springframework.data.gemfire.expiration;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -31,7 +32,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.springframework.data.gemfire.support.AnnotationBasedExpiration.ExpirationMetaData;
+import static org.springframework.data.gemfire.expiration.AnnotationBasedExpiration.ExpirationMetaData;
 
 import org.apache.geode.cache.ExpirationAction;
 import org.apache.geode.cache.ExpirationAttributes;
@@ -43,7 +44,6 @@ import org.mockito.stubbing.Answer;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.gemfire.ExpirationActionType;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.expression.BeanResolver;
 import org.springframework.expression.PropertyAccessor;
@@ -58,7 +58,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
  * @author John Blum
  * @see org.junit.Test
  * @see org.mockito.Mockito
- * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration
+ * @see AnnotationBasedExpiration
  * @since 1.7.0
  */
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })

src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionConverterUnitTests.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.expiration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -31,7 +32,7 @@ import org.junit.rules.ExpectedException;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.ExpirationActionConverter
+ * @see ExpirationActionConverter
  * @since 1.6.0
  */
 public class ExpirationActionConverterUnitTests {

src/test/java/org/springframework/data/gemfire/expiration/ExpirationActionTypeTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.expiration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -30,7 +31,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.ExpirationActionType
+ * @see ExpirationActionType
  * @see org.apache.geode.cache.ExpirationAction
  * @since 1.6.0
  */

src/test/java/org/springframework/data/gemfire/expiration/ExpirationAttributesFactoryBeanTest.java

@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2013 the original author or authors.
+ * Copyright 2016 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
+ *      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;
+package org.springframework.data.gemfire.expiration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -31,7 +32,7 @@ import org.junit.Test;
  *
  * @author John Blum
  * @see org.junit.Test
- * @see org.springframework.data.gemfire.ExpirationAttributesFactoryBean
+ * @see ExpirationAttributesFactoryBean
  * @since 1.6.0
  */
 public class ExpirationAttributesFactoryBeanTest {

src/test/java/org/springframework/data/gemfire/test/support/AbstractRegionFactoryBeanTests.java

@@ -18,7 +18,6 @@
 package org.springframework.data.gemfire.test.support;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.util.HashMap;
 import java.util.Map;