DATAJDBC-272 - Reformat code and optimize imports.

Author: mp911de

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

@@ -103,7 +103,7 @@ private String whereClause() {
 		return conditions.stream() //
 				.map(WhereCondition::toSql) //
 				.collect(Collectors.joining("AND", " WHERE ", "") //
-		);
+				);
 	}
 
 	private String joinClause() {

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

@@ -23,8 +23,8 @@
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 
 /**
- * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same domain
- * type, the same generator will get returned.
+ * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same
+ * domain type, the same generator will get returned.
  *
  * @author Jens Schauder
  */

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

@@ -24,9 +24,7 @@
  *
  * @param <T> the type of the referenced aggregate root.
  * @param <ID> the type of the id of the referenced aggregate root.
- *
  * @author Jens Schauder
- *
  * @since 1.0
  */
 public interface AggregateReference<T, ID> {
@@ -42,9 +40,8 @@ static <T, ID> AggregateReference<T, ID> to(ID id) {
 	ID getId();
 
 	/**
-	 * An {@link AggregateReference} that only holds the id of the referenced aggregate root.
-	 *
-	 * Note that there is no check that a matching aggregate for this id actually exists.
+	 * An {@link AggregateReference} that only holds the id of the referenced aggregate root. Note that there is no check
+	 * that a matching aggregate for this id actually exists.
 	 * 
 	 * @param <T>
 	 * @param <ID>

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

@@ -4,4 +4,4 @@
 @NonNullApi
 package org.springframework.data.jdbc.core;
 
-import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullApi;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java

@@ -33,7 +33,8 @@ public class MyBatisContext {
 	private final Class domainType;
 	private final Map<String, Object> additonalValues;
 
-	public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType, Map<String, Object> additonalValues) {
+	public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType,
+			Map<String, Object> additonalValues) {
 
 		this.id = id;
 		this.instance = instance;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java

@@ -131,8 +131,7 @@ public void setNamespaceStrategy(NamespaceStrategy namespaceStrategy) {
 	public <T> Object insert(T instance, Class<T> domainType, Map<String, Object> additionalParameters) {
 
 		MyBatisContext myBatisContext = new MyBatisContext(null, instance, domainType, additionalParameters);
-		sqlSession().insert(namespace(domainType) + ".insert",
-				myBatisContext);
+		sqlSession().insert(namespace(domainType) + ".insert", myBatisContext);
 
 		return myBatisContext.getId();
 	}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java

@@ -45,7 +45,8 @@
 
 	/**
 	 * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.:
-	 * {@code @EnableJdbcRepositories("org.my.pkg")} instead of {@code @EnableJdbcRepositories(basePackages="org.my.pkg")}.
+	 * {@code @EnableJdbcRepositories("org.my.pkg")} instead of
+	 * {@code @EnableJdbcRepositories(basePackages="org.my.pkg")}.
 	 */
 	String[] value() default {};
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java

@@ -23,7 +23,6 @@
 import org.springframework.data.jdbc.core.convert.BasicJdbcConverter;
 import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
 import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.relational.core.conversion.BasicRelationalConverter;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
@@ -49,8 +48,7 @@ public class JdbcConfiguration {
 	@Bean
 	protected JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {
 
-		JdbcMappingContext mappingContext = new JdbcMappingContext(
-				namingStrategy.orElse(NamingStrategy.INSTANCE));
+		JdbcMappingContext mappingContext = new JdbcMappingContext(namingStrategy.orElse(NamingStrategy.INSTANCE));
 		mappingContext.setSimpleTypeHolder(jdbcCustomConversions().getSimpleTypeHolder());
 
 		return mappingContext;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java

@@ -25,10 +25,9 @@
 import org.springframework.jdbc.core.RowMapper;
 
 /**
- * Annotation to provide SQL statements that will get used for executing the method.
- *
- * The SQL statement may contain named parameters as supported by {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}.
- * Those parameters will get bound to the arguments of the annotated method.
+ * Annotation to provide SQL statements that will get used for executing the method. The SQL statement may contain named
+ * parameters as supported by {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}. Those
+ * parameters will get bound to the arguments of the annotated method.
  *
  * @author Jens Schauder
  */

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java

@@ -52,8 +52,8 @@ class JdbcRepositoryQuery implements RepositoryQuery {
 	private final RowMapper<?> rowMapper;
 
 	/**
-	 * Creates a new {@link JdbcRepositoryQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext} and
-	 * {@link RowMapper}.
+	 * Creates a new {@link JdbcRepositoryQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
+	 * and {@link RowMapper}.
 	 *
 	 * @param publisher must not be {@literal null}.
 	 * @param context must not be {@literal null}.

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

@@ -310,8 +310,7 @@ static class LegoSet {
 		private String name;
 
 		private Manual manual;
-		@Column("alternative")
-		private Manual alternativeInstructions;
+		@Column("alternative") private Manual alternativeInstructions;
 	}
 
 	@Data

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

@@ -35,19 +35,18 @@
 public class CascadingDataAccessStrategyUnitTests {
 
 	int errorIndex = 1;
-	String[] errorMessages = {"Sorry I don't support this method. Please try again later", "Still no luck"};
+	String[] errorMessages = { "Sorry I don't support this method. Please try again later", "Still no luck" };
 
 	DataAccessStrategy alwaysFails = mock(DataAccessStrategy.class, i -> {
-		errorIndex ++;
-		errorIndex %=2;
+		errorIndex++;
+		errorIndex %= 2;
 		throw new UnsupportedOperationException(errorMessages[errorIndex]);
 	});
 	DataAccessStrategy succeeds = mock(DataAccessStrategy.class);
 	DataAccessStrategy mayNotCall = mock(DataAccessStrategy.class, i -> {
 		throw new AssertionFailedError("this shouldn't have get called");
 	});
 
-
 	@Test // DATAJDBC-123
 	public void findByReturnsFirstSuccess() {
 
@@ -75,7 +74,8 @@ public void findByFailsIfAllStrategiesFail() {
 	@Test // DATAJDBC-123
 	public void findByPropertyReturnsFirstSuccess() {
 
-		doReturn(Collections.singletonList("success")).when(succeeds).findAllByProperty(eq(23L), any(RelationalPersistentProperty.class));
+		doReturn(Collections.singletonList("success")).when(succeeds).findAllByProperty(eq(23L),
+				any(RelationalPersistentProperty.class));
 		CascadingDataAccessStrategy access = new CascadingDataAccessStrategy(asList(alwaysFails, succeeds, mayNotCall));
 
 		Iterable<Object> findAll = access.findAllByProperty(23L, mock(RelationalPersistentProperty.class));

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

@@ -247,7 +247,7 @@ private static ResultSet mockResultSet(List<String> columns, Object... values) {
 								"Number of values [%d] must be a multiple of the number of columns [%d]", //
 								values.length, //
 								columns.size() //
-				) //
+						) //
 		);
 
 		List<Map<String, Object>> result = convertValues(columns, values);

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

@@ -78,7 +78,7 @@ public void insert() {
 						null, //
 						String.class, //
 						"value" //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -100,7 +100,7 @@ public void update() {
 						null, //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -122,7 +122,7 @@ public void delete() {
 						"an-id", //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -146,7 +146,7 @@ public void deleteAllByPath() {
 						null, //
 						ChildTwo.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -168,7 +168,7 @@ public void deleteAllByType() {
 						null, //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -191,7 +191,7 @@ public void deleteByPath() {
 						null, "rootid", //
 						ChildTwo.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -212,7 +212,7 @@ public void findById() {
 						null, "an-id", //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -234,7 +234,7 @@ public void findAll() {
 						null, //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -256,7 +256,7 @@ public void findAllById() {
 						asList("id1", "id2"), //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -285,7 +285,7 @@ public void findAllByProperty() {
 						"id", //
 						Number.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-123
@@ -307,7 +307,7 @@ public void existsById() {
 						"id", //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	@Test // DATAJDBC-157
@@ -331,7 +331,7 @@ public void count() {
 						null, //
 						String.class, //
 						null //
-		);
+				);
 	}
 
 	private static class DummyEntity {

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

@@ -114,8 +114,8 @@ public void cascadingDeleteFirstLevel() {
 
 		String sql = sqlGenerator.createDeleteByPath(getPath("ref", DummyEntity.class));
 
-		assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity "
-				+ "WHERE dummy_entity = :rootId");
+		assertThat(sql).isEqualTo(
+				"DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity = :rootId");
 	}
 
 	@Test // DATAJDBC-107
@@ -126,9 +126,8 @@ public void cascadingDeleteAllSecondLevel() {
 		String sql = sqlGenerator.createDeleteByPath(getPath("ref.further", DummyEntity.class));
 
 		assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_SecondLevelReferencedEntity "
-				+ "WHERE referenced_entity IN "
-				+ "(SELECT FixedCustomPropertyPrefix_l1id " + "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity "
-				+ "WHERE dummy_entity = :rootId)");
+				+ "WHERE referenced_entity IN " + "(SELECT FixedCustomPropertyPrefix_l1id "
+				+ "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity = :rootId)");
 	}
 
 	@Test // DATAJDBC-107
@@ -148,8 +147,8 @@ public void cascadingDeleteAllFirstLevel() {
 
 		String sql = sqlGenerator.createDeleteAllSql(getPath("ref", DummyEntity.class));
 
-		assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity "
-				+ "WHERE dummy_entity IS NOT NULL");
+		assertThat(sql).isEqualTo(
+				"DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity IS NOT NULL");
 	}
 
 	@Test // DATAJDBC-107
@@ -160,9 +159,8 @@ public void cascadingDeleteSecondLevel() {
 		String sql = sqlGenerator.createDeleteAllSql(getPath("ref.further", DummyEntity.class));
 
 		assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_SecondLevelReferencedEntity "
-				+ "WHERE referenced_entity IN "
-				+ "(SELECT FixedCustomPropertyPrefix_l1id " + "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity "
-				+ "WHERE dummy_entity IS NOT NULL)");
+				+ "WHERE referenced_entity IN " + "(SELECT FixedCustomPropertyPrefix_l1id "
+				+ "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity IS NOT NULL)");
 	}
 
 	@Test // DATAJDBC-113

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

@@ -199,9 +199,7 @@ public void joinForOneToOneWithoutIdIncludesTheBackReferenceOfTheOuterJoin() {
 
 		String findAll = sqlGenerator.getFindAll();
 
-		assertThat(findAll).containsSequence(
-				"SELECT",
-				"child.parent_of_no_id_child AS child_parent_of_no_id_child",
+		assertThat(findAll).containsSequence("SELECT", "child.parent_of_no_id_child AS child_parent_of_no_id_child",
 				"FROM");
 	}
 
@@ -256,8 +254,7 @@ static class ParentOfNoIdChild {
 		NoIdChild child;
 	}
 
-	static class NoIdChild {
-	}
+	static class NoIdChild {}
 
 	static class OtherAggregate {
 		@Id Long id;

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

@@ -72,8 +72,7 @@ public void convertsFromAggregateReference() {
 
 	private static class DummyEntity {
 
-		@Id
-		Long simple;
+		@Id Long simple;
 		AggregateReference<DummyEntity, Long> reference;
 	}
 }

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

@@ -97,8 +97,8 @@ public void detectsAnnotatedColumnName() {
 	public void detectsAnnotatedColumnAndKeyName() {
 
 		RelationalPersistentProperty listProperty = context //
-			.getRequiredPersistentEntity(DummyEntity.class) //
-			.getRequiredPersistentProperty("someList");
+				.getRequiredPersistentEntity(DummyEntity.class) //
+				.getRequiredPersistentProperty("someList");
 
 		assertThat(listProperty.getReverseColumnName()).isEqualTo("dummy_column_name");
 		assertThat(listProperty.getKeyColumn()).isEqualTo("dummy_key_column_name");

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java

@@ -26,8 +26,7 @@
 @Alias("DummyEntity")
 class DummyEntity {
 
-	@Wither
-	@Id final Long id;
+	@Wither @Id final Long id;
 	final String name;
 
 	public DummyEntity(Long id, String name) {

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java

@@ -91,8 +91,7 @@ SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory factory) {
 		DataAccessStrategy dataAccessStrategy(RelationalMappingContext context, RelationalConverter converter,
 				SqlSession sqlSession, EmbeddedDatabase db) {
 			return MyBatisDataAccessStrategy.createCombinedAccessStrategy(context, converter,
-					new NamedParameterJdbcTemplate(db),
-					sqlSession);
+					new NamedParameterJdbcTemplate(db), sqlSession);
 		}
 	}