Polishing.

See /issues/1041
Original pull request spring-projects/spring-data-r2dbc/pull/720

Author: schauder

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

@@ -15,7 +15,13 @@
  */
 package org.springframework.data.r2dbc.core;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/dialect/H2Dialect.java

@@ -23,10 +23,6 @@ public String renderForGeneratedValues(SqlIdentifier identifier) {
 		return identifier.getReference(getIdentifierProcessing());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.relational.core.dialect.Dialect#lock()
-	 */
 	@Override
 	public LockClause lock() {
 		// H2 Dialect does not support the same lock keywords as PostgreSQL, but it supports the ANSI SQL standard.

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java

@@ -158,14 +158,16 @@ private Expression[] getSelectProjection() {
 			for (String projectedProperty : projectedProperties) {
 
 				RelationalPersistentProperty property = entity.getPersistentProperty(projectedProperty);
-				Column column = table
-						.column(property != null ? property.getColumnName() : SqlIdentifier.unquoted(projectedProperty));
+				Column column = table.column(property != null //
+						? property.getColumnName() //
+						: SqlIdentifier.unquoted(projectedProperty));
 				expressions.add(column);
 			}
 
 		} else if (tree.isExistsProjection()) {
 
-			expressions = dataAccessStrategy.getIdentifierColumns(entityToRead).stream().map(table::column)
+			expressions = dataAccessStrategy.getIdentifierColumns(entityToRead).stream() //
+					.map(table::column) //
 					.collect(Collectors.toList());
 		} else if (tree.isCountProjection()) {
 
@@ -175,7 +177,8 @@ private Expression[] getSelectProjection() {
 
 			expressions = Collections.singletonList(Functions.count(countExpression));
 		} else {
-			expressions = dataAccessStrategy.getAllColumns(entityToRead).stream().map(table::column)
+			expressions = dataAccessStrategy.getAllColumns(entityToRead).stream() //
+					.map(table::column) //
 					.collect(Collectors.toList());
 		}
 

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

@@ -112,7 +112,7 @@ void before() {
 
 	protected abstract Class<? extends LegoSetRepository> getRepositoryInterfaceType();
 
-	@Test
+	@Test // GH-2
 	void shouldInsertNewItems() {
 
 		LegoSet legoSet1 = new LegoSet(null, "SCHAUFELRADBAGGER", 12, true);
@@ -124,7 +124,7 @@ void shouldInsertNewItems() {
 				.verifyComplete();
 	}
 
-	@Test
+	@Test // GH-2
 	void shouldFindItemsByManual() {
 
 		shouldInsertNewItems();
@@ -137,7 +137,7 @@ void shouldFindItemsByManual() {
 				.verifyComplete();
 	}
 
-	@Test
+	@Test // GH-2
 	void shouldFindItemsByNameContains() {
 
 		shouldInsertNewItems();
@@ -151,7 +151,7 @@ void shouldFindItemsByNameContains() {
 				}).verifyComplete();
 	}
 
-	@Test // gh-475, gh-607
+	@Test // GH-475, GH-607
 	void shouldFindApplyingInterfaceProjection() {
 
 		shouldInsertNewItems();
@@ -173,7 +173,7 @@ void shouldFindApplyingInterfaceProjection() {
 				}).verifyComplete();
 	}
 
-	@Test // gh-475
+	@Test // GH-475
 	void shouldByStringQueryApplyingDtoProjection() {
 
 		shouldInsertNewItems();
@@ -187,7 +187,7 @@ void shouldByStringQueryApplyingDtoProjection() {
 				}).verifyComplete();
 	}
 
-	@Test // gh-344
+	@Test // GH-344
 	void shouldFindApplyingDistinctProjection() {
 
 		LegoSet legoSet1 = new LegoSet(null, "SCHAUFELRADBAGGER", 12, true);
@@ -207,7 +207,7 @@ void shouldFindApplyingDistinctProjection() {
 				}).verifyComplete();
 	}
 
-	@Test // gh-41
+	@Test // GH-41
 	void shouldFindApplyingSimpleTypeProjection() {
 
 		shouldInsertNewItems();
@@ -220,7 +220,7 @@ void shouldFindApplyingSimpleTypeProjection() {
 				}).verifyComplete();
 	}
 
-	@Test // gh-698
+	@Test // GH-698
 	void shouldBeTrue() {
 		shouldInsertNewItems();
 
@@ -246,7 +246,7 @@ void shouldDeleteUsingQueryMethod() {
 		assertThat(getCount(count)).satisfies(numberOf(1));
 	}
 
-	@Test // gh-335
+	@Test // GH-335
 	void shouldFindByPageable() {
 
 		Flux<LegoSet> sets = Flux.fromStream(IntStream.range(0, 100).mapToObj(value -> {
@@ -275,7 +275,7 @@ void shouldFindByPageable() {
 				}).verifyComplete();
 	}
 
-	@Test // gh-335
+	@Test // GH-335
 	void shouldFindTop10() {
 
 		Flux<LegoSet> sets = Flux
@@ -292,7 +292,7 @@ void shouldFindTop10() {
 				.verifyComplete();
 	}
 
-	@Test // gh-341
+	@Test // GH-341
 	void shouldDeleteAll() {
 
 		shouldInsertNewItems();
@@ -306,7 +306,7 @@ void shouldDeleteAll() {
 				.verifyComplete();
 	}
 
-	@Test
+	@Test // GH-2
 	public void shouldInsertItemsTransactional() {
 
 		R2dbcTransactionManager r2dbcTransactionManager = new R2dbcTransactionManager(connectionFactory);
@@ -330,7 +330,7 @@ public void shouldInsertItemsTransactional() {
 		assertThat(getCount(map)).satisfies(numberOf(2));
 	}
 
-	@Test // gh-363
+	@Test // GH-363
 	void derivedQueryWithCountProjection() {
 
 		shouldInsertNewItems();
@@ -341,7 +341,7 @@ void derivedQueryWithCountProjection() {
 				.verifyComplete();
 	}
 
-	@Test // gh-363
+	@Test // GH-363
 	void derivedQueryWithCount() {
 
 		shouldInsertNewItems();
@@ -352,7 +352,7 @@ void derivedQueryWithCount() {
 				.verifyComplete();
 	}
 
-	@Test // gh-468
+	@Test // GH-468
 	void derivedQueryWithExists() {
 
 		shouldInsertNewItems();
@@ -368,7 +368,7 @@ void derivedQueryWithExists() {
 				.verifyComplete();
 	}
 
-	@Test // gh-421
+	@Test // GH-421
 	void shouldDeleteAllAndReturnCount() {
 
 		shouldInsertNewItems();
@@ -383,7 +383,7 @@ void shouldDeleteAllAndReturnCount() {
 				.verifyComplete();
 	}
 
-	@Test
+	@Test // GH-1041
 	void getAllByNameWithWriteLock() {
 
 		shouldInsertNewItems();
@@ -396,7 +396,7 @@ void getAllByNameWithWriteLock() {
 				.verifyComplete();
 	}
 
-	@Test
+	@Test // GH-1041
 	void findByNameAndFlagWithReadLock() {
 
 		shouldInsertNewItems();