#421 - Polishing.

Simplify tests. Use ReflectionUtils.isVoid(…) where possible and simplify isVoid(…) flows.

Original pull request: #422.

Author: mp911de

src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java

@@ -144,10 +144,6 @@ private R2dbcQueryExecution getExecutionToWrap(ReturnedType returnedType) {
 				return (q, t, c) -> q.rowsUpdated().then();
 			}
 
-			if (KotlinDetector.isKotlinPresent() && Unit.class.isAssignableFrom(returnedType.getReturnedType())) {
-				return (q, t, c) -> q.rowsUpdated().thenReturn(Unit.INSTANCE);
-			}
-
 			return (q, t, c) -> q.rowsUpdated();
 		}
 

src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java

@@ -17,12 +17,9 @@
 
 import static org.springframework.data.repository.util.ClassUtils.*;
 
-import kotlin.Unit;
-
 import java.lang.reflect.Method;
 import java.util.Optional;
 
-import org.springframework.core.KotlinDetector;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Page;
@@ -45,6 +42,7 @@
 import org.springframework.data.repository.util.ReactiveWrappers;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.Lazy;
+import org.springframework.data.util.ReflectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -169,7 +167,7 @@ public RelationalEntityMetadata<?> getEntityInformation() {
 			Class<?> domainClass = getDomainClass();
 
 			if (ClassUtils.isPrimitiveOrWrapper(returnedObjectType)
-					|| KotlinDetector.isKotlinPresent() && Unit.class.isAssignableFrom(returnedObjectType)) {
+					|| ReflectionUtils.isVoid(returnedObjectType)) {
 
 				this.metadata = new SimpleRelationalEntityMetadata<>((Class<Object>) domainClass,
 						mappingContext.getRequiredPersistentEntity(domainClass));

src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java

@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import kotlin.Unit;
-
 import io.r2dbc.spi.ConnectionFactory;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -50,15 +48,14 @@
 import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
 import org.springframework.data.relational.core.mapping.Table;
 import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.reactive.ReactiveSortingRepository;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.reactive.TransactionalOperator;
 
 /**
  * Abstract base class for integration tests for {@link LegoSetRepository} using {@link R2dbcRepositoryFactory}.
  *
  * @author Mark Paluch
- * @author Stephen Cohen
  */
 public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcIntegrationTestSupport {
 
@@ -314,48 +311,14 @@ public void shouldDeleteAllAndReturnCount() {
 				.verifyComplete();
 	}
 
-	@Test // gh-421
-	public void shouldDeleteAndReturnSuccess() {
-
-		shouldInsertNewItems();
-
-		repository.deleteByManualAndReturnSuccess(12) //
-				.as(StepVerifier::create) //
-				.expectNext(true) //
-				.verifyComplete();
-
-		repository.findAll() //
-				.map(LegoSet::getManual) //
-				.as(StepVerifier::create) //
-				.expectNext(13) //
-				.verifyComplete();
-	}
-
-	@Test // gh-421
-	public void shouldDeleteAndReturnKotlinUnit() {
-
-		shouldInsertNewItems();
-
-		repository.deleteByManualAndReturnKotlinUnit(12) //
-				.as(StepVerifier::create) //
-				.expectNext(Unit.INSTANCE) //
-				.verifyComplete();
-
-		repository.findAll() //
-				.map(LegoSet::getManual) //
-				.as(StepVerifier::create) //
-				.expectNext(13) //
-				.verifyComplete();
-	}
-
 	private Condition<? super Object> numberOf(int expected) {
 		return new Condition<>(it -> {
 			return it instanceof Number && ((Number) it).intValue() == expected;
 		}, "Number  %d", expected);
 	}
 
 	@NoRepositoryBean
-	interface LegoSetRepository extends ReactiveSortingRepository<LegoSet, Integer> {
+	interface LegoSetRepository extends ReactiveCrudRepository<LegoSet, Integer> {
 
 		Flux<LegoSet> findByNameContains(String name);
 
@@ -381,14 +344,6 @@ interface LegoSetRepository extends ReactiveSortingRepository<LegoSet, Integer>
 		@Query("DELETE from legoset")
 		Mono<Integer> deleteAllAndReturnCount();
 
-		@Modifying
-		@Query("DELETE from legoset where manual = :manual")
-		Mono<Boolean> deleteByManualAndReturnSuccess(int manual);
-
-		@Modifying
-		@Query("DELETE from legoset where manual = :manual")
-		Mono<Unit> deleteByManualAndReturnKotlinUnit(int manual);
-
 		Mono<Integer> countByNameContains(String namePart);
 	}