DATAMONGO-1444 - Adopt ReactiveWrappers refactoring.

Author: mp911de

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

@@ -38,10 +38,7 @@
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
 import org.springframework.data.repository.config.RepositoryConfigurationSource;
 import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
-import org.springframework.data.repository.query.ReactiveWrapperConverters;
-import org.springframework.data.repository.query.ReactiveWrappers;
-import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import org.springframework.data.repository.reactive.RxJavaCrudRepository;
+import org.springframework.data.repository.util.ReactiveWrappers;
 import org.w3c.dom.Element;
 
 /**

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

@@ -17,7 +17,7 @@
 
 import java.lang.reflect.Method;
 
-import org.springframework.data.repository.query.ReactiveWrappers;
+import org.springframework.data.repository.util.ReactiveWrappers;
 
 import lombok.experimental.UtilityClass;
 

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

@@ -32,9 +32,9 @@
 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.ReactiveWrapperConverters;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
+import org.springframework.data.repository.util.ReactiveWrapperConverters;
 import org.springframework.util.Assert;
 
 import reactor.core.publisher.Flux;

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

@@ -15,7 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import org.springframework.data.repository.query.ReactiveWrapperConverters;
+import org.springframework.data.repository.util.ReactiveWrapperConverters;
+import org.springframework.data.repository.util.ReactiveWrappers;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -47,11 +48,11 @@ public ReactiveMongoParameterAccessor(MongoQueryMethod method, Object[] values)
 				continue;
 			}
 
-			if (!ReactiveWrapperConverters.supports(value.getClass())) {
+			if (!ReactiveWrappers.supports(value.getClass())) {
 				continue;
 			}
 
-			if (ReactiveWrapperConverters.isSingleLike(value.getClass())) {
+			if (ReactiveWrappers.isSingleValueType(value.getClass())) {
 				subscriptions[i] = ReactiveWrapperConverters.toWrapper(value, Mono.class).subscribe();
 			} else {
 				subscriptions[i] = ReactiveWrapperConverters.toWrapper(value, Flux.class).collectList().subscribe();

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

@@ -28,9 +28,9 @@
 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.ReactiveWrappers;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
+import org.springframework.data.repository.util.ReactiveWrappers;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
 

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import static org.springframework.data.repository.query.ReactiveWrappers.*;
 import static org.springframework.data.repository.util.ClassUtils.*;
 
 import java.lang.reflect.Method;
@@ -30,7 +29,7 @@
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.query.ReactiveWrappers;
+import org.springframework.data.repository.util.ReactiveWrappers;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 
@@ -64,8 +63,8 @@ public ReactiveMongoQueryMethod(Method method, RepositoryMetadata metadata, Proj
 
 			TypeInformation<?> returnType = ClassTypeInformation.fromReturnTypeOf(method);
 
-			boolean multiWrapper = ReactiveWrappers.isMultiType(returnType.getType());
-			boolean singleWrapperWithWrappedPageableResult = ReactiveWrappers.isSingleType(returnType.getType())
+			boolean multiWrapper = ReactiveWrappers.isMultiValueType(returnType.getType());
+			boolean singleWrapperWithWrappedPageableResult = ReactiveWrappers.isSingleValueType(returnType.getType())
 					&& (PAGE_TYPE.isAssignableFrom(returnType.getComponentType())
 							|| SLICE_TYPE.isAssignableFrom(returnType.getComponentType()));
 
@@ -99,7 +98,7 @@ protected MongoParameters createParameters(Method method) {
 	 */
 	@Override
 	public boolean isCollectionQuery() {
-		return !(isPageQuery() || isSliceQuery()) && isMultiType(method.getReturnType());
+		return !(isPageQuery() || isSliceQuery()) && ReactiveWrappers.isMultiValueType(method.getReturnType());
 	}
 
 	/* 

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

@@ -39,7 +39,6 @@
 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.ReactiveWrapperConverters;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.data.repository.reactive.RxJavaCrudRepository;