From 52104eb662580a57c14ea721996a81199f2549b3 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 Jan 2020 10:47:22 +0100 Subject: [PATCH] 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. --- pom.xml | 2 +- spring-data-rest-tests/pom.xml | 2 +- .../pom.xml | 4 ++-- .../rest/tests/geode}/AbstractPersistentEntity.java | 2 +- .../data/rest/tests/geode}/Address.java | 2 +- .../data/rest/tests/geode}/Customer.java | 2 +- .../data/rest/tests/geode}/CustomerRepository.java | 2 +- .../data/rest/tests/geode}/EmailAddress.java | 2 +- .../data/rest/tests/geode}/LineItem.java | 2 +- .../data/rest/tests/geode}/Order.java | 6 +++--- .../data/rest/tests/geode}/OrderRepository.java | 2 +- .../data/rest/tests/geode}/Product.java | 2 +- .../data/rest/tests/geode}/ProductRepository.java | 2 +- .../rest/tests/geode/GeodeRepositoryConfig.java} | 6 +++--- .../data/rest/tests/geode/GeodeWebTests.java} | 6 +++--- .../test/resources/META-INF/spring/cache-config.xml | 12 ++++++------ 16 files changed, 28 insertions(+), 28 deletions(-) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire => spring-data-rest-tests-geode}/pom.xml (90%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/AbstractPersistentEntity.java (96%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/Address.java (97%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/Customer.java (98%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/CustomerRepository.java (96%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/EmailAddress.java (98%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/LineItem.java (97%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/Order.java (95%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/OrderRepository.java (94%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/Product.java (98%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire => spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode}/ProductRepository.java (96%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java => spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeRepositoryConfig.java} (89%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java => spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java} (86%) rename spring-data-rest-tests/{spring-data-rest-tests-gemfire => spring-data-rest-tests-geode}/src/test/resources/META-INF/spring/cache-config.xml (53%) diff --git a/pom.xml b/pom.xml index 2d786093e..719a22cd4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.3.0.BUILD-SNAPSHOT 2.3.0.BUILD-SNAPSHOT 3.0.0.BUILD-SNAPSHOT - 2.3.0.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT 4.2.0.BUILD-SNAPSHOT 3.0.0.BUILD-SNAPSHOT 2.3.0.BUILD-SNAPSHOT diff --git a/spring-data-rest-tests/pom.xml b/spring-data-rest-tests/pom.xml index 3563f587b..57bcfe17f 100644 --- a/spring-data-rest-tests/pom.xml +++ b/spring-data-rest-tests/pom.xml @@ -15,7 +15,7 @@ spring-data-rest-tests-core - spring-data-rest-tests-gemfire + spring-data-rest-tests-geode spring-data-rest-tests-jpa spring-data-rest-tests-mongodb spring-data-rest-tests-security diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-geode/pom.xml similarity index 90% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml rename to spring-data-rest-tests/spring-data-rest-tests-geode/pom.xml index 7f862eb3c..a4d6fba8f 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/pom.xml @@ -25,8 +25,8 @@ org.springframework.data - spring-data-gemfire - ${springdata.gemfire} + spring-data-geode + ${springdata.geode} diff --git a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/AbstractPersistentEntity.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java similarity index 96% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/AbstractPersistentEntity.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/AbstractPersistentEntity.java index 755b17834..e94aa7bd8 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/AbstractPersistentEntity.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Address.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Address.java similarity index 97% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Address.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Address.java index 5b2a5d6ed..11ba69b00 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Address.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Customer.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Customer.java similarity index 98% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Customer.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Customer.java index b7a98b75e..088840f93 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Customer.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/CustomerRepository.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/CustomerRepository.java similarity index 96% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/CustomerRepository.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/CustomerRepository.java index f4e14b35d..d9d0f411d 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/CustomerRepository.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/EmailAddress.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java similarity index 98% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/EmailAddress.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/EmailAddress.java index 5f2b050ec..db39b453d 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/EmailAddress.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/LineItem.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/LineItem.java similarity index 97% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/LineItem.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/LineItem.java index 3feb4ee23..0b38ced40 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/LineItem.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Order.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Order.java similarity index 95% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Order.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Order.java index 936236da3..997cb234f 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Order.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/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 lineItems = new HashSet(); /** - * 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 class Order extends AbstractPersistentEntity { } /** - * 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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/OrderRepository.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/OrderRepository.java similarity index 94% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/OrderRepository.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/OrderRepository.java index 24fa3def3..86c8960c7 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/OrderRepository.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Product.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Product.java similarity index 98% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Product.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/Product.java index 589e4e0d1..5d78e5c97 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/Product.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/ProductRepository.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/ProductRepository.java similarity index 96% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/ProductRepository.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/rest/tests/geode/ProductRepository.java index 6f9f7dd43..73af9d398 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/main/java/org/springframework/data/rest/tests/gemfire/ProductRepository.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/main/java/org/springframework/data/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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeRepositoryConfig.java similarity index 89% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeRepositoryConfig.java index 497f31d4c..f0a75be56 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireRepositoryConfig.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/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 @@ import org.springframework.data.util.AnnotatedTypeScanner; @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 class GemfireRepositoryConfig { 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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java similarity index 86% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/data/rest/tests/geode/GeodeWebTests.java index b275c9813..226fb7a20 100755 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/java/org/springframework/data/rest/tests/gemfire/GemfireWebTests.java +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/java/org/springframework/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 @@ import org.springframework.test.context.ContextConfiguration; /** * @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/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/resources/META-INF/spring/cache-config.xml b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/resources/META-INF/spring/cache-config.xml similarity index 53% rename from spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/resources/META-INF/spring/cache-config.xml rename to spring-data-rest-tests/spring-data-rest-tests-geode/src/test/resources/META-INF/spring/cache-config.xml index d7911f32c..5124f7039 100644 --- a/spring-data-rest-tests/spring-data-rest-tests-gemfire/src/test/resources/META-INF/spring/cache-config.xml +++ b/spring-data-rest-tests/spring-data-rest-tests-geode/src/test/resources/META-INF/spring/cache-config.xml @@ -1,14 +1,14 @@ - + - - - + + +