DATAMONGO-1702 - Adopt to composable repositories.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java

@@ -36,13 +36,13 @@
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
+import org.springframework.data.repository.core.support.RepositoryFragment;
 import org.springframework.data.repository.query.EvaluationContextProvider;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import org.springframework.data.repository.reactive.RxJava1CrudRepository;
 import org.springframework.data.repository.util.QueryExecutionConverters;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.Assert;
@@ -88,25 +88,38 @@ public MongoRepositoryFactory(MongoOperations mongoOperations) {
 	 */
 	@Override
 	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
+		return SimpleMongoRepository.class;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryCompositition(org.springframework.data.repository.core.RepositoryMetadata)
+	 */
+	@Override
+	protected RepositoryComposition getRepositoryCompositition(RepositoryMetadata metadata) {
+
+		RepositoryComposition composition = super.getRepositoryCompositition(metadata);
 
-		boolean isReactiveRepository = (PROJECT_REACTOR_PRESENT
-				&& ReactiveCrudRepository.class.isAssignableFrom(metadata.getRepositoryInterface()))
-				|| (RXJAVA_OBSERVABLE_PRESENT
-						&& RxJava1CrudRepository.class.isAssignableFrom(metadata.getRepositoryInterface()));
+		RepositoryInformation information = getRepositoryInformation(metadata, composition);
 
 		boolean isQueryDslRepository = QUERY_DSL_PRESENT
 				&& QuerydslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());
 
-		if (isReactiveRepository) {
+		if (isQueryDslRepository) {
 
-			if (isQueryDslRepository) {
+			if (metadata.isReactiveRepository()) {
 				throw new InvalidDataAccessApiUsageException(
 						"Cannot combine Querydsl and reactive repository in one interface");
 			}
-			return SimpleReactiveMongoRepository.class;
+
+			MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType(),
+					information);
+
+			composition = composition.append(RepositoryFragment
+					.implemented(getTargetRepositoryViaReflection(QuerydslMongoRepository.class, entityInformation, operations)));
 		}
 
-		return isQueryDslRepository ? QuerydslMongoRepository.class : SimpleMongoRepository.class;
+		return composition;
 	}
 
 	/*
@@ -149,7 +162,7 @@ private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> doma
 
 	/**
 	 * {@link QueryLookupStrategy} to create {@link PartTreeMongoQuery} instances.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoRepository.java

@@ -52,8 +52,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-public class QuerydslMongoRepository<T, ID extends Serializable> extends SimpleMongoRepository<T, ID>
-		implements QuerydslPredicateExecutor<T> {
+public class QuerydslMongoRepository<T, ID extends Serializable> implements QuerydslPredicateExecutor<T> {
 
 	private final PathBuilder<T> builder;
 	private final EntityInformation<T, ID> entityInformation;
@@ -81,8 +80,6 @@ public QuerydslMongoRepository(MongoEntityInformation<T, ID> entityInformation,
 	public QuerydslMongoRepository(MongoEntityInformation<T, ID> entityInformation, MongoOperations mongoOperations,
 			EntityPathResolver resolver) {
 
-		super(entityInformation, mongoOperations);
-
 		Assert.notNull(resolver, "EntityPathResolver must not be null!");
 
 		EntityPath<T> path = resolver.createPath(entityInformation.getJavaType());
@@ -174,33 +171,6 @@ public Page<T> findAll(Predicate predicate, Pageable pageable) {
 				() -> createQueryFor(predicate).fetchCount());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.support.SimpleMongoRepository#findAll(org.springframework.data.domain.Pageable)
-	 */
-	@Override
-	public Page<T> findAll(Pageable pageable) {
-
-		Assert.notNull(pageable, "Pageable must not be null!");
-
-		AbstractMongodbQuery<T, SpringDataMongodbQuery<T>> query = createQuery();
-
-		return PageableExecutionUtils.getPage(applyPagination(query, pageable).fetchResults().getResults(), pageable,
-				() -> createQuery().fetchCount());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.support.SimpleMongoRepository#findAll(org.springframework.data.domain.Sort)
-	 */
-	@Override
-	public List<T> findAll(Sort sort) {
-
-		Assert.notNull(sort, "Sort must not be null!");
-
-		return applySorting(createQuery(), sort).fetchResults().getResults();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.mysema.query.types.Predicate)
@@ -237,7 +207,7 @@ private AbstractMongodbQuery<T, SpringDataMongodbQuery<T>> createQueryFor(Predic
 
 	/**
 	 * Creates a {@link MongodbQuery}.
-	 * 
+	 *
 	 * @return
 	 */
 	private AbstractMongodbQuery<T, SpringDataMongodbQuery<T>> createQuery() {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepository.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.custom;
+
+import org.springframework.data.mongodb.core.User;
+import org.springframework.data.repository.Repository;
+
+/**
+ * @author Mark Paluch
+ */
+public interface ComposedRepository extends Repository<User, String>, RepositoryMixin {
+
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepositoryImplementationTests.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.custom;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Integration tests for composed Repository implementations.
+ *
+ * @author Mark Paluch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class ComposedRepositoryImplementationTests {
+
+	@Configuration
+	@EnableMongoRepositories
+	@ImportResource("classpath:infrastructure.xml")
+	static class Config {}
+
+	@Autowired ComposedRepository composedRepository;
+
+	@Test // DATAMONGO-1702
+	public void shouldExecuteMethodOnCustomRepositoryImplementation() {
+		assertThat(composedRepository.getFoo()).isEqualTo("foo");
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixin.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.custom;
+
+/**
+ * @author Mark Paluch
+ */
+public interface RepositoryMixin {
+
+	String getFoo();
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixinImpl.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.repository.custom;
+
+/**
+ * @author Mark Paluch
+ */
+public class RepositoryMixinImpl implements RepositoryMixin {
+
+	@Override
+	public String getFoo() {
+		return "foo";
+	}
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QueryDslMongoRepositoryIntegrationTests.java

@@ -67,7 +67,7 @@ public void setup() {
 
 		person = new QPerson("person");
 
-		repository.saveAll(Arrays.asList(oliver, dave, carter));
+		operations.insertAll(Arrays.asList(oliver, dave, carter));
 	}
 
 	@Test // DATAMONGO-1146