DATAREST-1475 - Migrate GemFire tests to Geode.

The GemFire module is now a submodule of Spring Data for Apache Geode so we're now testing against the Geode toplevel module.
spring-projects · Jan 16, 2020 · 52104eb · 52104eb
1 parent 086f6c2
commit 52104eb
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 		<springdata.commons>2.3.0.BUILD-SNAPSHOT</springdata.commons>
 		<springdata.jpa>2.3.0.BUILD-SNAPSHOT</springdata.jpa>
 		<springdata.mongodb>3.0.0.BUILD-SNAPSHOT</springdata.mongodb>
-		<springdata.gemfire>2.3.0.BUILD-SNAPSHOT</springdata.gemfire>
+		<springdata.geode>2.3.0.BUILD-SNAPSHOT</springdata.geode>
 		<springdata.solr>4.2.0.BUILD-SNAPSHOT</springdata.solr>
 		<springdata.cassandra>3.0.0.BUILD-SNAPSHOT</springdata.cassandra>
 		<springdata.keyvalue>2.3.0.BUILD-SNAPSHOT</springdata.keyvalue>

diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml
@@ -15,7 +15,7 @@
 
 	<modules>
 		<module>spring-data-rest-tests-core</module>
-		<module>spring-data-rest-tests-gemfire</module>
+		<module>spring-data-rest-tests-geode</module>
 		<module>spring-data-rest-tests-jpa</module>
 		<module>spring-data-rest-tests-mongodb</module>
 		<module>spring-data-rest-tests-security</module>

diff --git a/...ts/spring-data-rest-tests-gemfire/pom.xml → ...ests/spring-data-rest-tests-geode/pom.xml b/...ts/spring-data-rest-tests-gemfire/pom.xml → ...ests/spring-data-rest-tests-geode/pom.xml
@@ -25,8 +25,8 @@
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-gemfire</artifactId>
-			<version>${springdata.gemfire}</version>
+			<artifactId>spring-data-geode</artifactId>
+			<version>${springdata.geode}</version>
 		</dependency>
 
 	</dependencies>

diff --git a/...sts/gemfire/AbstractPersistentEntity.java → ...tests/geode/AbstractPersistentEntity.java b/...sts/gemfire/AbstractPersistentEntity.java → ...tests/geode/AbstractPersistentEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.data.annotation.Id;
 

diff --git a/...work/data/rest/tests/gemfire/Address.java → ...mework/data/rest/tests/geode/Address.java b/...work/data/rest/tests/gemfire/Address.java → ...mework/data/rest/tests/geode/Address.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.util.Assert;
 

diff --git a/...ork/data/rest/tests/gemfire/Customer.java → ...ework/data/rest/tests/geode/Customer.java b/...ork/data/rest/tests/gemfire/Customer.java → ...ework/data/rest/tests/geode/Customer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.Collections;
 import java.util.HashSet;

diff --git a/...est/tests/gemfire/CustomerRepository.java → .../rest/tests/geode/CustomerRepository.java b/...est/tests/gemfire/CustomerRepository.java → .../rest/tests/geode/CustomerRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.List;
 

diff --git a/...data/rest/tests/gemfire/EmailAddress.java → ...k/data/rest/tests/geode/EmailAddress.java b/...data/rest/tests/gemfire/EmailAddress.java → ...k/data/rest/tests/geode/EmailAddress.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.regex.Pattern;
 

diff --git a/...ork/data/rest/tests/gemfire/LineItem.java → ...ework/data/rest/tests/geode/LineItem.java b/...ork/data/rest/tests/gemfire/LineItem.java → ...ework/data/rest/tests/geode/LineItem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.math.BigDecimal;
 

diff --git a/...mework/data/rest/tests/gemfire/Order.java → ...ramework/data/rest/tests/geode/Order.java b/...mework/data/rest/tests/gemfire/Order.java → ...ramework/data/rest/tests/geode/Order.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -37,7 +37,7 @@ public class Order extends AbstractPersistentEntity {
 	private Set<LineItem> lineItems = new HashSet<LineItem>();
 
 	/**
-	 * Creates a new {@link Order} for the given {@link org.springframework.data.rest.tests.gemfire.Customer}.
+	 * Creates a new {@link Order} for the given {@link org.springframework.data.rest.tests.geode.Customer}.
 	 *
 	 * @param id order ID
 	 * @param customerId must not be {@literal null}.
@@ -64,7 +64,7 @@ public void add(LineItem lineItem) {
 	}
 
 	/**
-	 * Returns the id of the {@link org.springframework.data.rest.tests.gemfire.Customer} who placed the
+	 * Returns the id of the {@link org.springframework.data.rest.tests.geode.Customer} who placed the
 	 * {@link Order}.
 	 *
 	 * @return

diff --git a/...a/rest/tests/gemfire/OrderRepository.java → ...ata/rest/tests/geode/OrderRepository.java b/...a/rest/tests/gemfire/OrderRepository.java → ...ata/rest/tests/geode/OrderRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.List;
 

diff --git a/...work/data/rest/tests/gemfire/Product.java → ...mework/data/rest/tests/geode/Product.java b/...work/data/rest/tests/gemfire/Product.java → ...mework/data/rest/tests/geode/Product.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.math.BigDecimal;
 import java.util.Collections;

diff --git a/...rest/tests/gemfire/ProductRepository.java → ...a/rest/tests/geode/ProductRepository.java b/...rest/tests/gemfire/ProductRepository.java → ...a/rest/tests/geode/ProductRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import java.util.List;
 

diff --git a/...ests/gemfire/GemfireRepositoryConfig.java → ...st/tests/geode/GeodeRepositoryConfig.java b/...ests/gemfire/GemfireRepositoryConfig.java → ...st/tests/geode/GeodeRepositoryConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,7 +32,7 @@
 @Configuration
 @ImportResource("classpath:META-INF/spring/cache-config.xml")
 @EnableGemfireRepositories
-public class GemfireRepositoryConfig {
+public class GeodeRepositoryConfig {
 
 	/**
 	 * TODO: Remove, once Spring Data Gemfire exposes a mapping context.
@@ -43,7 +43,7 @@ public GemfireMappingContext gemfireMappingContext() {
 		AnnotatedTypeScanner scanner = new AnnotatedTypeScanner(Region.class);
 
 		GemfireMappingContext context = new GemfireMappingContext();
-		context.setInitialEntitySet(scanner.findTypes(GemfireRepositoryConfig.class.getPackage().getName()));
+		context.setInitialEntitySet(scanner.findTypes(GeodeRepositoryConfig.class.getPackage().getName()));
 		context.initialize();
 
 		return context;

diff --git a/...a/rest/tests/gemfire/GemfireWebTests.java → .../data/rest/tests/geode/GeodeWebTests.java b/...a/rest/tests/gemfire/GemfireWebTests.java → .../data/rest/tests/geode/GeodeWebTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.tests.gemfire;
+package org.springframework.data.rest.tests.geode;
 
 import org.springframework.data.rest.tests.CommonWebTests;
 import org.springframework.hateoas.LinkRelation;
@@ -22,8 +22,8 @@
 /**
  * @author Oliver Gierke
  */
-@ContextConfiguration(classes = GemfireRepositoryConfig.class)
-public class GemfireWebTests extends CommonWebTests {
+@ContextConfiguration(classes = GeodeRepositoryConfig.class)
+public class GeodeWebTests extends CommonWebTests {
 
 	/*
 	 * (non-Javadoc)

diff --git a/...esources/META-INF/spring/cache-config.xml → ...esources/META-INF/spring/cache-config.xml b/...esources/META-INF/spring/cache-config.xml → ...esources/META-INF/spring/cache-config.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:gfe="http://www.springframework.org/schema/gemfire"
-       xsi:schemaLocation="http://www.springframework.org/schema/gemfire https://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+       xmlns:geode="http://www.springframework.org/schema/geode"
+       xsi:schemaLocation="http://www.springframework.org/schema/geode https://www.springframework.org/schema/geode/spring-geode.xsd
        http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-  <gfe:cache use-bean-factory-locator="false"/>
+  <geode:cache use-bean-factory-locator="false"/>
 
-  <gfe:replicated-region id="Customer"/>
-  <gfe:replicated-region id="Order"/>
-  <gfe:replicated-region id="Product"/>
+  <geode:replicated-region id="Customer"/>
+  <geode:replicated-region id="Order"/>
+  <geode:replicated-region id="Product"/>
 
 </beans>