#64 - Last cleanups.

Author: mp911de

src/main/java/org/springframework/data/r2dbc/function/DatabaseClient.java

@@ -315,8 +315,7 @@ interface UpdateTableSpec {
 		 * Specify the target table to update to using the {@link Class entity class}.
 		 *
 		 * @param table must not be {@literal null}.
-		 * @return a {@link GenericUpdateSpec} for further configuration of the update. Guaranteed to be not
-		 *         {@literal null}.
+		 * @return a {@link TypedUpdateSpec} for further configuration of the update. Guaranteed to be not {@literal null}.
 		 */
 		<T> TypedUpdateSpec<T> table(Class<T> table);
 	}
@@ -330,7 +329,7 @@ interface DeleteFromSpec {
 		 * Specify the source {@literal table} to delete from.
 		 *
 		 * @param table must not be {@literal null} or empty.
-		 * @return a {@link GenericSelectSpec} for further configuration of the delete. Guaranteed to be not
+		 * @return a {@link DeleteMatchingSpec} for further configuration of the delete. Guaranteed to be not
 		 *         {@literal null}.
 		 */
 		DeleteMatchingSpec from(String table);
@@ -339,7 +338,7 @@ interface DeleteFromSpec {
 		 * Specify the source table to delete from to using the {@link Class entity class}.
 		 *
 		 * @param table must not be {@literal null}.
-		 * @return a {@link DeleteSpec} for further configuration of the delete. Guaranteed to be not {@literal null}.
+		 * @return a {@link TypedDeleteSpec} for further configuration of the delete. Guaranteed to be not {@literal null}.
 		 */
 		<T> TypedDeleteSpec<T> from(Class<T> table);
 	}
@@ -549,7 +548,7 @@ interface InsertSpec<T> {
 	interface GenericUpdateSpec {
 
 		/**
-		 * Specify an {@link Update} object containing the assignments.
+		 * Specify an {@link Update} object containing assignments.
 		 *
 		 * @param update must not be {@literal null}.
 		 */
@@ -619,7 +618,7 @@ interface TypedDeleteSpec<T> extends DeleteSpec {
 		 * Use the given {@code tableName} as delete target.
 		 *
 		 * @param tableName must not be {@literal null} or empty.
-		 * @return a {@link TypedUpdateSpec} for further configuration of the delete. Guaranteed to be not {@literal null}.
+		 * @return a {@link TypedDeleteSpec} for further configuration of the delete. Guaranteed to be not {@literal null}.
 		 */
 		TypedDeleteSpec<T> table(String tableName);
 

src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java

@@ -1325,8 +1325,7 @@ private UpdatedRowsFetchSpec exchangeUpdate(PreparedOperation<?> operation) {
 
 	private static Mono<Integer> sumRowsUpdated(Function<Connection, Flux<Result>> resultFunction, Connection it) {
 
-		return resultFunction //
-				.apply(it) //
+		return resultFunction.apply(it) //
 				.flatMap(Result::getRowsUpdated) //
 				.collect(Collectors.summingInt(Integer::intValue));
 	}

src/main/java/org/springframework/data/r2dbc/function/DefaultStatementMapper.java

@@ -126,7 +126,6 @@ private PreparedOperation<Select> getMappedObject(SelectSpec selectSpec,
 		} else {
 			limit = OptionalLong.empty();
 			offset = OptionalLong.empty();
-
 		}
 
 		Select select = selectBuilder.build();

src/main/java/org/springframework/data/r2dbc/function/StatementMapper.java

@@ -86,12 +86,10 @@ public interface StatementMapper {
 	 *
 	 * @param <T>
 	 */
-	interface TypedStatementMapper<T> extends StatementMapper {
-
-	}
+	interface TypedStatementMapper<T> extends StatementMapper {}
 
 	/**
-	 * Create an {@code SELECT} specification for {@code table}.
+	 * Create a {@code SELECT} specification for {@code table}.
 	 *
 	 * @param table
 	 * @return the {@link SelectSpec}.
@@ -121,7 +119,7 @@ default UpdateSpec createUpdate(String table, Update update) {
 	}
 
 	/**
-	 * Create an {@code DELETE} specification for {@code table}.
+	 * Create a {@code DELETE} specification for {@code table}.
 	 *
 	 * @param table
 	 * @return the {@link DeleteSpec}.

src/main/java/org/springframework/data/r2dbc/function/query/BoundAssignments.java

@@ -19,11 +19,10 @@
 
 import org.springframework.data.r2dbc.function.operation.Bindings;
 import org.springframework.data.relational.core.sql.Assignment;
-import org.springframework.data.relational.core.sql.Condition;
 import org.springframework.util.Assert;
 
 /**
- * Value object representing a {@link Condition} with its {@link Bindings}.
+ * Value object representing {@link Assignment}s with their {@link Bindings}.
  *
  * @author Mark Paluch
  */
@@ -35,8 +34,8 @@ public class BoundAssignments {
 
 	public BoundAssignments(Bindings bindings, List<Assignment> assignments) {
 
-		Assert.notNull(bindings, "Bindings must not be null");
-		Assert.notNull(assignments, "Assignments must not be null");
+		Assert.notNull(bindings, "Bindings must not be null!");
+		Assert.notNull(assignments, "Assignments must not be null!");
 
 		this.bindings = bindings;
 		this.assignments = assignments;

src/main/java/org/springframework/data/r2dbc/function/query/BoundCondition.java

@@ -32,8 +32,8 @@ public class BoundCondition {
 
 	public BoundCondition(Bindings bindings, Condition condition) {
 
-		Assert.notNull(bindings, "Bindings must not be null");
-		Assert.notNull(condition, "Condition must not be null");
+		Assert.notNull(bindings, "Bindings must not be null!");
+		Assert.notNull(condition, "Condition must not be null!");
 
 		this.bindings = bindings;
 		this.condition = condition;

src/main/java/org/springframework/data/r2dbc/function/query/Criteria.java

@@ -280,7 +280,7 @@ static class DefaultCriteriaStep implements CriteriaStep {
 		@Override
 		public Criteria is(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.EQ, value);
 		}
@@ -292,7 +292,7 @@ public Criteria is(Object value) {
 		@Override
 		public Criteria not(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.NEQ, value);
 		}
@@ -362,7 +362,7 @@ public Criteria notIn(Collection<?> values) {
 		@Override
 		public Criteria lessThan(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.LT, value);
 		}
@@ -374,7 +374,7 @@ public Criteria lessThan(Object value) {
 		@Override
 		public Criteria lessThanOrEquals(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.LTE, value);
 		}
@@ -386,7 +386,7 @@ public Criteria lessThanOrEquals(Object value) {
 		@Override
 		public Criteria greaterThan(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.GT, value);
 		}
@@ -398,7 +398,7 @@ public Criteria greaterThan(Object value) {
 		@Override
 		public Criteria greaterThanOrEquals(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.GTE, value);
 		}
@@ -410,7 +410,7 @@ public Criteria greaterThanOrEquals(Object value) {
 		@Override
 		public Criteria like(Object value) {
 
-			Assert.notNull(value, "Value must not be null");
+			Assert.notNull(value, "Value must not be null!");
 
 			return createCriteria(Comparator.LIKE, value);
 		}

src/main/java/org/springframework/data/r2dbc/function/query/UpdateMapper.java

@@ -78,9 +78,9 @@ public BoundAssignments getMappedObject(BindMarkers markers, Update update, Tabl
 	public BoundAssignments getMappedObject(BindMarkers markers, Map<String, ? extends Object> assignments, Table table,
 			@Nullable RelationalPersistentEntity<?> entity) {
 
-		Assert.notNull(markers, "BindMarkers must not be null");
-		Assert.notNull(assignments, "Assignments must not be null");
-		Assert.notNull(table, "Table must not be null");
+		Assert.notNull(markers, "BindMarkers must not be null!");
+		Assert.notNull(assignments, "Assignments must not be null!");
+		Assert.notNull(table, "Table must not be null!");
 
 		MutableBindings bindings = new MutableBindings(markers);
 		List<Assignment> result = new ArrayList<>();