#498 - Polishing.

Reorder methods. Replace Guava imports with proper ones. Consistent override comments. Original pull request: #501.
2020-11-25 14:46:17 +01:00
parent 843c402e00
commit cf75e26d45
2 changed files with 73 additions and 45 deletions
--- 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<T, ID> implements ReactiveSortingRepository<T
 				.getRequiredIdProperty());
 	}

-	/* (non-Javadoc)
+	// -------------------------------------------------------------------------
+	// Methods from ReactiveCrudRepository
+	// -------------------------------------------------------------------------
+
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(S)
 	 */
 	@Override
@@ -132,7 +135,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.update(objectToSave);
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#saveAll(java.lang.Iterable)
 	 */
 	@Override
@@ -144,7 +148,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return Flux.fromIterable(objectsToSave).concatMap(this::save);
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#saveAll(org.reactivestreams.Publisher)
 	 */
 	@Override
@@ -156,7 +161,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return Flux.from(objectsToSave).concatMap(this::save);
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(java.lang.Object)
 	 */
 	@Override
@@ -167,7 +173,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.selectOne(getIdQuery(id), this.entity.getJavaType());
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(org.reactivestreams.Publisher)
 	 */
 	@Override
@@ -175,7 +182,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return Mono.from(publisher).flatMap(this::findById);
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(java.lang.Object)
 	 */
 	@Override
@@ -186,7 +194,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.exists(getIdQuery(id), this.entity.getJavaType());
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(org.reactivestreams.Publisher)
 	 */
 	@Override
@@ -194,7 +203,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return Mono.from(publisher).flatMap(this::findById).hasElement();
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll()
 	 */
 	@Override
@@ -202,18 +212,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.select(Query.empty(), this.entity.getJavaType());
 	}

-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveSortingRepository#findAll(org.springframework.data.domain.Sort)
-	 */
-	@Override
-	public Flux<T> 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<T, ID> implements ReactiveSortingRepository<T
 		return findAllById(Flux.fromIterable(iterable));
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(org.reactivestreams.Publisher)
 	 */
 	@Override
@@ -244,7 +245,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		});
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#count()
 	 */
 	@Override
@@ -252,7 +254,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.count(Query.empty(), this.entity.getJavaType());
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(java.lang.Object)
 	 */
 	@Override
@@ -264,7 +267,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.delete(getIdQuery(id), this.entity.getJavaType()).then();
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(org.reactivestreams.Publisher)
 	 */
 	@Override
@@ -285,7 +289,8 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		}).then();
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Object)
 	 */
 	@Override
@@ -297,7 +302,23 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return deleteById(this.entity.getRequiredId(objectToDelete));
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAllById(java.lang.Iterable)
+	 */
+	@Override
+	public Mono<Void> deleteAllById(Iterable<? extends ID> ids) {
+
+		Assert.notNull(ids, "The iterable of Id's must not be null!");
+
+		List<? extends ID> 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<T, ID> implements ReactiveSortingRepository<T
 		return deleteAll(Flux.fromIterable(iterable));
 	}

-	@Override
-	public Mono<Void> deleteAllById(Iterable<? extends ID> ids) {
-
-		Assert.notNull(ids, "The iterable of Id's must not be null!");
-
-		List<? extends ID> 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<T, ID> implements ReactiveSortingRepository<T
 		return deleteById(idPublisher);
 	}

-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll()
 	 */
 	@Override
@@ -343,6 +356,22 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 		return this.entityOperations.delete(Query.empty(), this.entity.getJavaType()).then();
 	}

+	// -------------------------------------------------------------------------
+	// Methods from ReactiveSortingRepository
+	// -------------------------------------------------------------------------
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.reactive.ReactiveSortingRepository#findAll(org.springframework.data.domain.Sort)
+	 */
+	@Override
+	public Flux<T> 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();
 	}
--- 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();