From cf75e26d4549a9a0f6ca199f24f2d0c29dcd521e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 25 Nov 2020 14:46:17 +0100 Subject: [PATCH] #498 - Polishing. Reorder methods. Replace Guava imports with proper ones. Consistent override comments. Original pull request: #501. --- .../support/SimpleR2dbcRepository.java | 115 +++++++++++------- ...SimpleR2dbcRepositoryIntegrationTests.java | 3 +- 2 files changed, 73 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java b/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java index 644dd8ef..b5fd7740 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java @@ -15,12 +15,11 @@ */ package org.springframework.data.r2dbc.repository.support; -import org.springframework.data.util.StreamUtils; -import org.springframework.data.util.Streamable; -import org.springframework.util.CollectionUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.List; + import org.reactivestreams.Publisher; import org.springframework.data.domain.Sort; @@ -34,12 +33,11 @@ import org.springframework.data.relational.core.query.Query; import org.springframework.data.relational.repository.query.RelationalEntityInformation; import org.springframework.data.repository.reactive.ReactiveSortingRepository; import org.springframework.data.util.Lazy; +import org.springframework.data.util.Streamable; import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; -import java.util.List; - /** * Simple {@link ReactiveSortingRepository} implementation using R2DBC through {@link DatabaseClient}. * @@ -116,7 +114,12 @@ public class SimpleR2dbcRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository findAll(Sort sort) { - - Assert.notNull(sort, "Sort must not be null!"); - - return this.entityOperations.select(Query.empty().sort(sort), this.entity.getJavaType()); - } - - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(java.lang.Iterable) */ @Override @@ -224,7 +224,8 @@ public class SimpleR2dbcRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository implements ReactiveSortingRepository deleteAllById(Iterable ids) { + + Assert.notNull(ids, "The iterable of Id's must not be null!"); + + List idsList = Streamable.of(ids).toList(); + String idProperty = getIdProperty().getName(); + return this.entityOperations.delete(Query.query(Criteria.where(idProperty).in(idsList)), this.entity.getJavaType()) + .then(); + } + + /* + * (non-Javadoc) * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(java.lang.Iterable) */ @Override @@ -309,17 +330,8 @@ public class SimpleR2dbcRepository implements ReactiveSortingRepository deleteAllById(Iterable ids) { - - Assert.notNull(ids, "The iterable of Id's must not be null!"); - - List idsList = Streamable.of(ids).toList(); - String idProperty = getIdProperty().getName(); - return this.entityOperations.delete(Query.query(Criteria.where(idProperty).in(idsList)), this.entity.getJavaType()).then(); - } - - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher) */ @Override @@ -334,7 +346,8 @@ public class SimpleR2dbcRepository implements ReactiveSortingRepository implements ReactiveSortingRepository findAll(Sort sort) { + + Assert.notNull(sort, "Sort must not be null!"); + + return this.entityOperations.select(Query.empty().sort(sort), this.entity.getJavaType()); + } + private RelationalPersistentProperty getIdProperty() { return this.idProperty.get(); } diff --git a/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java index 71d743ed..c68cf084 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java @@ -16,7 +16,6 @@ package org.springframework.data.r2dbc.repository.support; import static org.assertj.core.api.Assertions.*; -import static org.testcontainers.shaded.com.google.common.primitives.Ints.*; import lombok.AllArgsConstructor; import lombok.Data; @@ -473,7 +472,7 @@ public abstract class AbstractSimpleR2dbcRepositoryIntegrationTests extends R2db jdbc.execute("INSERT INTO legoset (name, manual) VALUES('SCHAUFELRADBAGGER', 12)"); Integer id = jdbc.queryForObject("SELECT id FROM legoset", Integer.class); - repository.deleteAllById(asList(id)) // + repository.deleteAllById(Collections.singletonList(id)) // .as(StepVerifier::create) // .verifyComplete();