DATACMNS-1762 - Reintroduce calls to ReactiveWrapperConverters.supports(…) after decoupling from QueryExecutionConverters.

We now consider reactive wrapper types in all areas that previously relied on QueryExecutionConverters to handle reactive type information correctly. Specifically, we call supports(…) and perform type unwrapping to ensure to detect the correct return type.

Author: mp911de

src/main/java/org/springframework/data/repository/core/support/AbstractRepositoryMetadata.java

@@ -109,11 +109,7 @@ public Class<?> getReturnedDomainClass(Method method) {
 
 		TypeInformation<?> returnType = getReturnType(method);
 
-		if (ReactiveWrapperConverters.supports(returnType.getType())) {
-			return ReactiveWrapperConverters.unwrapWrapperTypes(returnType).getType();
-		}
-
-		return ReactiveWrapperConverters.unwrapWrapperTypes(QueryExecutionConverters.unwrapWrapperTypes(returnType))
+		return QueryExecutionConverters.unwrapWrapperTypes(ReactiveWrapperConverters.unwrapWrapperTypes(returnType))
 				.getType();
 	}
 

src/main/java/org/springframework/data/repository/core/support/QueryExecutionResultHandler.java

@@ -126,7 +126,8 @@ Object postProcessInvocationResult(@Nullable Object result, int nestingLevel, Re
 
 		result = unwrapOptional(result);
 
-		if (QueryExecutionConverters.supports(expectedReturnType)) {
+		if (QueryExecutionConverters.supports(expectedReturnType)
+				|| ReactiveWrapperConverters.supports(expectedReturnType)) {
 
 			// For a wrapper type, try nested resolution first
 			result = postProcessInvocationResult(result, nestingLevel + 1, descriptor);

src/main/java/org/springframework/data/repository/query/Parameter.java

@@ -230,7 +230,7 @@ private static boolean isDynamicProjectionParameter(MethodParameter parameter) {
 		TypeInformation<Object> returnType = ClassTypeInformation.fromReturnTypeOf(method);
 
 		return bound
-				.equals(ReactiveWrapperConverters.unwrapWrapperTypes(QueryExecutionConverters.unwrapWrapperTypes(returnType)));
+				.equals(QueryExecutionConverters.unwrapWrapperTypes(ReactiveWrapperConverters.unwrapWrapperTypes(returnType)));
 	}
 
 	/**

src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java

@@ -21,6 +21,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.util.QueryExecutionConverters;
+import org.springframework.data.repository.util.ReactiveWrapperConverters;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -64,7 +65,8 @@ public ParametersParameterAccessor(Parameters<?, ?> parameters, Object[] values)
 	private static boolean requiresUnwrapping(Object[] values) {
 
 		for (Object value : values) {
-			if (value != null && QueryExecutionConverters.supports(value.getClass())) {
+			if (value != null && (QueryExecutionConverters.supports(value.getClass())
+					|| ReactiveWrapperConverters.supports(value.getClass()))) {
 				return true;
 			}
 		}

src/main/java/org/springframework/data/repository/query/QueryMethod.java

@@ -29,6 +29,7 @@
 import org.springframework.data.repository.core.EntityMetadata;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.util.QueryExecutionConverters;
+import org.springframework.data.repository.util.ReactiveWrapperConverters;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.Lazy;
 import org.springframework.data.util.TypeInformation;
@@ -271,7 +272,8 @@ private boolean calculateIsCollectionQuery() {
 	private static Class<? extends Object> potentiallyUnwrapReturnTypeFor(RepositoryMetadata metadata, Method method) {
 
 		TypeInformation<?> returnType = metadata.getReturnType(method);
-		if (QueryExecutionConverters.supports(returnType.getType())) {
+		if (QueryExecutionConverters.supports(returnType.getType())
+				|| ReactiveWrapperConverters.supports(returnType.getType())) {
 
 			// unwrap only one level to handle cases like Future<List<Entity>> correctly.
 

src/main/java/org/springframework/data/repository/util/ClassUtils.java

@@ -187,6 +187,8 @@ public static void unwrapReflectionException(Exception ex) throws Throwable {
 	private static TypeInformation<?> getEffectivelyReturnedTypeFrom(Method method) {
 
 		TypeInformation<?> returnType = ClassTypeInformation.fromReturnTypeOf(method);
-		return QueryExecutionConverters.supports(returnType.getType()) ? returnType.getRequiredComponentType() : returnType;
+		return QueryExecutionConverters.supports(returnType.getType())
+				|| ReactiveWrapperConverters.supports(returnType.getType()) ? returnType.getRequiredComponentType()
+						: returnType;
 	}
 }

src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java

@@ -28,6 +28,7 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -45,6 +46,7 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Maciek Opała
+ * @author Mark Paluch
  */
 class QueryMethodUnitTests {
 
@@ -208,7 +210,7 @@ void detectsWrapperWithinWrapper() throws Exception {
 	 * @see DATACMNS-940
 	 */
 	@Test
-	void detectsSinglValueWrapperWithinWrapper() throws Exception {
+	void detectsSingleValueWrapperWithinWrapper() throws Exception {
 
 		RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
 		Method method = SampleRepository.class.getMethod("returnsFutureOfOption");
@@ -234,6 +236,19 @@ void doesNotConsiderMethodForIterableAggregateACollectionQuery() throws Exceptio
 		assertThat(new QueryMethod(method, metadata, factory).isCollectionQuery()).isFalse();
 	}
 
+	@Test // DATACMNS-1762
+	void detectsReactiveSliceQuery() throws Exception {
+
+		RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
+		Method method = SampleRepository.class.getMethod("reactiveSlice");
+
+		QueryMethod queryMethod = new QueryMethod(method, repositoryMetadata, factory);
+		ReturnedType returnedType = queryMethod.getResultProcessor().getReturnedType();
+		assertThat(queryMethod.isSliceQuery()).isTrue();
+		assertThat(returnedType.getTypeToRead()).isEqualTo(User.class);
+		assertThat(returnedType.getDomainType()).isEqualTo(User.class);
+	}
+
 	interface SampleRepository extends Repository<User, Serializable> {
 
 		String pagingMethodWithInvalidReturnType(Pageable pageable);
@@ -278,6 +293,8 @@ interface SampleRepository extends Repository<User, Serializable> {
 		Future<Seq<User>> returnsFutureOfSeq();
 
 		Future<Option<User>> returnsFutureOfOption();
+
+		Mono<Slice<User>> reactiveSlice();
 	}
 
 	class User {