DATAJDBC-334 - Polishing.

Original pull request: #120.

Author: schauder

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java

@@ -360,8 +360,13 @@ private String createUpdateSql() {
 				.map(n -> String.format("%s = :%s", n, columnNameToParameterName(n))) //
 				.collect(Collectors.joining(", "));
 
-		return String.format(updateTemplate, entity.getTableName(), setClause, entity.getIdColumn(),
-				columnNameToParameterName(entity.getIdColumn()));
+		return String.format( //
+				updateTemplate, //
+				entity.getTableName(), //
+				setClause, //
+				entity.getIdColumn(), //
+				columnNameToParameterName(entity.getIdColumn()) //
+		);
 	}
 
 	private String createDeleteSql() {

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java

@@ -87,15 +87,15 @@ public void findOne() {
 	@Test // DATAJDBC-112
 	public void cascadingDeleteFirstLevel() {
 
-		String sql = sqlGenerator.createDeleteByPath(getPath("ref", DummyEntity.class));
+		String sql = sqlGenerator.createDeleteByPath(getPath("ref"));
 
 		assertThat(sql).isEqualTo("DELETE FROM referenced_entity WHERE dummy_entity = :rootId");
 	}
 
 	@Test // DATAJDBC-112
 	public void cascadingDeleteAllSecondLevel() {
 
-		String sql = sqlGenerator.createDeleteByPath(getPath("ref.further", DummyEntity.class));
+		String sql = sqlGenerator.createDeleteByPath(getPath("ref.further"));
 
 		assertThat(sql).isEqualTo(
 				"DELETE FROM second_level_referenced_entity WHERE referenced_entity IN (SELECT x_l1id FROM referenced_entity WHERE dummy_entity = :rootId)");
@@ -112,15 +112,15 @@ public void deleteAll() {
 	@Test // DATAJDBC-112
 	public void cascadingDeleteAllFirstLevel() {
 
-		String sql = sqlGenerator.createDeleteAllSql(getPath("ref", DummyEntity.class));
+		String sql = sqlGenerator.createDeleteAllSql(getPath("ref"));
 
 		assertThat(sql).isEqualTo("DELETE FROM referenced_entity WHERE dummy_entity IS NOT NULL");
 	}
 
 	@Test // DATAJDBC-112
 	public void cascadingDeleteSecondLevel() {
 
-		String sql = sqlGenerator.createDeleteAllSql(getPath("ref.further", DummyEntity.class));
+		String sql = sqlGenerator.createDeleteAllSql(getPath("ref.further"));
 
 		assertThat(sql).isEqualTo(
 				"DELETE FROM second_level_referenced_entity WHERE referenced_entity IN (SELECT x_l1id FROM referenced_entity WHERE dummy_entity IS NOT NULL)");
@@ -129,15 +129,15 @@ public void cascadingDeleteSecondLevel() {
 	@Test // DATAJDBC-227
 	public void deleteAllMap() {
 
-		String sql = sqlGenerator.createDeleteAllSql(getPath("mappedElements", DummyEntity.class));
+		String sql = sqlGenerator.createDeleteAllSql(getPath("mappedElements"));
 
 		assertThat(sql).isEqualTo("DELETE FROM element WHERE dummy_entity IS NOT NULL");
 	}
 
 	@Test // DATAJDBC-227
 	public void deleteMapByPath() {
 
-		String sql = sqlGenerator.createDeleteByPath(getPath("mappedElements", DummyEntity.class));
+		String sql = sqlGenerator.createDeleteByPath(getPath("mappedElements"));
 
 		assertThat(sql).isEqualTo("DELETE FROM element WHERE dummy_entity = :rootId");
 	}
@@ -177,7 +177,7 @@ public void findAllByPropertyWithKey() {
 
 	@Test(expected = IllegalArgumentException.class) // DATAJDBC-130
 	public void findAllByPropertyOrderedWithoutKey() {
-		String sql = sqlGenerator.getFindAllByProperty("back-ref", null, true);
+		sqlGenerator.getFindAllByProperty("back-ref", null, true);
 	}
 
 	@Test // DATAJDBC-131, DATAJDBC-111
@@ -209,6 +209,7 @@ public void getInsertForEmptyColumnList() {
 
 	@Test // DATAJDBC-334
 	public void getInsertForQuotedColumnName() {
+
 		SqlGenerator sqlGenerator = createSqlGenerator(EntityWithQuotedColumnName.class);
 
 		String insert = sqlGenerator.getInsert(emptySet());
@@ -254,6 +255,7 @@ public void readOnlyPropertyExcludedFromQuery_when_generateUpdateSql() {
 
 	@Test // DATAJDBC-334
 	public void getUpdateForQuotedColumnName() {
+
 		SqlGenerator sqlGenerator = createSqlGenerator(EntityWithQuotedColumnName.class);
 
 		String update = sqlGenerator.getUpdate();
@@ -332,8 +334,8 @@ public void readOnlyPropertyIncludedIntoQuery_when_generateFindOneSql() {
 		);
 	}
 
-	private PersistentPropertyPath<RelationalPersistentProperty> getPath(String path, Class<?> base) {
-		return PersistentPropertyPathTestUtils.getPath(context, path, base);
+	private PersistentPropertyPath<RelationalPersistentProperty> getPath(String path) {
+		return PersistentPropertyPathTestUtils.getPath(context, path, DummyEntity.class);
 	}
 
 	@SuppressWarnings("unused")
@@ -368,7 +370,9 @@ static class Element {
 		String content;
 	}
 
+	@SuppressWarnings("unused")
 	static class ParentOfNoIdChild {
+
 		@Id Long id;
 		NoIdChild child;
 	}
@@ -395,6 +399,7 @@ static class IdOnlyEntity {
 		@Id Long id;
 	}
 
+	@SuppressWarnings("unused")
 	static class EntityWithReadOnlyProperty {
 
 		@Id Long id;
@@ -403,6 +408,7 @@ static class EntityWithReadOnlyProperty {
 	}
 
 	static class EntityWithQuotedColumnName {
+
 		@Id @Column("\"test_@id\"") Long id;
 		@Column("\"test_@123\"") String name;
 	}