SGF-732 - Change branding from Spring Data GemFire to Spring Data for Pivotal GemFire.

Change branding from 'Gemfire' or 'GemFire' to 'Pivotal GemFire'.

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

@@ -29,10 +29,10 @@ import org.springframework.dao.support.DaoSupport;
 import org.springframework.stereotype.Repository;
 
 /**
- * The AutoRegionLookupDao class is a Data Access Object (DAO) encapsulating references to several GemFire Cache Regions
- * defined in native GemFire cache.xml and registered as beans in the Spring context using Spring Data GemFire's
- * auto Region lookup functionality.  This class is used in the AutoRegionLookupWithComponentScanningIntegrationTests
- * class to ensure this @Repository component is auto-wired properly.
+ * The AutoRegionLookupDao class is a Data Access Object (DAO) encapsulating references to several Pivotal GemFireCache Regions
+ * defined in native Pivotal GemFirecache.xml and registered as beans in the Spring context using SDG's auto Region lookup
+ * functionality.  This class is used in the AutoRegionLookupWithComponentScanningIntegrationTests class to ensure
+ * this @Repository component is auto-wired properly.
  *
  * @author John Blum
  * @see org.springframework.dao.support.DaoSupport
@@ -40,8 +40,6 @@ import org.springframework.stereotype.Repository;
  * @see org.apache.geode.cache.Region
  * @since 1.5.0
  */
-/*
-*/
 @DependsOn("gemfireCache")
 //@Lazy
 @Repository("autoRegionLookupDao")
@@ -85,5 +83,4 @@ public class AutoRegionLookupDao extends DaoSupport {
 		assertRegionMetaData(nativeReplicateGrandchild, "NativeReplicateGrandchild",
 			"/NativeReplicateParent/NativeReplicateChild/NativeReplicateGrandchild", DataPolicy.REPLICATE);
 	}
-
 }

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

@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests to test the contract and functionality of Spring Data GemFire's Auto Region Lookup functionality.
+ * Integration tests to test the contract and functionality of SDG's Auto Region Lookup functionality.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -32,7 +32,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests to test the behavior of Spring Data GemFire's Auto Region Lookup functionality
+ * Integration tests to test the behavior of SDG's Auto Region Lookup functionality
  * when combined with Spring's component auto-wiring capabilities.
  *
  * @author John Blum

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

@@ -27,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests to test the behavior of Spring Data GemFire's Auto Region Lookup behavior
+ * Integration tests to test the behavior of SDG's Auto Region Lookup behavior
  * with Spring component scanning functionality.
  *
  * @author John Blum

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

@@ -31,8 +31,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.data.gemfire.config.xml.GemfireConstants;
 
 /**
- * The CacheAutoReconnectIntegrationTests class is a tests suite of test cases testing Spring Data GemFire's support
- * of GemFire's Auto-Reconnect functionality release in 8.0.
+ * The CacheAutoReconnectIntegrationTests class is a tests suite of test cases testing SDG's support
+ * of Pivotal GemFire's Auto-Reconnect functionality release in 8.0.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -59,7 +59,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The CacheClusterConfigurationIntegrationTest class is a test suite of test cases testing the integration of
- * Spring Data GemFire with GemFire 8's new shared, persistent, cluster configuration service.
+ * SDG with Pivotal GemFire8's new shared, persistent, cluster configuration service.
  *
  * @author John Blum
  * @see org.junit.Test
@@ -263,7 +263,7 @@ public class CacheClusterConfigurationIntegrationTest extends ClientServerIntegr
 
 			fail("Loading the 'cacheUsingLocalOnlyConfigurationIntegrationTest.xml' Spring ApplicationContext"
 				+ " configuration file should have resulted in an Exception due to the Region lookup on"
-				+ " 'ClusterConfigRegion' when GemFire Cluster Configuration is disabled!");
+				+ " 'ClusterConfigRegion' when Cluster Configuration is disabled!");
 		}
 		catch (BeanCreationException expected) {
 

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

@@ -28,7 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration test trying various basic configurations of GemFire through
+ * Integration test trying various basic configurations of Pivotal GemFirethrough
  * Spring.
  *
  * Made abstract to avoid multiple caches running at the same time.

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

@@ -33,8 +33,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
- * The CacheServerIntegrationTest class is a test suite of test cases testing the functionality of GemFire Cache Servers
- * configured using the Spring Data GemFire XML namespace.
+ * The CacheServerIntegrationTest class is a test suite of test cases testing the functionality of Pivotal GemFireCache Servers
+ * configured using the SDG XML namespace.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -62,14 +62,14 @@ import lombok.RequiredArgsConstructor;
 
 /**
  * Integrations tests for {@link GemfireTemplate} testing proper function and behavior of executing (OQL) queries
- * from a cache client application using the {@link GemfireTemplate} to a cluster of GemFire servers that have
+ * from a cache client application using the {@link GemfireTemplate} to a cluster of Pivotal GemFire'servers that have
  * been grouped according to business function and data access, primarily to distribute the load.
  *
- * Each GemFire {@link Pool} is configured to target a specific server group.  Each group of servers in the cluster
+ * Each Pivotal GemFire{@link Pool} is configured to target a specific server group.  Each group of servers in the cluster
  * defines specific {@link Region Regions} to manage data independently and separately from other data that might
  * garner high frequency access.
  *
- * Spring Data GemFire's {@link GemfireTemplate} should intelligently employ the right
+ * SDG's {@link GemfireTemplate} should intelligently employ the right
  * {@link org.apache.geode.cache.query.QueryService} configured with the {@link Region Region's} {@link Pool}
  * meta-data when executing the query in order to ensure the right servers containing the {@link Region Region's}
  * with the data of interest are targeted.

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

@@ -43,7 +43,6 @@ import org.springframework.data.gemfire.util.CacheUtils;
  */
 public class GenericRegionFactoryBeanTest {
 
-	// As defined in com.gemstone.gemfire.internal.cache.AbstractRegion
 	private static final Scope DEFAULT_SCOPE = Scope.DISTRIBUTED_NO_ACK;
 
 	private static Region<Object, Object> defaultRegion;
@@ -56,6 +55,7 @@ public class GenericRegionFactoryBeanTest {
 
 	@BeforeClass
 	public static void setup() throws Exception {
+
 		Cache gemfireCache = new CacheFactory()
 			.set("name", GenericRegionFactoryBeanTest.class.getSimpleName())
 			.set("mcast-port", "0")
@@ -125,6 +125,7 @@ public class GenericRegionFactoryBeanTest {
 
 	@AfterClass
 	public static void tearDown() {
+
 		CacheUtils.closeCache();
 
 		FileFilter fileFilter = FileSystemUtils.CompositeFileFilter.or(
@@ -134,20 +135,20 @@ public class GenericRegionFactoryBeanTest {
 		FileSystemUtils.deleteRecursive(FileSystemUtils.WORKING_DIRECTORY, fileFilter);
 	}
 
-	protected void assertRegionAttributes(Region<?, ?> region, String expectedRegionName, DataPolicy expectedDataPolicy,
+	private void assertRegionAttributes(Region<?, ?> region, String expectedRegionName, DataPolicy expectedDataPolicy,
 			Scope expectedScope) {
 
 		assertRegionAttributes(region, expectedRegionName, String.format("%1$s%2$s", Region.SEPARATOR, expectedRegionName),
 			expectedDataPolicy, expectedScope);
 	}
 
-	protected void assertRegionAttributes(Region<?, ?> region, String expectedRegionName, String expectedRegionPath,
+	private void assertRegionAttributes(Region<?, ?> region, String expectedRegionName, String expectedRegionPath,
 			DataPolicy expectedDataPolicy, Scope expectedScope) {
 
-		assertNotNull("The GemFire Cache Region must not be null!", region);
+		assertNotNull("The Cache Region must not be null", region);
 		assertEquals(expectedRegionName, region.getName());
 		assertEquals(expectedRegionPath, region.getFullPath());
-		assertNotNull("The RegionAttributes must be specified!", region.getAttributes());
+		assertNotNull("The RegionAttributes must be specified", region.getAttributes());
 		assertEquals(expectedDataPolicy, region.getAttributes().getDataPolicy());
 		assertEquals(expectedScope, region.getAttributes().getScope());
 	}

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

@@ -56,7 +56,7 @@ import org.springframework.context.annotation.Import;
  * @see org.springframework.context.annotation.Configuration
  * @see org.springframework.context.annotation.Import
  * @see <a href="https://jira.spring.io/browse/SGF-432">IndexFactoryBean traps IndexExistsException instead of IndexNameConflictException</a>
- * @see <a href="https://jira.spring.io/browse/SGF-637">Improve IndexFactoryBean's resilience and options for handling GemFire IndexExistsExceptions and IndexNameConflictExceptions</a>
+ * @see <a href="https://jira.spring.io/browse/SGF-637">Improve IndexFactoryBean's resilience and options for handling Pivotal GemFireIndexExistsExceptions and IndexNameConflictExceptions</a>
  * @since 1.6.3
  */
 public class IndexConflictsIntegrationTest {

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

@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The LookupRegionMutationIntegrationTest class is a test suite of test cases testing the contract and integrated
- * functionality between natively-defined GemFire Cache Regions and SDG's Region lookup functionality combined with
+ * functionality between natively-defined Pivotal GemFireCache Regions and SDG's Region lookup functionality combined with
  * Region attribute(s) mutation.
  *
  * @author John Blum
@@ -111,7 +111,7 @@ public class LookupRegionMutationIntegrationTest {
 
 	private void assertGemFireComponent(Object gemfireComponent, String expectedName) {
 
-		assertNotNull("The GemFire component must not be null!", gemfireComponent);
+		assertNotNull("Component must not be null", gemfireComponent);
 		assertEquals(expectedName, gemfireComponent.toString());
 	}
 

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

@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * The LookupSubRegionTest class is a test suite of test cases testing the contract and functionality of Region lookups
- * using Spring Data GemFire configuration and GemFire native cache.xml.
+ * using SDG configuration and Pivotal GemFirenative cache.xml.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -31,9 +31,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.data.gemfire.test.support.FileSystemUtils;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.Assert;
 
 /**
@@ -48,42 +49,35 @@ import org.springframework.util.Assert;
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @since 1.3.3
  */
+@RunWith(SpringRunner.class)
 @ContextConfiguration("/org/springframework/data/gemfire/pdxdiskstore-config.xml")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
-@RunWith(SpringJUnit4ClassRunner.class)
 public class PdxDiskStoreIntegrationTest {
 
-	protected static final int NUMBER_OF_REGION_ENTRIES = 1000;
+	private static final int NUMBER_OF_REGION_ENTRIES = 1000;
 
 	@Resource(name = "pdxDataRegion")
 	private Region<KeyHolder<String>, ValueHolder<Integer>> pdxDataRegion;
 
-	protected static void assertRegionExists(final String expectedRegionName, final String expectedRegionPath, final Region region) {
+	private static void assertRegionExists(String expectedRegionName, String expectedRegionPath, Region region) {
+
 		assertNotNull(region);
+
 		assertEquals(String.format("Expected Region with name %1$s; but was %2$s!",
 			expectedRegionName, region.getName()), expectedRegionName, region.getName());
+
 		assertEquals(String.format("Expected Region with path %1$s; but was %2$s!",
 			expectedRegionPath, region.getFullPath()), expectedRegionPath, region.getFullPath());
 	}
 
-	protected static boolean createDirectory(final File path) {
-		return (path != null && (path.isDirectory() || path.mkdirs()));
+	private static boolean createDirectory(final File path) {
+		return path != null && (path.isDirectory() || path.mkdirs());
 	}
 
-	protected static File createFile(final String pathname) {
+	private static File createFile(final String pathname) {
 		return new File(pathname);
 	}
 
-	protected static void deleteRecursive(final File path) {
-		if (path.isDirectory()) {
-			for (File file : path.listFiles()) {
-				deleteRecursive(file);
-			}
-		}
-
-		path.delete();
-	}
-
 	@BeforeClass
 	public static void setupBeforeClass() {
 		assertTrue(createDirectory(createFile("./gemfire/data-store")));
@@ -92,15 +86,15 @@ public class PdxDiskStoreIntegrationTest {
 
 	@AfterClass
 	public static void tearDownAfterClass() {
-		deleteRecursive(createFile("./gemfire"));
+		FileSystemUtils.deleteRecursive(createFile("./gemfire"));
 	}
 
 	@Before
 	public void setup() {
-		assertNotNull("The PdxData GemFire Region was not created successfully!", pdxDataRegion);
+
+		assertNotNull("PdxData Region was not created successfully", pdxDataRegion);
 
 		if (pdxDataRegion.size() == 0) {
-			System.out.printf("Creating entries for Region (%1$s)...%n", pdxDataRegion.getName());
 			for (int index = 1; index <= NUMBER_OF_REGION_ENTRIES; index++) {
 				pdxDataRegion.put(new KeyHolder<String>("key" + index), new ValueHolder<Integer>(index));
 			}
@@ -135,11 +129,10 @@ public class PdxDiskStoreIntegrationTest {
 
 		private T key;
 
-		public KeyHolder() {
-		}
+		public KeyHolder() { }
 
 		public KeyHolder(final T key) {
-			Assert.notNull(key, "The key cannot be null!");
+			Assert.notNull(key, "Key must not be null");
 			this.key = key;
 		}
 
@@ -153,7 +146,8 @@ public class PdxDiskStoreIntegrationTest {
 
 		@Override
 		public boolean equals(final Object obj) {
-			if (obj == this) {
+
+			if (this == obj) {
 				return true;
 			}
 
@@ -168,8 +162,11 @@ public class PdxDiskStoreIntegrationTest {
 
 		@Override
 		public int hashCode() {
+
 			int hashValue = 17;
+
 			hashValue = 37 * hashValue + hashCode(this.getKey());
+
 			return hashValue;
 		}
 
@@ -184,8 +181,7 @@ public class PdxDiskStoreIntegrationTest {
 
 		private T value;
 
-		public ValueHolder() {
-		}
+		public ValueHolder() { }
 
 		public ValueHolder(final T value) {
 			this.value = value;
@@ -201,7 +197,8 @@ public class PdxDiskStoreIntegrationTest {
 
 		@Override
 		public boolean equals(final Object obj) {
-			if (obj == this) {
+
+			if (this == obj) {
 				return true;
 			}
 
@@ -216,8 +213,11 @@ public class PdxDiskStoreIntegrationTest {
 
 		@Override
 		public int hashCode() {
+
 			int hashValue = 17;
+
 			hashValue = 17 * hashValue + hashCode(this.getValue());
+
 			return hashValue;
 		}
 
@@ -226,5 +226,4 @@ public class PdxDiskStoreIntegrationTest {
 			return String.valueOf(getValue());
 		}
 	}
-
 }

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

@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The RegionShortcutsIntegrationTest class is a test suite of test cases testing the use of RegionShortcuts in the
- * Spring Data GemFire XML Namespace!
+ * SDG XML Namespace!
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -41,11 +41,11 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * The SubRegionIntegrationTest class is a test suite of test cases testing the functionality of SubRegions in GemFire
- * configured with Spring Data GemFire's XML namespace configuration meta-data.  This test class tests a complex
+ * configured with SDG's XML namespace configuration meta-data.  This test class tests a complex
  * SubRegion configuration in order to ensure functional completeness.
  *
  * @author John Blum
@@ -56,8 +56,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @since 1.4.0
  * @since 7.0.1 (GemFire)
  */
+@RunWith(SpringRunner.class)
 @ContextConfiguration(value = "complex-subregion.xml", initializers = GemfireTestApplicationContextInitializer.class)
-@RunWith(SpringJUnit4ClassRunner.class)
 @SuppressWarnings("unused")
 public class SubRegionIntegrationTest {
 
@@ -72,7 +72,8 @@ public class SubRegionIntegrationTest {
 
 	@Test
 	public void testGemFireAccountsSubRegionCreation() {
-		assertNotNull("The GemFire Cache was not properly initialized!", cache);
+
+		assertNotNull("Cache was not properly initialized", cache);
 
 		Region customers = cache.getRegion("Customers");
 
@@ -93,6 +94,7 @@ public class SubRegionIntegrationTest {
 
 	@Test
 	public void testSpringSubRegionConfiguration() {
+
 		assertNotNull("The /Customers/Accounts SubRegion was not properly initialized!", accounts);
 		assertEquals("Accounts", accounts.getName());
 		assertEquals("/Customers/Accounts", accounts.getFullPath());
@@ -136,5 +138,4 @@ public class SubRegionIntegrationTest {
 		assertNotNull(subscriptionAttributes);
 		assertEquals(InterestPolicy.CACHE_CONTENT, subscriptionAttributes.getInterestPolicy());
 	}
-
 }

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

@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
 
 /**
  * The CachingWithGemFireIntegrationTest class is a test suite of test cases testing the contract and functionality
- * of Spring Framework's Cache Abstraction using GemFire as a caching provider applied with Spring Data GemFire.
+ * of Spring Framework's Cache Abstraction using Pivotal GemFireas a caching provider applied with SDG.
  *
  * @author John Blum
  * @see org.junit.Test
@@ -73,7 +73,7 @@ public class CachingWithGemFireIntegrationTest {
 		assertFalse(namedNumbersService.wasCacheMiss());
 
 		try {
-			namedNumbersRegion.put("eleven", null); // GemFire does not accept null values on put(key, value)
+			namedNumbersRegion.put("eleven", null); // Pivotal GemFiredoes not accept null values on put(key, value)
 		}
 		finally {
 			assertTrue(namedNumbersRegion.containsKey("eleven"));

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

@@ -38,7 +38,7 @@ import org.mockito.stubbing.Answer;
 
 /**
  * Unit tests to test the adaption of the {@link java.util.concurrent.Callable}
- * into GemFire's {@link org.apache.geode.cache.CacheLoader} interface.
+ * into Pivotal GemFire's {@link org.apache.geode.cache.CacheLoader} interface.
  *
  * @author John Blum
  * @see org.junit.Rule

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

@@ -17,10 +17,17 @@
 
 package org.springframework.data.gemfire.cache;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.hamcrest.Matchers.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -44,7 +51,7 @@ import org.springframework.cache.Cache;
  * @author John Blum
  * @see org.junit.Test
  * @see org.mockito.Mock
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @since 1.9.0
  */
 @RunWith(MockitoJUnitRunner.class)
@@ -66,20 +73,22 @@ public class GemfireCacheManagerUnitTests {
 		cacheManager = new GemfireCacheManager();
 	}
 
-	protected <T> Set<T> asSet(T... elements) {
+	@SafeVarargs
+	private static <T> Set<T> asSet(T... elements) {
 		Set<T> set = new HashSet<T>(elements.length);
 		Collections.addAll(set, elements);
 		return set;
 	}
 
 	@SuppressWarnings("unchecked")
-	protected Region<?, ?> mockRegion(String name) {
+	private Region<?, ?> mockRegion(String name) {
 		Region<?, ?> mockRegion = mock(Region.class, name);
 		when(mockRegion.getName()).thenReturn(name);
 		return mockRegion;
 	}
 
-	protected Region<?, ?> regionFor(Iterable<Region<?, ?>> regions, String name) {
+	private Region<?, ?> regionFor(Iterable<Region<?, ?>> regions, String name) {
+
 		for (Region<?, ?> region : regions) {
 			if (region.getName().equals(name)) {
 				return region;
@@ -99,22 +108,24 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void assertGemFireCacheAvailableWithNullThrowsIllegalStateException() {
+
 		exception.expect(IllegalStateException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
-		exception.expectMessage(is(equalTo("A GemFire cache instance is required")));
+		exception.expectMessage(is(equalTo("A cache instance is required")));
 
 		cacheManager.assertGemFireCacheAvailable(null);
 	}
 
 	@Test
 	public void assertGemFireCacheAvailableWithNamedClosedGemFireCacheThrowsIllegalStateException() {
+
 		when(mockGemFireCache.isClosed()).thenReturn(true);
 		when(mockGemFireCache.getName()).thenReturn("Example");
 
 		try {
 			exception.expect(IllegalStateException.class);
 			exception.expectCause(is(nullValue(Throwable.class)));
-			exception.expectMessage(is(equalTo("GemFire cache [Example] has been closed")));
+			exception.expectMessage(is(equalTo("The cache [Example] has been closed")));
 
 			cacheManager.assertGemFireCacheAvailable(mockGemFireCache);
 		}
@@ -126,6 +137,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void assertGemFireRegionAvailableWithAvailableGemFireRegionIsSuccessful() {
+
 		when(mockRegion.isDestroyed()).thenReturn(false);
 		assertThat(cacheManager.assertGemFireRegionAvailable(mockRegion, "Example")).isSameAs(mockRegion);
 		verify(mockRegion, times(1)).isDestroyed();
@@ -133,6 +145,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void assertGemFireRegionAvailableWithNullThrowIllegalStateException() {
+
 		exception.expect(IllegalStateException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
 		exception.expectMessage(is(equalTo("No Region for cache name [Example] was found")));
@@ -142,6 +155,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void assertGemFireRegionAvailableWithDestroyedGemFireRegionThrowIllegalStateException() {
+
 		when(mockRegion.isDestroyed()).thenReturn(true);
 
 		try {
@@ -159,6 +173,7 @@ public class GemfireCacheManagerUnitTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void loadCachesIsSuccessful() {
+
 		Set<Region<?, ?>> regions = asSet(mockRegion("one"), mockRegion("two"), mockRegion("three"));
 
 		cacheManager.setRegions(regions);
@@ -176,6 +191,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void resolveRegionsReturnsGivenRegions() {
+
 		Set<Region<?, ?>> regions = asSet(mockRegion("one"), mockRegion("two"));
 
 		assertThat(cacheManager.resolveRegions(mockGemFireCache, regions, asSet("three", "four"))).isSameAs(regions);
@@ -188,6 +204,7 @@ public class GemfireCacheManagerUnitTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void resolveRegionsReturnsRegionsForCacheNamesOnly() {
+
 		Region mockRegionOne = mockRegion("one");
 		Region mockRegionTwo = mockRegion("two");
 
@@ -208,6 +225,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void resolveRegionsReturnsGemFireCacheRootRegions() {
+
 		Set<Region<?, ?>> rootRegions = asSet(mockRegion("one"), mockRegion("two"));
 
 		when(mockGemFireCache.rootRegions()).thenReturn(rootRegions);
@@ -237,6 +255,7 @@ public class GemfireCacheManagerUnitTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void regionForCacheNameReturnsRegion() {
+
 		when(mockGemFireCache.isClosed()).thenReturn(false);
 		when(mockGemFireCache.getName()).thenReturn("regionForCacheNameReturnsRegion");
 		when(mockGemFireCache.getRegion(eq("Example"))).thenReturn(mockRegion);
@@ -253,6 +272,7 @@ public class GemfireCacheManagerUnitTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void getMissingCacheReturnsMissingCache() {
+
 		Region mockRegion = mockRegion("missing");
 
 		when(mockGemFireCache.getRegion(eq("missing"))).thenReturn(mockRegion);
@@ -269,7 +289,8 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void getMissingCacheReturnsNull() {
-		cacheManager.setRegions(Collections.<Region<?, ?>>singleton(mockRegion("one")));
+
+		cacheManager.setRegions(Collections.singleton(mockRegion("one")));
 		cacheManager.afterPropertiesSet();
 
 		assertThat(cacheManager.isDynamic()).isFalse();
@@ -278,6 +299,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void setAndGetCache() {
+
 		assertThat(cacheManager.getCache()).isNull();
 
 		cacheManager.setCache(mockGemFireCache);
@@ -291,6 +313,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void setAndGetCacheNames() {
+
 		Set<Region<?, ?>> regions = asSet(mockRegion("one"), mockRegion("two"));
 
 		cacheManager.setRegions(regions);
@@ -301,6 +324,7 @@ public class GemfireCacheManagerUnitTests {
 
 	@Test
 	public void setAndGetRegions() {
+
 		Set<Region<?, ?>> regions = asSet(mockRegion("one"), mockRegion("two"));
 
 		assertThat(cacheManager.getRegions()).isNull();

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

@@ -75,9 +75,10 @@ public class GemfireCacheUnitTests {
 
 	@Test
 	public void constructGemfireCacheWithNullRegion() {
+
 		exception.expect(IllegalArgumentException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
-		exception.expectMessage(is(equalTo("GemFire Region must not be null")));
+		exception.expectMessage(is(equalTo("Region must not be null")));
 
 		new GemfireCache(null);
 	}

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

@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
 
 /**
  * The ClientCacheIndexingTest class is a test suite of test cases testing the creation and application of indexes
- * on client Regions of a GemFire ClientCache using the <gfe:index/> tag element in the Spring Data GemFire
+ * on client Regions of a Pivotal GemFireClientCache using the <gfe:index/> tag element in the SDG
  * XML namespace and configuration meta-data, which is backed by the IndexFactoryBean.
  *
  * @author John Blum
@@ -77,13 +77,15 @@ public class ClientCacheIndexingTest {
 
 	@BeforeClass
 	public static void setup() throws IOException {
+
 		String serverName = "GemFireIndexingCacheServer";
 
 		File serverWorkingDirectory = new File(FileSystemUtils.WORKING_DIRECTORY, serverName.toLowerCase());
 
-		Assert.isTrue(serverWorkingDirectory.isDirectory() || serverWorkingDirectory.mkdirs());
+		Assert.isTrue(serverWorkingDirectory.isDirectory() || serverWorkingDirectory.mkdirs(),
+			String.format("Working directory [%s] could not be created", serverWorkingDirectory));
 
-		List<String> arguments = new ArrayList<String>();
+		List<String> arguments = new ArrayList<>();
 
 		arguments.add("-Dgemfire.name=" + serverName);
 		arguments.add("/org/springframework/data/gemfire/client/ClientCacheIndexingTest-server-context.xml");
@@ -97,6 +99,7 @@ public class ClientCacheIndexingTest {
 	}
 
 	private static void waitForServerStart(final long milliseconds) {
+
 		ThreadUtils.timedWait(milliseconds, TimeUnit.MILLISECONDS.toMillis(500), new ThreadUtils.WaitCondition() {
 			private File serverPidControlFile = new File(serverProcess.getWorkingDirectory(),
 				ServerProcess.getServerProcessControlFilename());
@@ -109,6 +112,7 @@ public class ClientCacheIndexingTest {
 
 	@AfterClass
 	public static void tearDown() {
+
 		serverProcess.shutdown();
 
 		if (Boolean.valueOf(System.getProperty("spring.gemfire.fork.clean", Boolean.TRUE.toString()))) {
@@ -116,9 +120,10 @@ public class ClientCacheIndexingTest {
 		}
 	}
 
-	protected Index getIndex(final GemFireCache gemfireCache, final String indexName) {
-		QueryService queryService = (gemfireCache instanceof ClientCache
-			? ((ClientCache) gemfireCache).getLocalQueryService() : gemfireCache.getQueryService());
+	private Index getIndex(GemFireCache gemfireCache, String indexName) {
+
+		QueryService queryService = gemfireCache instanceof ClientCache
+			? ((ClientCache) gemfireCache).getLocalQueryService() : gemfireCache.getQueryService();
 
 		for (Index index : queryService.getIndexes()) {
 			if (index.getName().equals(indexName)) {
@@ -132,7 +137,8 @@ public class ClientCacheIndexingTest {
 	@Test
 	@SuppressWarnings("deprecation")
 	public void testIndexByName() {
-		assertNotNull("The GemFire ClientCache was not properly configured and initialized!", clientCache);
+
+		assertNotNull("ClientCache was not properly configured and initialized", clientCache);
 
 		Index actualIndex = getIndex(clientCache, "ExampleIndex");
 
@@ -141,5 +147,4 @@ public class ClientCacheIndexingTest {
 		assertEquals(IndexType.HASH, actualIndex.getType());
 		assertSame(exampleIndex, actualIndex);
 	}
-
 }

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

@@ -85,9 +85,6 @@ public class ClientCacheVariableLocatorsTest {
 			arguments.toArray(new String[arguments.size()]));
 
 		waitForServerToStart(TimeUnit.SECONDS.toMillis(20));
-
-		System.out.printf("Spring-based, GemFire Cache Server process for %1$s should be running...%n",
-			ClientCacheVariableLocatorsTest.class.getSimpleName());
 	}
 
 	private static void waitForServerToStart(final long milliseconds) {
@@ -131,5 +128,4 @@ public class ClientCacheVariableLocatorsTest {
 			cacheMissCounter.set(0);
 		}
 	}
-
 }

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

@@ -85,9 +85,6 @@ public class ClientCacheVariableServersTest {
 			arguments.toArray(new String[arguments.size()]));
 
 		waitForServerToStart(TimeUnit.SECONDS.toMillis(20));
-
-		System.out.printf("Spring-based, GemFire Cache Server process for %1$s should be running...%n",
-			ClientCacheVariableServersTest.class.getSimpleName());
 	}
 
 	private static void waitForServerToStart(final long milliseconds) {
@@ -131,5 +128,4 @@ public class ClientCacheVariableServersTest {
 			cacheMissCounter.set(0);
 		}
 	}
-
 }

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

@@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * The ClientRegionWithCacheLoaderWriterTest class is a test suite of test cases testing the addition of CacheLoaders
- * and CacheWriters to a client, local Region inside a GemFire Cache.
+ * and CacheWriters to a client, local Region inside a Pivotal GemFireCache.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -35,7 +35,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration test testing {@link Region sub-Region} functionality from a GemFire cache client.
+ * Integration test testing {@link Region sub-Region} functionality from a Pivotal GemFirecache client.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -65,8 +65,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.SocketUtils;
 
 /**
- * The DurableClientCacheIntegrationTest class is a test suite of test cases testing GemFire's Durable Client
- * functionality in the context of Spring Data GemFire.
+ * The DurableClientCacheIntegrationTest class is a test suite of test cases testing Pivotal GemFire's Durable Client
+ * functionality in the context of SDG.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -43,8 +43,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * The GemFireDataSourceIntegrationTest class is a test suite of test cases testing the contract and functionality
- * of the <gfe-data:datasource> element in the context of a GemFire cluster running both native,
- * non-Spring configured GemFire Server(s) in addition to Spring configured and bootstrapped GemFire Server(s).
+ * of the <gfe-data:datasource> element in the context of a Pivotal GemFirecluster running both native,
+ * non-Spring configured Pivotal GemFireServer(s) in addition to Spring configured and bootstrapped Pivotal GemFireServer(s).
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -38,7 +38,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests for a GemFire DataSource.
+ * Integration tests for a Pivotal GemFireDataSource.
  *
  * @author David Turanski
  * @author John Blum

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

@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
 /**
  * The GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest class is a test suite of test cases
  * testing the contract and functionality of the GemfireDataSourcePostProcessor using the <gfe-data:datasource>
- * element in Spring config to setup a GemFire ClientCache connecting to a native, non-Spring configured GemFire Server
+ * element in Spring config to setup a Pivotal GemFireClientCache connecting to a native, non-Spring configured Pivotal GemFireServer
  * as the DataSource to assert that client Region Proxies are registered as Spring beans
  * in the Spring ApplicationContext correctly.
  *

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

@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The SpringJavaConfiguredClientCacheIntegrationTest class is a test suite of test cases testing
- * the proper configuration of a GemFire ClientCache instance using Spring Java-based configuration meta-data.
+ * the proper configuration of a Pivotal GemFireClientCache instance using Spring Java-based configuration meta-data.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunctionTest.java

@@ -38,7 +38,7 @@ import org.mockito.stubbing.Answer;
 
 /**
  * The ListRegionsOnServerFunctionTest class is a test suite of test cases testing the contract and functionality
- * of the ListRegionsOnServerFunction GemFire Function class.
+ * of the ListRegionsOnServerFunction Pivotal GemFireFunction class.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionAcquiringAspectUnitTests.java

@@ -96,7 +96,7 @@ public class GemFireAsLastResourceConnectionAcquiringAspectUnitTests {
 		verify(aspect, times(1)).resolveGemFireJcaResourceAdapterJndiName();
 		verify(mockGemFireConnectionFactory, times(1)).getConnection();
 		verify(mockLogger, times(1))
-			.trace(eq(String.format("Acquiring GemFire Connection from GemFire JCA ResourceAdapter registered at [%s]...",
+			.trace(eq(String.format("Acquiring Pivotal GemFire Connection from Pivotal GemFire JCA ResourceAdapter registered at [%s]...",
 				GemFireAsLastResourceConnectionAcquiringAspect.DEFAULT_GEMFIRE_JCA_RESOURCE_ADAPTER_JNDI_NAME)));
 	}
 

src/test/java/org/springframework/data/gemfire/config/annotation/support/GemFireAsLastResourceConnectionClosingAspectUnitTests.java

@@ -75,9 +75,9 @@ public class GemFireAsLastResourceConnectionClosingAspectUnitTests {
 
 		when(mockLogger.isTraceEnabled()).thenReturn(true);
 
-		aspect.doGemFireConnectionClose();;
+		aspect.doGemFireConnectionClose();
 
 		verify(mockGemFireConnection, times(1)).close();
-		verify(mockLogger, times(1)).trace(eq("Closing GemFire Connection..."));
+		verify(mockLogger, times(1)).trace(eq("Closing Pivotal GemFire Connection..."));
 	}
 }

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

@@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The CacheServerNamespaceTest class is a test suite of test cases testing the functionality of the SDG XML namespace
- * when configuring a GemFire Cache Servers and Client Subscription.
+ * when configuring a Pivotal GemFireCache Servers and Client Subscription.
  *
  * @author Costin Leau
  * @author David Turanski

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

@@ -33,7 +33,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
- * The CacheUsingPdxNamespaceTest class is a test suite of test case testing the Spring Data GemFire XML namespace
+ * The CacheUsingPdxNamespaceTest class is a test suite of test case testing the SDG XML namespace
  * when PDX is configured in GemFire.
  *
  * @author John Blum

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

@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The ClientCacheNamespaceTest class is a test suite of test cases testing the contract and functionality
- * of the Spring Data GemFire ClientCacheParser.
+ * of the SDG ClientCacheParser.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -61,7 +61,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Unit tests for Spring Data GemFire's XML namespace support for client {@link Region Regions}.
+ * Unit tests for SDG's XML namespace support for client {@link Region Regions}.
  *
  * @author Costin Leau
  * @author David Turanski

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

@@ -155,7 +155,7 @@ public class DiskStoreAndEvictionRegionParsingTest {
 		EvictionAttributes evicAttr = attrs.getEvictionAttributes();
 		assertEquals(EvictionAction.LOCAL_DESTROY, evicAttr.getAction());
 		assertEquals(EvictionAlgorithm.LRU_MEMORY, evicAttr.getAlgorithm());
-		// for some reason GemFire resets this to 56 on my machine (not sure
+		// for some reason Pivotal GemFireresets this to 56 on my machine (not sure
 		// why)
 		// assertEquals(10, evicAttr.getMaximum());
 		ObjectSizer sizer = evicAttr.getObjectSizer();

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

@@ -33,7 +33,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The DiskStoreNamespaceTest class is a test suite of test cases testing the contract and functionality of using
- * Spring Data GemFire's XML namespace to configure GemFire Disk Stores.
+ * SDG's XML namespace to configure Pivotal GemFireDisk Stores.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The GatewayReceiverAutoStartNamespaceTest class is a test suite of test cases testing the contract
- * and functionality of Gateway Receiver configuration in Spring Data GemFire using the XML namespace (XSD).
+ * and functionality of Gateway Receiver configuration in SDG using the XML namespace (XSD).
  * This test class tests the auto start configuration of the GatewayReceiver Gemfire Component in SDG.
  *
  * @author John Blum

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

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The GatewayReceiverDefaultStartNamespaceTest class is a test suite of test cases testing the contract
- * and functionality of Gateway Receiver configuration in Spring Data GemFire using the XML namespace (XSD).
+ * and functionality of Gateway Receiver configuration in SDG using the XML namespace (XSD).
  * This test class tests the default start configuration of the GatewayReceiver Gemfire Component in SDG.
  *
  * @author John Blum

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

@@ -33,7 +33,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The GatewayReceiverManualStartNamespaceTest class is a test suite of test cases testing the contract
- * and functionality of Gateway Receiver configuration in Spring Data GemFire using the XML namespace (XSD).
+ * and functionality of Gateway Receiver configuration in SDG using the XML namespace (XSD).
  * This test class tests the manual start configuration of the GatewayReceiver Gemfire Component in SDG.
  *
  * @author John Blum

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

@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The GemfireV8GatewayNamespaceTest class is a test suite of test cases testing the contract and functionality of
- * GemFire 8 Gateway Sender/Receiver support.
+ * Pivotal GemFire8 Gateway Sender/Receiver support.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -33,8 +33,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests with test cases testing the functionality of GemFire Index creation using
- * the Spring Data GemFire XML namespace (XSD) and the {@link IndexParser}.
+ * Integration tests with test cases testing the functionality of Pivotal GemFireIndex creation using
+ * the SDG XML namespace (XSD) and the {@link IndexParser}.
  *
  * @author Costin Leau
  * @author David Turanski

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

@@ -38,7 +38,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The RawRegionBeanDefinitionTest class is a test suite of test cases testing the contract and functionality
- * of the SDG RegionFactoryBean class, and specifically the specification of the GemFire Region DataPolicy,
+ * of the SDG RegionFactoryBean class, and specifically the specification of the Pivotal GemFireRegion DataPolicy,
  * when used as raw bean definition in Spring XML configuration meta-data.
  *
  * @author John Blum

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

@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The RegionSubscriptionAttributesNamespaceTest class is a test suite of test cases testing the contract
- * and functionality of declaring and defining Subscription Attributes for a Region in the Spring Data GemFire
+ * and functionality of declaring and defining Subscription Attributes for a Region in the SDG
  * XML namespace (XSD) configuration meta-data.
  *
  * @author John Blum

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

@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The RegionWithSubRegionBeanDefinitionHashCodeTest class is a test suite for testing the hashCode() method of a
- * Spring container BeanDefinition representing a GemFire Region having SubRegions.  This test suite is meant to
+ * Spring container BeanDefinition representing a Pivotal GemFireRegion having SubRegions.  This test suite is meant to
  * ensure the correct behavior of and provide regression coverage for, JIRA issue SGF-178, "parent attribute causes
  * endless loop in hashCode".
  *

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

@@ -33,7 +33,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The RegionsWithDiskStoreAndPersistenceEvictionSettingsTest class is a test suite testing the functionality
- * of GemFire Cache Regions when persistent/non-persistent with and without Eviction settings when specifying a
+ * of Pivotal GemFireCache Regions when persistent/non-persistent with and without Eviction settings when specifying a
  * Disk Store.
  *
  * @author John Blum

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

@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The SubRegionNamespaceTest class is a test suite of test cases testing the contract and functionality of
- * Region/SubRegion creation in a GemFire Cache.
+ * Region/SubRegion creation in a Pivotal GemFireCache.
  *
  * @author David Turanski
  * @author John Blum

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

@@ -66,6 +66,7 @@ public class SubRegionSubElementNamespaceTest {
 
 	@Test
 	public void testCustomersAccountsSubRegionCacheListener() {
+
 		assertNotNull(customersAccountsRegion);
 		assertNotNull(customersAccountsRegion.getAttributes());
 		assertNotNull(customersAccountsRegion.getAttributes().getCacheListeners());
@@ -76,12 +77,13 @@ public class SubRegionSubElementNamespaceTest {
 			found |= (listener instanceof TestNoOpCacheListener);
 		}
 
-		assertTrue(String.format("Expected a GemFire CacheListener of type (%1$s) to be registered on Region (%2$s)!",
+		assertTrue(String.format("Expected a CacheListener of type (%1$s) to be registered on Region (%2$s)!",
 			TestNoOpCacheListener.class.getName(), customersAccountsRegion.getName()), found);
 	}
 
 	@Test
 	public void testOrderItemsSubRegionGatewaySender() {
+
 		assertNotNull(orderItemsRegion);
 		assertNotNull(orderItemsRegion.getAttributes());
 		assertNotNull(orderItemsRegion.getAttributes().getGatewaySenderIds());
@@ -90,14 +92,14 @@ public class SubRegionSubElementNamespaceTest {
 
 	@Test
 	public void testParentChildSubRegionAsyncEventQueue() {
+
 		assertNotNull(parentChildRegion);
 		assertNotNull(parentChildRegion.getAttributes());
 		assertNotNull(parentChildRegion.getAttributes().getAsyncEventQueueIds());
 		assertTrue(parentChildRegion.getAttributes().getAsyncEventQueueIds().contains("testQueue"));
 	}
 
-	public static final class TestNoOpCacheListener extends CacheListenerAdapter {
-	}
+	public static final class TestNoOpCacheListener extends CacheListenerAdapter { }
 
 	public static final class TestNoOpAsyncEventListener implements AsyncEventListener {
 
@@ -107,8 +109,6 @@ public class SubRegionSubElementNamespaceTest {
 		}
 
 		@Override
-		public void close() {
-		}
+		public void close() { }
 	}
-
 }

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

@@ -27,13 +27,13 @@ import org.xml.sax.SAXParseException;
 
 /**
  * The SubRegionWithInvalidDataPolicyTest class is a test suite of test cases testing the data-policy and persistent
- * attributes settings are consistent for GemFire SubRegion bean definitions.
+ * attributes settings are consistent for Pivotal GemFireSubRegion bean definitions.
  *
  * @author John Blum
  * @see org.junit.Test
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
- * @since GemFire 7.0.1
- * @since Spring Data GemFire 1.4.0
+ * @since Pivotal GemFire7.0.1
+ * @since SDG 1.4.0
  */
 public class SubRegionWithInvalidDataPolicyTest {
 

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

@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The TemplateClientRegionNamespaceTest class is a test suite of test cases testing the contract and functionality
- * of Client Region Templates using Spring Data GemFire XML namespace configuration meta-data.
+ * of Client Region Templates using SDG XML namespace configuration meta-data.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The PersistentPartitionRegionTemplateTest class is a test suite of test cases testing the functionality of
- * Spring Data GemFire's Region templates with a 'persistent', PARTITION Region configuration.
+ * SDG's Region templates with a 'persistent', PARTITION Region configuration.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -71,7 +71,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * The TemplateRegionsNamespaceTests class is a test suite of test cases testing the functionality and support for
- * Region Templating in Spring Data GemFire.
+ * Region Templating in SDG.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java

@@ -52,6 +52,7 @@ public class GemfireDaoSupportUnitTests {
 
 	@Test
 	public void setAndGetGemfireTemplate() {
+
 		GemfireTemplate expectedGemfireTemplate = new GemfireTemplate(mockRegion);
 		GemfireDaoSupport dao = new TestGemfireDaoSupport();
 
@@ -68,6 +69,7 @@ public class GemfireDaoSupportUnitTests {
 
 	@Test
 	public void setRegion() {
+
 		GemfireDaoSupport dao = new TestGemfireDaoSupport();
 
 		dao.setRegion(mockRegion);
@@ -82,6 +84,7 @@ public class GemfireDaoSupportUnitTests {
 	@Test
 	@SuppressWarnings("rawtypes")
 	public void createProperlyInitializedGemfireDaoSupportWithTemplate() throws Exception {
+
 		GemfireTemplate expectedGemfireTemplate = new GemfireTemplate();
 		GemfireDaoSupport dao = new TestGemfireDaoSupport();
 
@@ -94,9 +97,10 @@ public class GemfireDaoSupportUnitTests {
 
 	@Test
 	public void invalidGemfireDaoSupportInstanceThrowsIllegalStateException() throws Exception {
+
 		exception.expect(IllegalStateException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
-		exception.expectMessage("A GemFire Cache Region or instance of GemfireTemplate is required");
+		exception.expectMessage("A Cache Region or instance of GemfireTemplate is required");
 
 		new TestGemfireDaoSupport().afterPropertiesSet();
 	}

src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java

@@ -24,8 +24,8 @@ import org.springframework.data.gemfire.process.support.ProcessUtils;
 import org.springframework.data.gemfire.test.support.FileSystemUtils;
 
 /**
- * The {@link GemFireBasedServerProcess} class is a main Java class used to launch a GemFire Server
- * using GemFire's {@link ServerLauncher} API.
+ * The {@link GemFireBasedServerProcess} class is a main Java class used to launch a Pivotal GemFireServer
+ * using Pivotal GemFire's {@link ServerLauncher} API.
  *
  * @author John Blum
  * @see org.apache.geode.distributed.ServerLauncher
@@ -52,7 +52,7 @@ public class GemFireBasedServerProcess {
 	private static ServerLauncher runServer(String[] args) {
 		ServerLauncher serverLauncher = buildServerLauncher(args);
 
-		// start the GemFire Server process...
+		// start the Pivotal GemFireServer process...
 		serverLauncher.start();
 
 		return serverLauncher;

src/test/java/org/springframework/data/gemfire/fork/ServerProcess.java

@@ -28,8 +28,8 @@ import org.springframework.data.gemfire.test.support.FileSystemUtils;
 import org.springframework.util.Assert;
 
 /**
- * The ServerProcess class is a main Java class using Spring Data GemFire to configure and bootstrap
- * a GemFire Cache Server process.
+ * The ServerProcess class is a main Java class using SDG to configure and bootstrap
+ * a Pivotal GemFireCache Server process.
  *
  * @author John Blum
  * @see org.springframework.context.ConfigurableApplicationContext

src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java

@@ -52,7 +52,7 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * The ClientCacheFunctionExecutionWithPdxIntegrationTest class is a test suite of test cases testing Spring Data
- * GemFire's Function annotation support and interaction between a GemFire client and server Cache
+ * Pivotal GemFire's Function annotation support and interaction between a Pivotal GemFireclient and server Cache
  * when PDX is configured and read-serialized is set to true.
  *
  * @author John Blum

src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java

@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
 
 /**
  * The ExceptionThrowingFunctionExecutionIntegrationTest class is a test suite of test cases testing the invocation
- * of a GemFire Function using Spring Data GemFire Function Execution Annotation support when that Function throws
+ * of a Pivotal GemFireFunction using SDG Function Execution Annotation support when that Function throws
  * an Exception.
  *
  * @author John Blum

src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java

@@ -143,7 +143,7 @@ public class FunctionIntegrationTests extends ClientServerIntegrationTestsSuppor
 	}
 
 	/*
-	 * This gets wrapped in a GemFire Function and registered on the forked server.
+	 * This gets wrapped in a Pivotal GemFireFunction and registered on the forked server.
 	 */
 	@Component
 	@SuppressWarnings("unused")

src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java

@@ -21,8 +21,8 @@ import org.springframework.data.gemfire.function.ClientCacheFunctionExecutionWit
 import org.springframework.data.gemfire.function.annotation.OnServer;
 
 /**
- * The ApplicationDomainFunctionExecutions class defines a GemFire Client Cache Function execution targeted at a
- * GemFire Server.
+ * The ApplicationDomainFunctionExecutions class defines a Pivotal GemFireClient Cache Function execution targeted at a
+ * Pivotal GemFireServer.
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.function.ClientCacheFunctionExecutionWithPdxIntegrationTest

src/test/java/org/springframework/data/gemfire/function/sample/ExceptionThrowingFunctionExecution.java

@@ -19,7 +19,7 @@ package org.springframework.data.gemfire.function.sample;
 import org.springframework.data.gemfire.function.annotation.OnServer;
 
 /**
- * The ExceptionThrowingFunctionExecution interface defines a GemFire Function that throws a RuntimeException.
+ * The ExceptionThrowingFunctionExecution interface defines a Pivotal GemFireFunction that throws a RuntimeException.
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.function.annotation.OnServer

src/test/java/org/springframework/data/gemfire/function/sample/HelloFunctionExecution.java

@@ -19,8 +19,8 @@ package org.springframework.data.gemfire.function.sample;
 import org.springframework.data.gemfire.function.annotation.OnMember;
 
 /**
- * The HelloFunctionExecution interface is a Spring Data GemFire Function Execution interface
- * for the 'hello' GemFire Function and hello greetings.
+ * The HelloFunctionExecution interface is a SDG Function Execution interface
+ * for the 'hello' Pivotal GemFireFunction and hello greetings.
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.function.annotation.OnMember

src/test/java/org/springframework/data/gemfire/repository/OqlKeywordUnitTests.java

@@ -58,6 +58,7 @@ public class OqlKeywordUnitTests {
 
 	@Test
 	public void valueOfIgnoreCaseWithIllegalValuesThrowsIllegalArgumentException() {
+
 		assertIllegalOqlKeyword("AN");
 		assertIllegalOqlKeyword("ASS");
 		assertIllegalOqlKeyword("CNT");
@@ -81,15 +82,17 @@ public class OqlKeywordUnitTests {
 	}
 
 	protected void assertIllegalOqlKeyword(String keyword) {
+
 		exception.expect(IllegalArgumentException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
-		exception.expectMessage(String.format("[%s] is not a valid GemFire OQL Keyword", keyword));
+		exception.expectMessage(String.format("[%s] is not a valid OQL Keyword", keyword));
 
 		OqlKeyword.valueOfIgnoreCase(keyword);
 	}
 
 	@Test
 	public void getKeywordEqualsNameExceptForOrderBy() {
+
 		for (OqlKeyword oqlKeyword : OqlKeyword.values()) {
 			if (!OqlKeyword.ORDER_BY.equals(oqlKeyword)) {
 				assertThat(oqlKeyword.getKeyword()).isEqualTo(oqlKeyword.name());

src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java

@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 
 /**
  * The GemfireCacheRegionProducer class is an application scoped CDI context bean that is responsible
- * for creating the GemFire Cache "People" Region used to store {@link Person} instances.
+ * for creating the Pivotal GemFireCache "People" Region used to store {@link Person} instances.
  *
  * @author John Blum
  * @see javax.enterprise.context.ApplicationScoped

src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java

@@ -58,7 +58,7 @@ import org.springframework.util.ObjectUtils;
 public class GemfireQueryMethodUnitTests {
 
 	@Rule
-	public ExpectedException expectedException = ExpectedException.none();
+	public ExpectedException exception = ExpectedException.none();
 
 	private GemfireMappingContext context = new GemfireMappingContext();
 
@@ -148,15 +148,17 @@ public class GemfireQueryMethodUnitTests {
 	 */
 	@Test
 	public void rejectsQueryMethodWithPageableParameter() throws Exception {
-		expectedException.expect(IllegalStateException.class);
-		expectedException.expectCause(is(nullValue(Throwable.class)));
-		expectedException.expectMessage(Matchers.startsWith("Pagination is not supported by GemFire Repositories; Offending method: someMethod"));
+
+		exception.expect(IllegalStateException.class);
+		exception.expectCause(is(nullValue(Throwable.class)));
+		exception.expectMessage(Matchers.startsWith("Pagination is not supported by Pivotal GemFire Repositories; Offending method: someMethod"));
 
 		new GemfireQueryMethod(Invalid.class.getMethod("someMethod", Pageable.class), metadata, factory, context);
 	}
 
 	@Test
 	public void detectsQueryHintsCorrectly() throws Exception {
+
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithHint"),
 			metadata, factory, context).hasHint(), is(true));
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithImport"),
@@ -169,6 +171,7 @@ public class GemfireQueryMethodUnitTests {
 
 	@Test
 	public void detectsQueryImportsCorrectly() throws Exception {
+
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithHint"),
 			metadata, factory, context).hasImport(), is(false));
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithImport"),
@@ -181,6 +184,7 @@ public class GemfireQueryMethodUnitTests {
 
 	@Test
 	public void detectsQueryLimitsCorrectly() throws Exception {
+
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithHint"),
 			metadata, factory, context).hasLimit(), is(false));
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithImport"),
@@ -193,6 +197,7 @@ public class GemfireQueryMethodUnitTests {
 
 	@Test
 	public void detectsQueryTracingCorrectly() throws Exception {
+
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithHint"),
 			metadata, factory, context).hasTrace(), is(true));
 		assertThat(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithImport"),
@@ -205,6 +210,7 @@ public class GemfireQueryMethodUnitTests {
 
 	@Test
 	public void hintOnQueryWithHint() throws Exception {
+
 		assertQueryHints(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithHint"),
 			metadata, factory, context), "IdIdx", "LastNameIdx");
 
@@ -220,6 +226,7 @@ public class GemfireQueryMethodUnitTests {
 
 	@Test
 	public void importOnQueryWithImport() throws Exception {
+
 		assertImportStatement(new GemfireQueryMethod(AnnotatedQueryMethods.class.getMethod("queryWithImport"),
 			metadata, factory, context), "org.example.app.domain.ExampleType");
 

src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepository.java

@@ -20,7 +20,7 @@ import org.springframework.data.gemfire.repository.GemfireRepository;
 
 /**
  * The AlgorithmRepository class is a Data Access Object (DAO) for accessing and persistent data/state about Algorithms
- * to a GemFire Cache/Region.
+ * to a Pivotal GemFireCache/Region.
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.repository.GemfireRepository

src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java

@@ -31,7 +31,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * The AlgorithmRepositoryTest class is a test suite of test cases testing the contract and functionality of GemFire's
+ * The AlgorithmRepositoryTest class is a test suite of test cases testing the contract and functionality of Pivotal GemFire's
  * Repository extension when using a plain old Java interface for defining the application domain object/entity type,
  * rather than a Java class, that is the subject of the persistence operations.
  *
@@ -55,8 +55,9 @@ public class AlgorithmRepositoryTest {
 
 	@Test
 	public void algorithmsRepositoryFunctionsCorrectly() {
+
 		assertNotNull("A reference to the AlgorithmRepository was not properly configured!", algorithmRepo);
-		assertNotNull("A reference to the 'Algorithms' GemFire Cache Region was not properly configured!",
+		assertNotNull("A reference to the 'Algorithms' Cache Region was not properly configured!",
 			algorithmsRegion);
 		assertEquals("Algorithms", algorithmsRegion.getName());
 		assertEquals("/Algorithms", algorithmsRegion.getFullPath());
@@ -90,9 +91,8 @@ public class AlgorithmRepositoryTest {
 		}
 	}
 
-	protected static final class BinarySearch extends AbstractAlgorithm {
-	}
+	protected static final class BinarySearch extends AbstractAlgorithm { }
+
+	protected static final class HeapSort extends AbstractAlgorithm { }
 
-	protected static final class HeapSort extends AbstractAlgorithm {
-	}
 }

src/test/java/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest.java

@@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration test testing the functionality behind PR #55 involving persisting application domain object/entities
- * to multiple Regions in a GemFire Cache.
+ * to multiple Regions in a Pivotal GemFireCache.
  *
  * @author Stuart Williams
  * @author John Blum

src/test/java/org/springframework/data/gemfire/repository/sample/PlantRepository.java

@@ -21,7 +21,7 @@ import org.springframework.data.gemfire.repository.Query;
 
 /**
  * The PlantRepository class is a Repository extension for accessing and storing Plants.
- * Note, this Spring GemFire Repository extension incorrectly maps Plants to the Plants Region on purpose
+ * Note, this Spring Pivotal GemFireRepository extension incorrectly maps Plants to the Plants Region on purpose
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.repository.GemfireRepository

src/test/java/org/springframework/data/gemfire/repository/sample/RabbitRepository.java

@@ -21,7 +21,7 @@ import org.springframework.data.gemfire.repository.GemfireRepository;
 import org.springframework.data.gemfire.repository.Query;
 
 /**
- * The RabbitRepository class is a Spring Data GemFire Repository extension for accessing and persistent Rabbits
+ * The RabbitRepository class is a SDG Repository extension for accessing and persistent Rabbits
  * from/to an underlying data store (GemFire).
  *
  * @author John Blum

src/test/java/org/springframework/data/gemfire/repository/sample/RepositoryQueriesWithJoinsIntegrationTest.java

@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The RepositoryQueriesWithJoinsTest class is a test suite of test cases testing the use of JOINS between 2 Regions
- * in GemFire OQL queries (SELECT statements).
+ * in Pivotal GemFireOQL queries (SELECT statements).
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java

@@ -40,7 +40,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests testing the use of GemFire Repositories on GemFire Cache Subregions.
+ * Integration tests testing the use of Pivotal GemFireRepositories on Pivotal GemFireCache Subregions.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/repository/sample/UserRepository.java

@@ -45,7 +45,7 @@ public interface UserRepository extends GemfireRepository<User, String> {
 	List<User> findDistinctByUsernameLike(String username);
 
 /*
-	//NOTE unfortunately, the 'NOT LIKE' operator is unsupported in GemFire's Query/OQL syntax
+	//NOTE unfortunately, the 'NOT LIKE' operator is unsupported in Pivotal GemFire's Query/OQL syntax
 	List<User> findDistinctByUsernameNotLike(String username);
 */
 

src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java

@@ -34,11 +34,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * The RepositoryQueriesTest class is a test suite of test cases testing the GemFire Query capability of Spring Data
- * GemFire Repositories.
+ * The RepositoryQueriesTest class is a test suite of test cases testing the Pivotal GemFireQuery capability of Spring Data
+ * Pivotal GemFireRepositories.
  *
  * @author John Blum
  * @see org.junit.Test
@@ -47,7 +47,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @since 1.3.3
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("userRepositoryQueriesIntegrationTest.xml")
 @SuppressWarnings("unused")
 public class UserRepositoryQueriesIntegrationTest {
@@ -93,7 +93,8 @@ public class UserRepositoryQueriesIntegrationTest {
 
 	@Before
 	public void setup() {
-		assertNotNull("The 'Users' GemFire Cache Region cannot be null!", users);
+
+		assertNotNull("The 'Users' Cache Region cannot be null!", users);
 
 		if (users.isEmpty()) {
 			userRepository.save(createUser("blumj", true));

src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java

@@ -36,7 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest class is a test suite of test cases testing
- * the contract and functionality of the Spring Data Commons Repository abstraction, Spring Data GemFire Repository
+ * the contract and functionality of the Spring Data Commons Repository abstraction, SDG Repository
  * extention with custom OQL Query annotations.
  *
  * @author John Blum

src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java

@@ -480,7 +480,7 @@ public class GemfireRepositoryFactoryUnitTests {
 		}
 		catch (IllegalStateException expected) {
 
-			assertThat(expected).hasMessageStartingWith("Pagination is not supported by GemFire Repositories");
+			assertThat(expected).hasMessageStartingWith("Pagination is not supported by Pivotal GemFire Repositories");
 			assertThat(expected).hasNoCause();
 
 			throw expected;

src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java

@@ -47,7 +47,7 @@ import org.springframework.transaction.support.TransactionTemplate;
 
 /**
  * Integration tests testing the {@link SimpleGemfireRepository} class and SDC Repository abstraction implementation
- * in the context of GemFire "Cache" Transactions.
+ * in the context of Pivotal GemFire"Cache" Transactions.
  *
  * @author John Blum
  * @see org.junit.Test
@@ -80,7 +80,8 @@ public class SimpleGemfireRepositoryTransactionalIntegrationTest {
 
 	@Before
 	public void setup() {
-		assertNotNull("The 'Customers' GemFire Cache Region was not properly configured and initialized!", customers);
+
+		assertNotNull("The 'Customers' Cache Region was not properly configured and initialized!", customers);
 		assertEquals("Customers", customers.getName());
 		assertEquals("/Customers", customers.getFullPath());
 		assertTrue(customers.isEmpty());
@@ -93,7 +94,8 @@ public class SimpleGemfireRepositoryTransactionalIntegrationTest {
 
 	@Test
 	public void testDeleteAll() {
-		Collection<Customer> expectedCustomers = new ArrayList<Customer>(4);
+
+		Collection<Customer> expectedCustomers = new ArrayList<>(4);
 
 		expectedCustomers.add(createCustomer("Jon", "Doe"));
 		expectedCustomers.add(createCustomer("Jane", "Doe"));
@@ -122,14 +124,13 @@ public class SimpleGemfireRepositoryTransactionalIntegrationTest {
 
 	public static class SerializableCustomer extends Customer implements Serializable {
 
-		public SerializableCustomer() {
-		}
+		public SerializableCustomer() { }
 
-		public SerializableCustomer(final Long id) {
+		public SerializableCustomer(Long id) {
 			super(id);
 		}
 
-		public SerializableCustomer(final String firstName, final String lastName) {
+		public SerializableCustomer(String firstName, String lastName) {
 			super(firstName, lastName);
 		}
 	}
@@ -150,7 +151,7 @@ public class SimpleGemfireRepositoryTransactionalIntegrationTest {
 
 		void saveAll(final Iterable<Customer> customers) {
 			transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-				@Override protected void doInTransactionWithoutResult(final TransactionStatus status) {
+				@Override  protected void doInTransactionWithoutResult(TransactionStatus status) {
 					customerRepository.saveAll(customers);
 				}
 			});
@@ -158,7 +159,7 @@ public class SimpleGemfireRepositoryTransactionalIntegrationTest {
 
 		void removeAllCausingTransactionRollback() {
 			transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-				@Override protected void doInTransactionWithoutResult(final TransactionStatus status) {
+				@Override protected void doInTransactionWithoutResult(TransactionStatus status) {
 					removeAll();
 					throw new IllegalStateException("'removeAll' operation not permitted");
 				}
@@ -167,7 +168,7 @@ public class SimpleGemfireRepositoryTransactionalIntegrationTest {
 
 		void removeAll() {
 			transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-				@Override protected void doInTransactionWithoutResult(final TransactionStatus status) {
+				@Override protected void doInTransactionWithoutResult(TransactionStatus status) {
 					customerRepository.deleteAll();
 				}
 			});

src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java

@@ -54,7 +54,7 @@ import org.springframework.util.StringUtils;
 /**
  * The SnapshotApplicationEventTriggeredImportsExportsIntegrationTest class is a test suite of test cases testing
  * the effects of the SnapshotServiceFactoryBean using Spring ApplicationEvents to trigger imports and exports
- * of GemFire Cache Region data.
+ * of Pivotal GemFireCache Region data.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java

@@ -205,7 +205,7 @@ public class SnapshotServiceFactoryBeanTest {
 
 		exception.expect(IllegalArgumentException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
-		exception.expectMessage("The GemFire Cache must not be null");
+		exception.expectMessage("Cache must not be null");
 
 		factoryBean.setCache(null);
 	}
@@ -215,7 +215,7 @@ public class SnapshotServiceFactoryBeanTest {
 
 		exception.expect(IllegalStateException.class);
 		exception.expectCause(is(nullValue(Throwable.class)));
-		exception.expectMessage("The GemFire Cache was not properly initialized");
+		exception.expectMessage("The cache was not properly initialized");
 
 		factoryBean.getCache();
 	}

src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java

@@ -40,7 +40,7 @@ import org.springframework.util.FileCopyUtils;
 
 /**
  * The SnapshotServiceImportExportIntegrationTest class is a test suite of test cases testing the import and export
- * of GemFire Cache Region data configured with SDG's Data Namespace >gfe-data:snapshot-service< (XML) element.
+ * of Pivotal GemFireCache Region data configured with SDG's Data Namespace >gfe-data:snapshot-service< (XML) element.
  *
  * @author John Blum
  * @see org.junit.Test

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

@@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException;
 
 /**
  * The ConnectionEndpointTest class is a test suite of test cases testing the contract and functionality
- * of the ConnectionEndpoint class representing GemFire Socket connection endpoints to GemFire services
+ * of the ConnectionEndpoint class representing Pivotal GemFireSocket connection endpoints to Pivotal GemFire'services
  * (such as Locators, etc).
  *
  * @author John Blum

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

@@ -35,8 +35,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Integration test to test the functionality of a GemFire Function implementing the Spring Data GemFire
- * {@link LazyWiringDeclarableSupport} class, defined using native GemFire configuration meta-data
+ * Integration test to test the functionality of a Pivotal GemFireFunction implementing the SDG
+ * {@link LazyWiringDeclarableSupport} class, defined using native Pivotal GemFireconfiguration meta-data
  * (i.e {@literal cache.xml}).
  *
  * @author John Blum
@@ -146,7 +146,7 @@ public class LazyWiringDeclarableSupportFunctionBasedIntegrationTests {
 			context.getResultSender().lastResult(formatHelloGreeting(addressTo(context)));
 		}
 
-		// precedence is... 1. Caller 2. GemFire 3. Spring
+		// precedence is... 1. Caller 2. Pivotal GemFire3. Spring
 		protected String addressTo(FunctionContext context) {
 			Object arguments = context.getArguments();
 			String addressTo = null;

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

@@ -127,7 +127,7 @@ public class SpringContextBootstrappingInitializerIntegrationTest {
 				System.out.printf("Closing Cache...%n");
 				cache.close();
 
-				// Now, wait for the GemFire Hog to shutdown, OIY!
+				// Now, wait for the Pivotal GemFireHog to shutdown, OIY!
 				synchronized (MUTEX_LOCK) {
 					while (!cache.isClosed()) {
 						try {
@@ -162,8 +162,8 @@ public class SpringContextBootstrappingInitializerIntegrationTest {
 			//.set("jmx-manager-start", GEMFIRE_JMX_MANAGER_START)
 			.create();
 
-		assertNotNull("The GemFire Cache was not properly created and initialized!", gemfireCache);
-		assertFalse("The GemFire Cache is closed!", gemfireCache.isClosed());
+		assertNotNull("The cache was not properly created and initialized", gemfireCache);
+		assertFalse("The cache is closed", gemfireCache.isClosed());
 
 		Set<Region<?, ?>> rootRegions = gemfireCache.rootRegions();
 
@@ -178,7 +178,7 @@ public class SpringContextBootstrappingInitializerIntegrationTest {
 		assertNotNull(applicationContext);
 		assertTrue(applicationContext.containsBean(GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME));
 		assertTrue(applicationContext.containsBean("TestRegion"));
-		assertFalse(applicationContext.containsBean("Users")); // Region 'Users' is defined in GemFire cache.xml
+		assertFalse(applicationContext.containsBean("Users")); // Region 'Users' is defined in Pivotal GemFirecache.xml
 		assertTrue(applicationContext.containsBean("userDataSource"));
 		assertTrue(applicationContext.containsBean("userDao"));
 		assertTrue(applicationContext.containsBean("userService"));
@@ -190,7 +190,7 @@ public class SpringContextBootstrappingInitializerIntegrationTest {
 		assertSame(userDataSource, userDao.getDataSource());
 		assertSame(userDao, userService.getUserDao());
 
-		// NOTE a GemFire declared component initialized by Spring!
+		// NOTE a Pivotal GemFiredeclared component initialized by Spring!
 		UserDataStoreCacheLoader usersCacheLoader = UserDataStoreCacheLoader.getInstance();
 
 		assertSame(userDataSource, usersCacheLoader.getDataSource());

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

@@ -20,7 +20,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.util.StringUtils;
 
 /**
- * Spring {@link ApplicationContextInitializer} used to configure the Spring Data GemFire test suite
+ * Spring {@link ApplicationContextInitializer} used to configure the SDG test suite
  * with mocking enabled or disabled.
  *
  * @author David Turanski
@@ -40,10 +40,11 @@ public class GemfireTestApplicationContextInitializer implements ApplicationCont
 	 */
 	@Override
 	public void initialize(ConfigurableApplicationContext applicationContext) {
+
 		String gemfireTestRunnerDisabled = System.getProperty(GEMFIRE_TEST_RUNNER_DISABLED, Boolean.FALSE.toString());
 
 		if (isGemFireTestRunnerDisabled(gemfireTestRunnerDisabled)) {
-			log.warn(String.format("WARNING - Mocks disabled; Using real GemFire components (%1$s = %2$s)",
+			log.warn(String.format("WARNING - Mocks disabled; Using real Pivotal GemFire objects [%1$s = %2$s]",
 				GEMFIRE_TEST_RUNNER_DISABLED, gemfireTestRunnerDisabled));
 		}
 		else {
@@ -51,8 +52,8 @@ public class GemfireTestApplicationContextInitializer implements ApplicationCont
 		}
 	}
 
-	/* (non-Javadoc) */
 	private boolean isGemFireTestRunnerDisabled(String systemPropertyValue) {
+
 		return (Boolean.valueOf(StringUtils.trimAllWhitespace(systemPropertyValue))
 			|| "yes".equalsIgnoreCase(systemPropertyValue)
 			|| "y".equalsIgnoreCase(systemPropertyValue));

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

@@ -71,7 +71,7 @@ public class MockRegionFactory<K, V> {
 		attributesFactory = (attributes != null ? new org.apache.geode.cache.AttributesFactory<K,V>(attributes)
 			: new org.apache.geode.cache.AttributesFactory<K,V>());
 
-		// Workaround for GemFire bug???
+		// Workaround for Pivotal GemFirebug???
 		if (attributes != null) {
 			attributesFactory.setLockGrantor(attributes.isLockGrantor());
 		}

src/test/java/org/springframework/data/gemfire/test/mock/GemFireMockObjectsSupport.java

@@ -138,7 +138,7 @@ import org.springframework.util.Assert;
 
 /**
  * The {@link GemFireMockObjectsSupport} class is an abstract base class encapsulating factory methods for creating
- * Mock GemFire Objects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, etc).
+ * Mock Pivotal GemFireObjects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, etc).
  *
  * @author John Blum
  * @see org.apache.geode.cache.Cache
@@ -395,10 +395,10 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
 	}
 
 	/**
-	 * Resolves the single, remembered {@link GemFireCache} if using GemFire in Singleton-mode.
+	 * Resolves the single, remembered {@link GemFireCache} if using Pivotal GemFirein Singleton-mode.
 	 *
 	 * @param <T> {@link Class sub-type} of the {@link GemFireCache} instance.
-	 * @param useSingletonCache boolean value indicating if mock infrastructure is using GemFire Singletons.
+	 * @param useSingletonCache boolean value indicating if mock infrastructure is using Pivotal GemFireSingletons.
 	 * @return an {@link Optional}, single remembered instance of the {@link GemFireCache}.
 	 * @see org.apache.geode.cache.GemFireCache
 	 */

src/test/java/org/springframework/data/gemfire/test/mock/annotation/EnableGemFireMockObjects.java

@@ -27,7 +27,7 @@ import org.apache.geode.cache.GemFireCache;
 import org.springframework.context.annotation.Import;
 
 /**
- * The {@link EnableGemFireMockObjects} annotation enables mocking of GemFire Objects in Unit Tests.
+ * The {@link EnableGemFireMockObjects} annotation enables mocking of Pivotal GemFireObjects in Unit Tests.
  *
  * @author John Blum
  * @see java.lang.annotation.Documented

src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireMockObjectsConfiguration.java

@@ -31,7 +31,7 @@ import org.springframework.data.gemfire.test.mock.config.GemFireMockObjectsBeanP
 
 /**
  * The {@link GemFireMockObjectsConfiguration} class is a Spring {@link Configuration @Configuration} class
- * containing bean definitions to configure GemFire Object mocking.
+ * containing bean definitions to configure Pivotal GemFireObject mocking.
  *
  * @author John Blum
  * @see java.lang.annotation.Annotation

src/test/java/org/springframework/data/gemfire/test/mock/annotation/GemFireUnitTest.java

@@ -29,8 +29,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * The {@link GemFireUnitTest} annotation marks a test class as a GemFire Unit Test
- * with GemFire Object mocking enabled.
+ * The {@link GemFireUnitTest} annotation marks a test class as a Pivotal GemFireUnit Test
+ * with Pivotal GemFireObject mocking enabled.
  *
  * Additionally, this annotation enables Spring's {@link SpringRunner} JUnit Runner implementation
  * using JUnit's {@link RunWith} annotation.

src/test/java/org/springframework/data/gemfire/test/mock/config/GemFireMockObjectsBeanPostProcessor.java

@@ -35,7 +35,7 @@ import org.springframework.lang.Nullable;
 
 /**
  * The {@link GemFireMockObjectsBeanPostProcessor} class is a Spring {@link BeanPostProcessor} that applies
- * mocks and spies to Spring Data GemFire / Spring Data Geode and Pivotal GemFire / Apache Geode objects
+ * mocks and spies to SDG / Spring Data Geode and Pivotal GemFire / Apache Geode objects
  * and components.
  *
  * @author John Blum

src/test/java/org/springframework/data/gemfire/test/mock/context/GemFireMockObjectsApplicationContextInitializer.java

@@ -22,7 +22,7 @@ import org.springframework.data.gemfire.test.mock.config.GemFireMockObjectsBeanP
 
 /**
  * The {@link GemFireMockObjectsApplicationContextInitializer} class is a Spring {@link ApplicationContextInitializer}
- * used to initialize the Spring {@link ConfigurableApplicationContext} with GemFire Object mocking.
+ * used to initialize the Spring {@link ConfigurableApplicationContext} with Pivotal GemFireObject mocking.
  *
  * @author John Blum
  * @see org.springframework.context.ApplicationContextInitializer

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

@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 
 /**
  * The AbstractGemFireClientServerIntegrationTest class is an abstract test suite base class encapsulating functionality
- * common to all test classes implementing GemFire client/server test cases.
+ * common to all test classes implementing Pivotal GemFireclient/server test cases.
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.fork.ServerProcess
@@ -88,9 +88,6 @@ public abstract class AbstractGemFireClientServerIntegrationTest {
 
 		waitForServerToStart(gemfireServerProcess, waitTimeInMilliseconds);
 
-		System.out.printf("The Spring-based, GemFire Cache Server process for %1$s should be running...%n",
-			testClass.getSimpleName());
-
 		return gemfireServerProcess;
 	}
 

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

@@ -22,7 +22,7 @@ import org.springframework.util.StringUtils;
 /**
  * {@link AbstractUnitAndIntegrationTestsWithMockSupport} is an abstract base class for test classes
  * having support for the creation and use of mock objects in test cases, but that may also be ran
- * as integration tests using actual GemFire components (e.g. Regions, etc).
+ * as integration tests using actual Pivotal GemFirecomponents (e.g. Regions, etc).
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer

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

@@ -38,7 +38,7 @@ import org.springframework.data.gemfire.util.CollectionUtils;
 
 /**
  * The {@link ClientServerIntegrationTestsSupport} class is a abstract base class encapsulating common functionality
- * to support the implementation of GemFire client/server tests.
+ * to support the implementation of Pivotal GemFireclient/server tests.
  *
  * @author John Blum
  * @see java.io.File

src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java

@@ -39,8 +39,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest class is a test suite
- * of test cases testing the concurrent, parallel functionality configuration of GemFire AsyncEventQueues
- * and GatewaySenders using Spring Data GemFire.
+ * of test cases testing the concurrent, parallel functionality configuration of Pivotal GemFireAsyncEventQueues
+ * and GatewaySenders using SDG.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java

@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * The ManualGatewayReceiverStartIntegrationTest class is a test suite of test cases testing the manual start capability
- * of Gateway Receivers when configured with the Spring Data GemFire XML namespace.
+ * of Gateway Receivers when configured with the SDG XML namespace.
  *
  * @author John Blum
  * @see org.junit.Test

src/test/resources/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests-context.xml

@@ -24,8 +24,8 @@
 
 	<!--
 	 TestComponent bean creation fails since the test class has a dependency on the TestComponent class, which has
-	 dependencies on all the GemFire native Regions defined in cache.xml, which have not been defined yet since
-	 the test class's dependency on TestComponent forces an early creation of TestComponent before the GemFire Cache
+	 dependencies on all the Pivotal GemFirenative Regions defined in cache.xml, which have not been defined yet since
+	 the test class's dependency on TestComponent forces an early creation of TestComponent before the Pivotal GemFireCache
 	 as been instantiated, configured and initialized.  Therefore, it does not matter what order the bean definitions
 	 are specified in the Spring context configuration meta-data, the developer must use the 'depends-on' attribute
 	 to force the correct initialization order.

src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml

@@ -21,7 +21,7 @@
 		<gfe:disk-dir location="./gemfire/subscription-disk-store" max-size="50"/>
 	</gfe:disk-store>
 
-	<!-- let the GemFire Cache Server port default to 40404 -->
+	<!-- let the Pivotal GemFireCache Server port default to 40404 -->
 	<gfe:cache-server id="testCacheServer" auto-startup="true" bind-address="localhost" groups="test-server"
 					  max-connections="1">
 		<gfe:subscription-config eviction-type="ENTRY" disk-store="testSubscriptionDiskStore" capacity="512"/>

src/test/resources/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest-context.xml

@@ -26,7 +26,7 @@
 	<gfe:client-region id="Example" pool-name="locatorPool" shortcut="PROXY"
 					   key-constraint="java.lang.String" value-constraint="java.lang.Integer"/>
 
-	<!-- Keep the definition of this GemFire Pool bean after the Region (Example) that depends on it! -->
+	<!-- Keep the definition of this Pivotal GemFirePool bean after the Region (Example) that depends on it! -->
 	<gfe:pool id="locatorPool" locators="${gemfire.cache.client.pool.locator.hosts-and-ports}"/>
 
 </beans>