Refactoring.

Author: mp911de

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/aot/AotRepositoryFragmentSupport.java

@@ -15,14 +15,11 @@
  */
 package org.springframework.data.jdbc.repository.aot;
 
-import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.sql.SQLType;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 
 import org.jspecify.annotations.Nullable;
@@ -83,10 +80,6 @@ public class AotRepositoryFragmentSupport {
 
 	private final JdbcAggregateOperations aggregateOperations;
 
-	private final RepositoryMetadata repositoryMetadata;
-
-	private final ValueExpressionDelegate valueExpressions;
-
 	private final StatementFactory statementFactory;
 
 	private final ProjectionFactory projectionFactory;
@@ -109,8 +102,6 @@ protected AotRepositoryFragmentSupport(RowMapperFactory rowMapperFactory, JdbcAg
 
 		this.rowMapperFactory = rowMapperFactory;
 		this.aggregateOperations = aggregateOperations;
-		this.repositoryMetadata = repositoryMetadata;
-		this.valueExpressions = valueExpressions;
 		this.statementFactory = new StatementFactory(aggregateOperations.getConverter(),
 				aggregateOperations.getDataAccessStrategy().getDialect());
 		this.projectionFactory = projectionFactory;
@@ -210,41 +201,6 @@ private static SQLType getSqlType(Class<?> valueType) {
 		return JdbcUtil.targetSqlTypeFor(JdbcColumnTypes.INSTANCE.resolvePrimitiveType(valueType));
 	}
 
-	protected @Nullable Object mapIgnoreCase(@Nullable Object source, UnaryOperator<String> mapper) {
-
-		if (source == null) {
-			return null;
-		}
-
-		if (source.getClass().isArray()) {
-			int length = Array.getLength(source);
-			Collection<Object> result = new ArrayList<>(length);
-
-			for (int i = 0; i < length; i++) {
-				result.add(Array.get(source, i));
-			}
-			source = result;
-		}
-
-		if (source instanceof Collection<?> c) {
-
-			Collection<@Nullable Object> result = new ArrayList<>(c.size());
-
-			for (Object o : c) {
-
-				if (o instanceof String s) {
-					result.add(mapper.apply(s));
-				} else {
-					result.add(o != null ? mapper.apply(o.toString()) : null);
-				}
-			}
-
-			return result;
-		}
-
-		return source;
-	}
-
 	protected <T> @Nullable T convertOne(@Nullable Object result, Class<T> projection) {
 
 		if (result == null) {
@@ -294,8 +250,20 @@ private static SQLType getSqlType(Class<?> valueType) {
 		throw new UnsupportedOperationException("Cannot create projection for %s".formatted(result));
 	}
 
+	/**
+	 * Interface for binding values to a {@link MapSqlParameterSource}.
+	 */
 	protected interface BindValue {
+
+		/**
+		 * Bind the value to the given {@link MapSqlParameterSource} using the given parameter name. Can apply further value
+		 * customization such as providing SQL types or type names.
+		 *
+		 * @param parameterName
+		 * @param parameterSource
+		 */
 		void bind(String parameterName, MapSqlParameterSource parameterSource);
+
 	}
 
 }

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/aot/CapturingParameterMetadataProvider.java

@@ -4,15 +4,16 @@
 
 import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.jdbc.repository.query.ParameterBinding;
+import org.springframework.data.jdbc.repository.query.ParametrizedQuery;
 import org.springframework.data.relational.core.query.CriteriaDefinition;
+import org.springframework.data.repository.query.parser.PartTree;
 
 /**
  * PartTree (derived) Query with a limit associated.
  *
  * @author Mark Paluch
  */
-public class DerivedAotQuery extends StringAotQuery {
+class DerivedAotQuery extends StringAotQuery {
 
 	private final String queryString;
 	private final CriteriaDefinition criteria;
@@ -22,9 +23,9 @@ public class DerivedAotQuery extends StringAotQuery {
 	private final boolean count;
 	private final boolean exists;
 
-	DerivedAotQuery(String queryString, List<ParameterBinding> parameterBindings, CriteriaDefinition criteria, Sort sort,
+	DerivedAotQuery(String queryString, CriteriaDefinition criteria, Sort sort,
 			Limit limit, boolean delete, boolean count, boolean exists) {
-		super(parameterBindings);
+		super(List.of());
 		this.queryString = queryString;
 		this.criteria = criteria;
 		this.sort = sort;
@@ -34,6 +35,13 @@ public class DerivedAotQuery extends StringAotQuery {
 		this.exists = exists;
 	}
 
+	DerivedAotQuery(ParametrizedQuery query, PartTree partTree, boolean countQuery) {
+
+		this(query.getQuery(), query.getCriteria(), partTree.getSort(), partTree.getResultLimit(), partTree.isDelete(),
+				countQuery, partTree.isExistsProjection());
+
+	}
+
 	@Override
 	public String getQueryString() {
 		return queryString;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/aot/DerivedAotQuery.java

@@ -34,7 +34,6 @@
 import org.springframework.data.domain.SliceImpl;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jdbc.core.JdbcAggregateOperations;
-import org.springframework.data.jdbc.repository.aot.CapturingParameterMetadataProvider.CapturingJdbcValue;
 import org.springframework.data.jdbc.repository.query.JdbcQueryMethod;
 import org.springframework.data.jdbc.repository.query.Modifying;
 import org.springframework.data.jdbc.repository.query.ParameterBinding;
@@ -204,11 +203,10 @@ private CodeBlock buildQuery(boolean count, DerivedAotQuery aotQuery, CriteriaDe
 
 			Builder builder = CodeBlock.builder();
 			String selection = context.localVariable(count ? "countSelection" : "selection");
-
 			String rawParameterSource = context.localVariable(count ? "countRawParameterSource" : "rawParameterSource");
 
 			String method;
-			if (aotQuery.isCount() || count) {
+			if (aotQuery.isCount()) {
 				method = "count($T.class)";
 			} else if (aotQuery.isExists()) {
 				method = "exists($T.class)";
@@ -221,7 +219,7 @@ private CodeBlock buildQuery(boolean count, DerivedAotQuery aotQuery, CriteriaDe
 			builder.addStatement("$T $L = getStatementFactory()." + method, StatementFactory.Selection.class, selection,
 					context.getRepositoryInformation().getDomainType());
 
-			if (!count && !aotQuery.isCount() && !aotQuery.isExists()) {
+			if (!aotQuery.isCount() && !aotQuery.isExists()) {
 
 				if (aotQuery.isLimited()) {
 					builder.addStatement("$1L.limit($2L)", selection, aotQuery.getLimit().max());
@@ -377,7 +375,7 @@ private void appendCriteria(CriteriaDefinition current, Builder builder) {
 
 		private void applyLike(Builder builder, String method, @Nullable Object value) {
 
-			CapturingJdbcValue captured = CapturingJdbcValue.unwrap(value);
+			PlaceholderAccessor.CapturingJdbcValue captured = PlaceholderAccessor.unwrap(value);
 
 			String likeValue = "$L";
 			if (captured.getBinding() instanceof ParameterBinding.LikeParameterBinding lpb) {
@@ -396,7 +394,7 @@ private void applyLike(Builder builder, String method, @Nullable Object value) {
 
 		private @Nullable String renderPlaceholder(@Nullable Object value) {
 
-			CapturingJdbcValue captured = CapturingJdbcValue.unwrap(value);
+			PlaceholderAccessor.CapturingJdbcValue captured = PlaceholderAccessor.unwrap(value);
 
 			ParameterBinding binding = captured.getBinding();
 			ParameterBinding.MethodInvocationArgument argument = (ParameterBinding.MethodInvocationArgument) binding