Polishing.

Fix Oracle test setup.
Formatting.
Restructure some code
Author tags.

Original pull request #2079
See #2007

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jdbc.repository.query;
 
-import static org.springframework.data.jdbc.repository.query.JdbcQueryExecution.ResultProcessingConverter;
+import static org.springframework.data.jdbc.repository.query.JdbcQueryExecution.*;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
@@ -186,11 +186,8 @@ public class StringBasedJdbcQuery extends AbstractJdbcQuery {
 		return this.query;
 	}
 
-	private static void addEvaluatedParameterToParameterSource(
+	private static void addEvaluatedParameterToParameterSource(MapSqlParameterSource parameterMap, String paramName,
-			MapSqlParameterSource parameterMap,
+			ValueExpression valueExpression, ValueEvaluationContext evaluationContext) {
-			String paramName,
-			ValueExpression valueExpression,
-			ValueEvaluationContext evaluationContext) {
 
 		Object evaluatedValue = valueExpression.evaluate(evaluationContext);
 		Class<?> valueType = valueExpression.getValueType(evaluationContext);
@@ -215,8 +212,7 @@ public class StringBasedJdbcQuery extends AbstractJdbcQuery {
 	}
 
 	private static SQLType getSqlType(Class<?> valueType) {
-		Class<?> resolvedPrimitiveType = JdbcColumnTypes.INSTANCE.resolvePrimitiveType(valueType);
+		return JdbcUtil.targetSqlTypeFor(JdbcColumnTypes.INSTANCE.resolvePrimitiveType(valueType));
-		return JdbcUtil.targetSqlTypeFor(resolvedPrimitiveType);
 	}
 
 	private JdbcQueryExecution<?> createJdbcQueryExecution(RelationalParameterAccessor accessor,

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

@@ -44,7 +44,6 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.NullSource;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.context.ApplicationListener;
@@ -352,16 +351,15 @@ public class JdbcRepositoryIntegrationTests {
 
 	@ParameterizedTest
 	@NullSource
-	@EnumSource(value = EnumClass.class)
+	@EnumSource(value = EnumClass.class) // GH-2007
 	void shouldSaveWithCustomSpellExpressions(EnumClass value) {
+
 		expressionSqlTypePropagationRepository.saveWithSpel(new ExpressionSqlTypePropagation(1L, value));
 
-		var found = expressionSqlTypePropagationRepository.findById(1L);
+		ExpressionSqlTypePropagation reloaded = expressionSqlTypePropagationRepository.findById(1L).orElseThrow();
 
-		assertThat(found).isPresent().hasValueSatisfying(entity -> {
+		assertThat(reloaded.getIdentifier()).isEqualTo(1L);
-			assertThat(entity.getIdentifier()).isEqualTo(1L);
+		assertThat(reloaded.getEnumClass()).isEqualTo(value);
-			assertThat(entity.getEnumClass()).isEqualTo(value);
-		});
 	}
 
 	@Test // DATAJDBC-98
@@ -1598,11 +1596,10 @@ public class JdbcRepositoryIntegrationTests {
 		@Query(value = """
 				INSERT INTO EXPRESSION_SQL_TYPE_PROPAGATION(identifier, enum_class)
 				VALUES(:#{#expressionSqlTypePropagation.identifier}, :#{#expressionSqlTypePropagation.enumClass})
-    """)
+				""")
 		void saveWithSpel(@Param("expressionSqlTypePropagation") ExpressionSqlTypePropagation expressionSqlTypePropagation);
 	}
 
-
 	interface DummyProjection {
 		String getName();
 	}
@@ -1930,8 +1927,7 @@ public class JdbcRepositoryIntegrationTests {
 
 	static class ExpressionSqlTypePropagation {
 
-		@Id
+		@Id Long identifier;
-		Long identifier;
 
 		EnumClass enumClass;
 
@@ -1950,8 +1946,7 @@ public class JdbcRepositoryIntegrationTests {
 	}
 
 	enum EnumClass {
-		ACTIVE,
+		ACTIVE, DELETE
-		DELETE
 	}
 
 	static class EntityWithSequence {

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java

@@ -15,17 +15,8 @@
  */
 package org.springframework.data.jdbc.repository.query;
 
-import static org.assertj.core.api.Assertions.LIST;
+import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
@@ -40,8 +31,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.assertj.core.groups.Tuple;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -92,6 +85,7 @@ import org.springframework.util.ReflectionUtils;
  * @author Chirag Tailor
  * @author Christopher Klein
  * @author Marcin Grzejszczak
+ * @author Mikhail Polivakha
  */
 class StringBasedJdbcQueryUnitTests {
 
@@ -322,23 +316,17 @@ class StringBasedJdbcQueryUnitTests {
 		SqlParameterSource sqlParameterSource = forMethod("spelContainingQuery", ComplexEntity.class)
 				.withArguments(expressionRootObject).extractParameterSource();
 
-		var expectedSqlTypes = Map.<Object, Integer>of(
+		Set<Tuple> valueTypePairs = Arrays.stream(sqlParameterSource.getParameterNames()) //
-				type, Types.VARCHAR,
+				.filter(n -> !n.equalsIgnoreCase("complexEntity")) //
-				score, Types.INTEGER,
+				.map(n -> tuple(sqlParameterSource.getValue(n), sqlParameterSource.getSqlType(n))) //
-				creationDate, Types.TIMESTAMP,
+				.collect(Collectors.toSet());
-				dayOfWeek, Types.VARCHAR
-		);
 
-		assertThat(sqlParameterSource.getParameterNames()).hasSize(5); // 1 root + 4 expressions
+		assertThat(valueTypePairs).containsExactlyInAnyOrder(
-		assertThat(sqlParameterSource.getParameterNames()).satisfies(parameterNames -> {
+				tuple(type, Types.VARCHAR),
-			for (var paramName : parameterNames) {
+				tuple(score, Types.INTEGER),
-				if (paramName.equalsIgnoreCase("complexEntity")) {
+				tuple(creationDate, Types.TIMESTAMP),
-					continue; // do not check root for sqlType
+				tuple(dayOfWeek, Types.VARCHAR)
-				}
+		);
-				Object value = sqlParameterSource.getValue(paramName);
-				assertThat(sqlParameterSource.getSqlType(paramName)).isEqualTo(expectedSqlTypes.get(value));
-			}
-		});
 	}
 
 	@Test // GH-1212
@@ -549,12 +537,12 @@ class StringBasedJdbcQueryUnitTests {
 		List<Object> findByEnumTypeIn(Set<Direction> directions);
 
 		@Query(value = """
-			SELECT * FROM my_table 
+				SELECT * FROM my_table
-			WHERE t = :#{#complexEntity.type} 
+				WHERE t = :#{#complexEntity.type}
-			AND s = :#{#complexEntity.score}
+				AND s = :#{#complexEntity.score}
-			AND cd = :#{#complexEntity.creationDate}
+				AND cd = :#{#complexEntity.creationDate}
-			AND dow = :#{#complexEntity.dayOfWeek}
+				AND dow = :#{#complexEntity.dayOfWeek}
-			""")
+				""")
 		List<Object> spelContainingQuery(ComplexEntity complexEntity);
 
 		@Query(value = "some sql statement")

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-db2.sql

@@ -65,7 +65,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER   BIGINT NOT NULL PRIMARY KEY,
+(
+    IDENTIFIER BIGINT NOT NULL PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-h2.sql

@@ -55,7 +55,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER   BIGINT PRIMARY KEY,
+(
+    IDENTIFIER BIGINT PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-hsql.sql

@@ -55,7 +55,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER   BIGINT PRIMARY KEY,
+(
+    IDENTIFIER BIGINT PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mariadb.sql

@@ -55,7 +55,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER   BIGINT PRIMARY KEY,
+(
+    IDENTIFIER BIGINT PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mssql.sql

@@ -65,7 +65,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER   BIGINT PRIMARY KEY,
+(
+    IDENTIFIER BIGINT PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-mysql.sql

@@ -1,5 +1,5 @@
 SET
-    SQL_MODE = 'ALLOW_INVALID_DATES';
+SQL_MODE = 'ALLOW_INVALID_DATES';
 
 CREATE TABLE DUMMY_ENTITY
 (
@@ -50,7 +50,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER   BIGINT PRIMARY KEY,
+(
+    IDENTIFIER BIGINT PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql

@@ -65,7 +65,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR2(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
-    IDENTIFIER BIGINT PRIMARY KEY,
+(
+    IDENTIFIER NUMBER PRIMARY KEY,
     ENUM_CLASS VARCHAR2(30)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-postgres.sql

@@ -65,7 +65,8 @@ CREATE TABLE PROVIDED_ID_ENTITY
     NAME VARCHAR(30)
 );
 
-CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION(
+CREATE TABLE EXPRESSION_SQL_TYPE_PROPAGATION
+(
     IDENTIFIER BIGINT PRIMARY KEY,
     ENUM_CLASS VARCHAR(30)
 );