diff --git a/mongodb/aggregation/pom.xml b/mongodb/aggregation/pom.xml new file mode 100644 index 00000000..58980a3a --- /dev/null +++ b/mongodb/aggregation/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + spring-data-mongodb-aggregation + + Spring Data MongoDB - Aggregation framework + + + org.springframework.data.examples + spring-data-mongodb-examples + 1.0.0.BUILD-SNAPSHOT + + + \ No newline at end of file diff --git a/mongodb/src/main/java/example/springdata/mongodb/ApplicationConfiguration.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/ApplicationConfiguration.java similarity index 96% rename from mongodb/src/main/java/example/springdata/mongodb/ApplicationConfiguration.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/ApplicationConfiguration.java index 577851b6..04b2a1ee 100644 --- a/mongodb/src/main/java/example/springdata/mongodb/ApplicationConfiguration.java +++ b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/ApplicationConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package example.springdata.mongodb; +package example.springdata.mongodb.shop; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Configuration; diff --git a/mongodb/src/main/java/example/springdata/mongodb/shop/Invoice.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/Invoice.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/shop/Invoice.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/Invoice.java diff --git a/mongodb/src/main/java/example/springdata/mongodb/shop/LineItem.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/LineItem.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/shop/LineItem.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/LineItem.java diff --git a/mongodb/src/main/java/example/springdata/mongodb/shop/Order.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/Order.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/shop/Order.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/Order.java diff --git a/mongodb/src/main/java/example/springdata/mongodb/shop/OrderRepository.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/OrderRepository.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/shop/OrderRepository.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/OrderRepository.java diff --git a/mongodb/src/main/java/example/springdata/mongodb/shop/OrderRepositoryCustom.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/OrderRepositoryCustom.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/shop/OrderRepositoryCustom.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/OrderRepositoryCustom.java diff --git a/mongodb/src/main/java/example/springdata/mongodb/shop/OrderRepositoryImpl.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/OrderRepositoryImpl.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/shop/OrderRepositoryImpl.java rename to mongodb/aggregation/src/main/java/example/springdata/mongodb/shop/OrderRepositoryImpl.java diff --git a/mongodb/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java b/mongodb/aggregation/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java similarity index 91% rename from mongodb/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java rename to mongodb/aggregation/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java index dcab593a..92bab42e 100644 --- a/mongodb/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java +++ b/mongodb/aggregation/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java @@ -25,11 +25,9 @@ import org.junit.Before; 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.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import example.springdata.mongodb.ApplicationConfiguration; - /** * Integration tests for {@link OrderRepository}. * @@ -37,7 +35,7 @@ import example.springdata.mongodb.ApplicationConfiguration; * @author Oliver Gierke */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = ApplicationConfiguration.class) +@SpringApplicationConfiguration(classes = ApplicationConfiguration.class) public class OrderRepositoryIntegrationTests { @Autowired OrderRepository repository; diff --git a/mongodb/src/test/resources/logback.xml b/mongodb/aggregation/src/test/resources/logback.xml similarity index 66% rename from mongodb/src/test/resources/logback.xml rename to mongodb/aggregation/src/test/resources/logback.xml index e5b225a3..39985cc4 100644 --- a/mongodb/src/test/resources/logback.xml +++ b/mongodb/aggregation/src/test/resources/logback.xml @@ -7,8 +7,7 @@ - - + diff --git a/mongodb/geo-spatial/pom.xml b/mongodb/geo-spatial/pom.xml new file mode 100644 index 00000000..65e3949e --- /dev/null +++ b/mongodb/geo-spatial/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + spring-data-mongodb-geospatial + + Spring Data MongoDB - Geo-spatial & Queryldsl + + + org.springframework.data.examples + spring-data-mongodb-examples + 1.0.0.BUILD-SNAPSHOT + + + + + + com.mysema.maven + apt-maven-plugin + ${apt.version} + + + com.mysema.querydsl + querydsl-apt + ${querydsl.version} + + + + + generate-sources + + process + + + target/generated-sources/annotations + org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor + true + + + + + + + + \ No newline at end of file diff --git a/mongodb/src/main/java/example/springdata/mongodb/customer/Address.java b/mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/Address.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/customer/Address.java rename to mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/Address.java diff --git a/mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/ApplicationConfiguration.java b/mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/ApplicationConfiguration.java new file mode 100644 index 00000000..97fa329a --- /dev/null +++ b/mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/ApplicationConfiguration.java @@ -0,0 +1,31 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package example.springdata.mongodb.customer; + +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Configuration; + +import com.mongodb.MongoClient; + +/** + * Test configuration to connect to a MongoDB named "test" and using a {@link MongoClient}. Also enables Spring Data + * repositories for MongoDB. + * + * @author Oliver Gierke + */ +@Configuration +@EnableAutoConfiguration +public class ApplicationConfiguration {} diff --git a/mongodb/src/main/java/example/springdata/mongodb/customer/Customer.java b/mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/Customer.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/customer/Customer.java rename to mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/Customer.java diff --git a/mongodb/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java b/mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java similarity index 100% rename from mongodb/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java rename to mongodb/geo-spatial/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java diff --git a/mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java b/mongodb/geo-spatial/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java similarity index 95% rename from mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java rename to mongodb/geo-spatial/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java index 8c787efc..ed80302d 100644 --- a/mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java +++ b/mongodb/geo-spatial/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java @@ -24,6 +24,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.data.geo.Distance; import org.springframework.data.geo.GeoResults; import org.springframework.data.geo.Metrics; @@ -31,18 +32,15 @@ import org.springframework.data.geo.Point; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.index.GeospatialIndex; import org.springframework.data.querydsl.QSort; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import example.springdata.mongodb.ApplicationConfiguration; - /** * Integration test for {@link CustomerRepository}. * * @author Oliver Gierke */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = ApplicationConfiguration.class) +@SpringApplicationConfiguration(classes = ApplicationConfiguration.class) public class CustomerRepositoryIntegrationTest { @Autowired CustomerRepository repository; diff --git a/mongodb/pom.xml b/mongodb/pom.xml index f631c66f..f084df79 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-data-mongodb-example - - Spring Data MongoDB - Example + spring-data-mongodb-examples + pom org.springframework.data.examples @@ -12,6 +11,16 @@ 1.0.0.BUILD-SNAPSHOT + Spring Data MongoDB - Examples + Sample projects for Spring Data MongoDB + http://projects.spring.io/spring-data-mongodb + 2011-2014 + + + geo-spatial + aggregation + + @@ -32,34 +41,4 @@ - - - - com.mysema.maven - apt-maven-plugin - ${apt.version} - - - com.mysema.querydsl - querydsl-apt - ${querydsl.version} - - - - - generate-sources - - process - - - target/generated-sources/annotations - org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor - true - - - - - - - \ No newline at end of file diff --git a/multi-store/pom.xml b/multi-store/pom.xml index 1e8da1d1..44c02a93 100644 --- a/multi-store/pom.xml +++ b/multi-store/pom.xml @@ -4,7 +4,7 @@ spring-data-multi-store-example - Spring Data MongoDB - Example + Spring Data - Multi-store example org.springframework.data.examples diff --git a/pom.xml b/pom.xml index db333e88..cc31c79e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,9 @@ + multi-store jpa mongodb - multi-store rest