DATAMONGO-1444 - Adopt changes in Spring Data Commons.

- Adopt RxJava to RxJava1 repository interface renaming.
- Remove ReactiveChunk, Slice and Page.
- Update documentation.
- Prevent sliced/paged query execution.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java

@@ -58,14 +58,14 @@ public interface ReactiveMongoOperations {
 	 *
 	 * @return index operations on the named collection
 	 */
-	ReactiveIndexOperations reactiveIndexOps(String collectionName);
+	ReactiveIndexOperations indexOps(String collectionName);
 
 	/**
 	 * Returns the reactive operations that can be performed on indexes
 	 *
 	 * @return index operations on the named collection associated with the given entity class
 	 */
-	ReactiveIndexOperations reactiveIndexOps(Class<?> entityClass);
+	ReactiveIndexOperations indexOps(Class<?> entityClass);
 
 	/**
 	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java

@@ -209,7 +209,7 @@ public ReactiveMongoTemplate(ReactiveMongoDatabaseFactory mongoDatabaseFactory,
 
 		if (null != mappingContext && mappingContext instanceof MongoMappingContext) {
 			indexCreator = new MongoPersistentEntityIndexCreator((MongoMappingContext) mappingContext,
-					(collectionName) -> IndexOperationsAdapter.blocking(reactiveIndexOps(collectionName)));
+					(collectionName) -> IndexOperationsAdapter.blocking(indexOps(collectionName)));
 			eventPublisher = new MongoMappingEventPublisher(indexCreator);
 			if (mappingContext instanceof ApplicationEventPublisherAware) {
 				((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
@@ -316,14 +316,14 @@ public MongoConverter getConverter() {
 	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#reactiveIndexOps(java.lang.String)
 	 */
-	public ReactiveIndexOperations reactiveIndexOps(String collectionName) {
+	public ReactiveIndexOperations indexOps(String collectionName) {
 		return new DefaultReactiveIndexOperations(this, collectionName);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#reactiveIndexOps(java.lang.Class)
 	 */
-	public ReactiveIndexOperations reactiveIndexOps(Class<?> entityClass) {
+	public ReactiveIndexOperations indexOps(Class<?> entityClass) {
 		return new DefaultReactiveIndexOperations(this, determineCollectionName(entityClass));
 	}
 

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

@@ -21,8 +21,8 @@
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.reactive.ReactivePagingAndSortingRepository;
 
+import org.springframework.data.repository.reactive.ReactiveSortingRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -33,7 +33,7 @@
  * @since 2.0
  */
 @NoRepositoryBean
-public interface ReactiveMongoRepository<T, ID extends Serializable> extends ReactivePagingAndSortingRepository<T, ID> {
+public interface ReactiveMongoRepository<T, ID extends Serializable> extends ReactiveSortingRepository<T, ID> {
 
 	/**
 	 * Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java

@@ -25,11 +25,9 @@
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.CollectionExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.DeleteExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.GeoNearExecution;
-import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.PagedExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.ResultProcessingConverter;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.ResultProcessingExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.SingleEntityExecution;
-import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.SlicedExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.TailExecution;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.repository.query.RepositoryQuery;
@@ -136,14 +134,10 @@ private ReactiveMongoQueryExecution getExecutionToWrap(MongoParameterAccessor ac
 			return new DeleteExecution(operations, method);
 		} else if (method.isGeoNearQuery()) {
 			return new GeoNearExecution(operations, accessor, method.getReturnType());
-		} else if (method.isSliceQuery()) {
-			return new SlicedExecution(operations, accessor.getPageable());
 		} else if (isInfiniteStream(method)) {
 			return new TailExecution(operations, accessor.getPageable());
 		} else if (method.isCollectionQuery()) {
 			return new CollectionExecution(operations, accessor.getPageable());
-		} else if (method.isPageQuery()) {
-			return new PagedExecution(operations, accessor.getPageable());
 		} else {
 			return new SingleEntityExecution(operations, isCountQuery());
 		}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java

@@ -26,8 +26,6 @@
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.repository.support.ReactivePageImpl;
-import org.springframework.data.mongodb.repository.support.ReactiveSliceImpl;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
 import org.springframework.data.repository.util.ReactiveWrappers;
@@ -87,61 +85,6 @@ public Object execute(Query query, Class<?> type, String collection) {
 		}
 	}
 
-	/**
-	 * {@link ReactiveMongoQueryExecution} for {@link Slice} query methods.
-	 *
-	 * @author Mark Paluch
-	 */
-	@RequiredArgsConstructor
-	final class SlicedExecution implements ReactiveMongoQueryExecution {
-
-		private final @NonNull ReactiveMongoOperations operations;
-		private final @NonNull Pageable pageable;
-
-		@Override
-		public Object execute(Query query, Class<?> type, String collection) {
-
-			int pageSize = pageable.getPageSize();
-
-			// Apply Pageable but tweak limit to peek into next page
-			Query modifiedQuery = query.with(pageable).limit(pageSize + 1);
-			Flux<?> flux = operations.find(modifiedQuery, type, collection);
-
-			return Mono.fromSupplier(() -> new ReactiveSliceImpl<>(flux, pageable));
-		}
-	}
-
-	/**
-	 * {@link ReactiveMongoQueryExecution} for pagination queries.
-	 *
-	 * @author Mark Paluch
-	 */
-	@RequiredArgsConstructor
-	final class PagedExecution implements ReactiveMongoQueryExecution {
-
-		private final @NonNull ReactiveMongoOperations operations;
-		private final @NonNull Pageable pageable;
-
-		@Override
-		public Object execute(Query query, Class<?> type, String collection) {
-
-			int overallLimit = query.getLimit();
-			Mono<Long> count = operations.count(query, type, collection);
-
-			// Apply raw pagination
-			query = query.with(pageable);
-
-			// Adjust limit if page would exceed the overall limit
-			if (overallLimit != 0 && pageable.getOffset() + pageable.getPageSize() > overallLimit) {
-				query.limit(overallLimit - pageable.getOffset());
-			}
-
-			Flux<?> flux = operations.find(query, type, collection);
-
-			return Mono.fromSupplier(() -> new ReactivePageImpl<>(flux, pageable, count));
-		}
-	}
-
 	/**
 	 * {@link ReactiveMongoQueryExecution} to return a single entity.
 	 *

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java

@@ -19,6 +19,7 @@
 
 import java.lang.reflect.Method;
 
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
@@ -34,6 +35,7 @@
 import org.springframework.data.repository.util.ReactiveWrappers;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
+import org.springframework.util.ClassUtils;
 
 /**
  * Reactive specific implementation of {@link MongoQueryMethod}.
@@ -71,6 +73,12 @@ public ReactiveMongoQueryMethod(Method method, RepositoryMetadata metadata, Proj
 					&& (PAGE_TYPE.isAssignableFrom(returnType.getComponentType())
 							|| SLICE_TYPE.isAssignableFrom(returnType.getComponentType()));
 
+			if (singleWrapperWithWrappedPageableResult) {
+				throw new InvalidDataAccessApiUsageException(
+						String.format("'%s.%s' must not use sliced or paged execution. Please use Flux.buffer(size, skip).",
+								ClassUtils.getShortName(method.getDeclaringClass()), method.getName()));
+			}
+
 			if (!multiWrapper && !singleWrapperWithWrappedPageableResult) {
 				throw new IllegalStateException(String.format(
 						"Method has to use a either multi-item reactive wrapper return type or a wrapped Page/Slice type. Offending method: %s",

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

@@ -42,7 +42,7 @@
 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.RxJavaCrudRepository;
+import org.springframework.data.repository.reactive.RxJava1CrudRepository;
 import org.springframework.data.repository.util.QueryExecutionConverters;
 import org.springframework.data.repository.util.ReactiveWrappers;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -92,7 +92,7 @@ protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 
 
 		boolean isReactiveRepository = (PROJECT_REACTOR_PRESENT && ReactiveCrudRepository.class.isAssignableFrom(metadata.getRepositoryInterface())) || (
-				   RXJAVA_OBSERVABLE_PRESENT && RxJavaCrudRepository.class.isAssignableFrom(metadata.getRepositoryInterface()));
+				   RXJAVA_OBSERVABLE_PRESENT && RxJava1CrudRepository.class.isAssignableFrom(metadata.getRepositoryInterface()));
 
 		boolean isQueryDslRepository = QUERY_DSL_PRESENT
 				&& QueryDslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());