GH-2020 code review fixes

Author: mipo256

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

@@ -35,7 +35,6 @@
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
 import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.support.JdbcUtil;
-import org.springframework.data.relational.core.dialect.SqlTypeResolver;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.repository.query.RelationalParameterAccessor;
 import org.springframework.data.relational.repository.query.RelationalParametersParameterAccessor;
@@ -86,17 +85,13 @@ public class StringBasedJdbcQuery extends AbstractJdbcQuery {
 
 	/**
 	 * Creates a new {@link StringBasedJdbcQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
-<<<<<<< HEAD
-	 * and {@link org.springframework.data.jdbc.repository.query.RowMapperFactory}.
-=======
 	 * and {@link RowMapperFactory}.
->>>>>>> d92a7298 (GH-2020 Added SqlTypeResolver abstraction)
 	 *
-	 * @param queryMethod must not be {@literal null}.
-	 * @param operations must not be {@literal null}.
+	 * @param queryMethod      must not be {@literal null}.
+	 * @param operations       must not be {@literal null}.
 	 * @param rowMapperFactory must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 * @param delegate must not be {@literal null}.
+	 * @param converter        must not be {@literal null}.
+	 * @param delegate         must not be {@literal null}.
 	 * @since 3.4
 	 */
 	public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
@@ -109,12 +104,12 @@ public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOpera
 	 * Creates a new {@link StringBasedJdbcQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
 	 * and {@link org.springframework.data.jdbc.repository.query.RowMapperFactory}.
 	 *
-	 * @param query must not be {@literal null} or empty.
-	 * @param queryMethod must not be {@literal null}.
-	 * @param operations must not be {@literal null}.
+	 * @param query            must not be {@literal null} or empty.
+	 * @param queryMethod      must not be {@literal null}.
+	 * @param operations       must not be {@literal null}.
 	 * @param rowMapperFactory must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 * @param delegate must not be {@literal null}.
+	 * @param converter        must not be {@literal null}.
+	 * @param delegate         must not be {@literal null}.
 	 * @since 3.4
 	 */
 	public StringBasedJdbcQuery(String query, JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
@@ -159,10 +154,6 @@ public StringBasedJdbcQuery(String query, JdbcQueryMethod queryMethod, NamedPara
 		this.delegate = delegate;
 	}
 
-<<<<<<< HEAD
-=======
-
->>>>>>> d92a7298 (GH-2020 Added SqlTypeResolver abstraction)
 	@Override
 	public Object execute(Object[] objects) {
 
@@ -356,7 +347,8 @@ private static boolean isUnconfigured(@Nullable Class<?> configuredClass, Class<
 	}
 
 	@Deprecated(since = "3.4")
-	public void setBeanFactory(BeanFactory beanFactory) {}
+	public void setBeanFactory(BeanFactory beanFactory) {
+	}
 
 	class CachedRowMapperFactory {
 
@@ -415,19 +407,20 @@ public CachedResultSetExtractorFactory(Supplier<RowMapper<?>> resultSetExtractor
 			String resultSetExtractorRef = getQueryMethod().getResultSetExtractorRef();
 			Class<? extends ResultSetExtractor> resultSetExtractorClass = getQueryMethod().getResultSetExtractorClass();
 
-			if (!ObjectUtils.isEmpty(resultSetExtractorRef)
-					&& !isUnconfigured(resultSetExtractorClass, ResultSetExtractor.class)) {
+			if (!ObjectUtils.isEmpty(resultSetExtractorRef) && !isUnconfigured(resultSetExtractorClass,
+					ResultSetExtractor.class)) {
 				throw new IllegalArgumentException(
 						"Invalid ResultSetExtractor configuration. Configure either one but not both via @Query(resultSetExtractorRef = …, resultSetExtractorClass = …) for query method "
 								+ getQueryMethod());
 			}
 
-			this.configuredResultSetExtractor = !ObjectUtils.isEmpty(resultSetExtractorRef)
-					|| !isUnconfigured(resultSetExtractorClass, ResultSetExtractor.class);
+			this.configuredResultSetExtractor =
+					!ObjectUtils.isEmpty(resultSetExtractorRef) || !isUnconfigured(resultSetExtractorClass,
+							ResultSetExtractor.class);
 
-			this.rowMapperConstructor = resultSetExtractorClass != null
-					? ClassUtils.getConstructorIfAvailable(resultSetExtractorClass, RowMapper.class)
-					: null;
+			this.rowMapperConstructor = resultSetExtractorClass != null ?
+					ClassUtils.getConstructorIfAvailable(resultSetExtractorClass, RowMapper.class) :
+					null;
 			this.constructor = resultSetExtractorClass != null ? findPrimaryConstructor(resultSetExtractorClass) : null;
 			this.resultSetExtractorFactory = rowMapper -> {
 

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

@@ -19,6 +19,7 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
 import java.sql.ResultSet;
@@ -95,7 +96,7 @@ public void testSqlTypeResolver() throws NoSuchMethodException {
 		JdbcQueryMethod queryMethod = createJdbcQueryMethod(
 				"findUserTestMethod",
 				new DefaultSqlTypeResolver(),
-				Integer.class, String.class, List.class
+				Integer.class, String.class, Integer[].class
 		);
 
 		JdbcParameters parameters = queryMethod.getParameters();
@@ -196,7 +197,7 @@ private void queryMethodWithWriteLock() {}
 	private void findUserTestMethod(
 			@SqlType(name = "TINYINT", vendorTypeNumber = Types.TINYINT) Integer age,
 			String name,
-			List<@SqlType(name = "SMALLINT", vendorTypeNumber = Types.SMALLINT) Integer> statuses
+			@SqlType(name = "SMALLINT", vendorTypeNumber = Types.SMALLINT) Integer[] statuses
 	) {}
 
 	@Lock(LockMode.PESSIMISTIC_READ)

spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/DefaultSqlTypeResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,29 +16,24 @@
 
 package org.springframework.data.relational.core.dialect;
 
-import java.lang.reflect.AnnotatedParameterizedType;
-import java.lang.reflect.AnnotatedType;
-import java.lang.reflect.Parameter;
 import java.sql.SQLType;
 
-import org.springframework.core.MethodParameter;
-import org.springframework.data.relational.repository.query.SqlType;
 import org.springframework.data.relational.repository.query.RelationalParameters;
-import org.springframework.data.util.TypeInformation;
+import org.springframework.data.relational.repository.query.SqlType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * Default implementation of {@link SqlTypeResolver}. Capable to resolve the {@link SqlType} annotation
- * on the {@link java.lang.annotation.ElementType#TYPE_USE}, like this:
+ * on the {@link java.lang.annotation.ElementType#PARAMETER method parameters}, like this:
  * <p>
  * <pre class="code">
  * List<User> findByAge(&#64;SqlType(name = "TINYINT", vendorTypeNumber = Types.TINYINT) byte age);
  * </pre>
  *
- * Or, if the intention is to specify the actual {@link SQLType}, then the following needs to be done:
+ * Qualification of the actual {@link SQLType} (the sql type of the component), then the following needs to be done:
  * <pre class="code">
- * List<User> findByAgeIn(List<&#64;SqlType(name = "TINYINT", vendorTypeNumber = Types.TINYINT) Integer> age);
+ * List<User> findByAgeIn(&#64;SqlType(name = "TINYINT", vendorTypeNumber = Types.TINYINT) Integer[] age);
  * </pre>
  *
  * @author Mikhail Polivakha
@@ -50,46 +45,21 @@ public class DefaultSqlTypeResolver implements SqlTypeResolver {
 	@Override
 	@Nullable
 	public SQLType resolveSqlType(RelationalParameters.RelationalParameter relationalParameter) {
-		SqlType parameterAnnotation = relationalParameter.getMethodParameter().getParameterAnnotation(SqlType.class);
-
-		if (parameterAnnotation != null) {
-			return new AnnotationBasedSqlType(parameterAnnotation);
-		} else {
-			return null;
-		}
+		return resolveInternally(relationalParameter);
 	}
 
 	@Override
 	@Nullable
 	public SQLType resolveActualSqlType(RelationalParameters.RelationalParameter relationalParameter) {
-		MethodParameter methodParameter = relationalParameter.getMethodParameter();
-
-		TypeInformation<?> typeOfParameter = TypeInformation.of(methodParameter.getParameterType());
-
-		if (typeOfParameter.isCollectionLike()) {
-			Parameter parameter = methodParameter.getParameter();
-			AnnotatedType annotatedType = parameter.getAnnotatedType();
-
-			if (annotatedType instanceof AnnotatedParameterizedType parameterizedType) {
-				return searchForGenericTypeUseAnnotation(parameterizedType);
-			}
-		}
-
-		return null;
+		return resolveInternally(relationalParameter);
 	}
 
-	@Nullable
-	private static AnnotationBasedSqlType searchForGenericTypeUseAnnotation(AnnotatedParameterizedType parameterizedType) {
-		AnnotatedType[] annotatedArguments = parameterizedType.getAnnotatedActualTypeArguments();
-
-		if (annotatedArguments.length != 1) {
-			return null;
-		}
-
-		SqlType typeUseSqlTypeAnnotation = annotatedArguments[0].getAnnotation(SqlType.class);
+	private static AnnotationBasedSqlType resolveInternally(
+			RelationalParameters.RelationalParameter relationalParameter) {
+		SqlType parameterAnnotation = relationalParameter.getMethodParameter().getParameterAnnotation(SqlType.class);
 
-		if (typeUseSqlTypeAnnotation != null) {
-			return new AnnotationBasedSqlType(typeUseSqlTypeAnnotation);
+		if (parameterAnnotation != null) {
+			return new AnnotationBasedSqlType(parameterAnnotation);
 		} else {
 			return null;
 		}

spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlTypeResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/SqlType.java

@@ -29,13 +29,13 @@
  * Serves as a hint to the {@link DefaultSqlTypeResolver}, that signals the {@link java.sql.SQLType} to be used.
  * The arguments of this annotation are identical to the methods on {@link java.sql.SQLType} interface, expect for
  * the {@link SQLType#getVendor()}, which is absent, because it typically does not matter as such for the underlying
- * JDBC drivers. For examples of usage, take a look onto {@link DefaultSqlTypeResolver}.
+ * JDBC drivers. The examples of usage, can be found in javadoc of {@link DefaultSqlTypeResolver}.
  *
  * @see DefaultSqlTypeResolver
  * @author Mikhail Polivakha
  */
 @Documented
-@Target({ElementType.PARAMETER, ElementType.TYPE_USE})
+@Target({ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface SqlType {