Switching entityType for resultType

Author: oktupol

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java

@@ -93,7 +93,6 @@
  * @author Jens Schauder
  * @author Jose Luis Leon
  * @author Robert Heim
- * @author Sebastian Wieland
  * @since 1.1
  */
 public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAware, ApplicationContextAware {
@@ -820,15 +819,14 @@ public <T> RowsFetchSpec<T> getRowsFetchSpec(DatabaseClient.GenericExecuteSpec e
 
 		BiFunction<Row, RowMetadata, T> rowMapper;
 
-		if (simpleType) {
-			rowMapper = dataAccessStrategy.getRowMapper(resultType);
-		}
 		// Bridge-code: Consider Converter<Row, T> until we have fully migrated to RowDocument
-		else if (converter instanceof AbstractRelationalConverter relationalConverter
-				&& relationalConverter.getConversions().hasCustomReadTarget(Row.class, entityType)) {
+		if (converter instanceof AbstractRelationalConverter relationalConverter
+				&& relationalConverter.getConversions().hasCustomReadTarget(Row.class, resultType)) {
 
 			ConversionService conversionService = relationalConverter.getConversionService();
-			rowMapper = (row, rowMetadata) -> (T) conversionService.convert(row, entityType);
+			rowMapper = (row, rowMetadata) -> (T) conversionService.convert(row, resultType);
+		} else if (simpleType) {
+			rowMapper = dataAccessStrategy.getRowMapper(resultType);
 		} else {
 
 			EntityProjection<T, ?> projection = converter.introspectProjection(resultType, entityType);