Fix grammar error in SqlGenerator.java

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/4.0.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-relational-parent</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data Relational Parent</name>
@@ -16,12 +16,12 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
 		<dist.id>spring-data-jdbc</dist.id>
-		<springdata.commons>3.5.0-SNAPSHOT</springdata.commons>
+		<springdata.commons>4.0.0-SNAPSHOT</springdata.commons>
 		<liquibase.version>4.21.1</liquibase.version>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 

spring-data-jdbc-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jdbc/pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-jdbc</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 
 	<name>Spring Data JDBC</name>
 	<description>Spring Data module for JDBC repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -69,7 +69,7 @@ class SqlGenerator {
 	/**
 	 * Length of an aggregate path that is one longer then the root path.
 	 */
-	private static final int FIRST_NON_ROOT_LENTH = 2;
+	private static final int FIRST_NON_ROOT_LENGTH = 2;
 
 	private final RelationalPersistentEntity<?> entity;
 	private final RelationalMappingContext mappingContext;
@@ -131,7 +131,7 @@ class SqlGenerator {
 	 * @return If the given path is considered deeply nested.
 	 */
 	private static boolean isFirstNonRoot(AggregatePath path) {
-		return path.getLength() == FIRST_NON_ROOT_LENTH;
+		return path.getLength() == FIRST_NON_ROOT_LENGTH;
 	}
 
 	/**
@@ -148,7 +148,7 @@ private static boolean isFirstNonRoot(AggregatePath path) {
 	 * @return If the given path is considered deeply nested.
 	 */
 	private static boolean isDeeplyNested(AggregatePath path) {
-		return path.getLength() > FIRST_NON_ROOT_LENTH;
+		return path.getLength() > FIRST_NON_ROOT_LENGTH;
 	}
 
 	/**

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

@@ -30,21 +30,16 @@
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.expression.ValueEvaluationContext;
-import org.springframework.data.expression.ValueExpressionParser;
 import org.springframework.data.jdbc.core.convert.JdbcColumnTypes;
 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.mapping.RelationalMappingContext;
 import org.springframework.data.relational.repository.query.RelationalParameterAccessor;
 import org.springframework.data.relational.repository.query.RelationalParametersParameterAccessor;
-import org.springframework.data.repository.query.CachingValueExpressionDelegate;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.ValueExpressionQueryRewriter;
@@ -87,43 +82,6 @@ public class StringBasedJdbcQuery extends AbstractJdbcQuery {
 	private final CachedResultSetExtractorFactory cachedResultSetExtractorFactory;
 	private final ValueExpressionDelegate delegate;
 
-	/**
-	 * Creates a new {@link StringBasedJdbcQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
-	 * and {@link RowMapper}.
-	 *
-	 * @param queryMethod must not be {@literal null}.
-	 * @param operations must not be {@literal null}.
-	 * @param defaultRowMapper can be {@literal null} (only in case of a modifying query).
-	 * @deprecated since 3.4, use the constructors accepting {@link ValueExpressionDelegate} instead.
-	 */
-	@Deprecated(since = "3.4")
-	public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
-			@Nullable RowMapper<?> defaultRowMapper, JdbcConverter converter,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		this(queryMethod.getRequiredQuery(), queryMethod, operations, result -> (RowMapper<Object>) defaultRowMapper,
-				converter, evaluationContextProvider);
-	}
-
-	/**
-	 * Creates a new {@link StringBasedJdbcQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
-	 * and {@link RowMapperFactory}.
-	 *
-	 * @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 evaluationContextProvider must not be {@literal null}.
-	 * @since 2.3
-	 * @deprecated use alternative constructor
-	 */
-	@Deprecated(since = "3.4")
-	public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
-			RowMapperFactory rowMapperFactory, JdbcConverter converter,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		this(queryMethod.getRequiredQuery(), queryMethod, operations, rowMapperFactory, converter,
-				evaluationContextProvider);
-	}
-
 	/**
 	 * Creates a new {@link StringBasedJdbcQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
 	 * and {@link RowMapperFactory}.
@@ -136,8 +94,7 @@ public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOpera
 	 * @since 3.4
 	 */
 	public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
-			RowMapperFactory rowMapperFactory, JdbcConverter converter,
-			ValueExpressionDelegate delegate) {
+			RowMapperFactory rowMapperFactory, JdbcConverter converter, ValueExpressionDelegate delegate) {
 		this(queryMethod.getRequiredQuery(), queryMethod, operations, rowMapperFactory, converter, delegate);
 	}
 
@@ -154,8 +111,7 @@ public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOpera
 	 * @since 3.4
 	 */
 	public StringBasedJdbcQuery(String query, JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
-			RowMapperFactory rowMapperFactory, JdbcConverter converter,
-			ValueExpressionDelegate delegate) {
+			RowMapperFactory rowMapperFactory, JdbcConverter converter, ValueExpressionDelegate delegate) {
 		super(queryMethod, operations);
 		Assert.hasText(query, "Query must not be null or empty");
 		Assert.notNull(rowMapperFactory, "RowMapperFactory must not be null");
@@ -191,29 +147,6 @@ public StringBasedJdbcQuery(String query, JdbcQueryMethod queryMethod, NamedPara
 		this.delegate = delegate;
 	}
 
-	/**
-	 * Creates a new {@link StringBasedJdbcQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext}
-	 * and {@link 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 rowMapperFactory must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
-	 * @since 3.4
-	 * @deprecated since 3.4, use the constructors accepting {@link ValueExpressionDelegate} instead.
-	 */
-	@Deprecated(since = "3.4")
-	public StringBasedJdbcQuery(String query, JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations,
-			RowMapperFactory rowMapperFactory, JdbcConverter converter,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		this(query, queryMethod, operations, rowMapperFactory, converter, new CachingValueExpressionDelegate(
-				new QueryMethodValueEvaluationContextAccessor(new StandardEnvironment(), rootObject -> evaluationContextProvider
-						.getEvaluationContext(queryMethod.getParameters(), new Object[] { rootObject })),
-				ValueExpressionParser.create()));
-	}
-
 	@Override
 	public Object execute(Object[] objects) {
 

spring-data-jdbc/src/main/kotlin/org/springframework/data/jdbc/core/JdbcAggregateOperationsExtensions.kt

@@ -20,7 +20,7 @@ import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.domain.Sort
 import org.springframework.data.relational.core.query.Query
-import java.util.Optional
+import java.util.*
 
 /**
  * Kotlin extensions for [JdbcAggregateOperations].
@@ -80,7 +80,7 @@ inline fun <reified T> JdbcAggregateOperations.findAll(sort: Sort): List<T> =
 /**
  * Extension for [JdbcAggregateOperations.findAll] with pagination.
  */
-inline fun <reified T> JdbcAggregateOperations.findAll(pageable: Pageable): Page<T> =
+inline fun <reified T : Any> JdbcAggregateOperations.findAll(pageable: Pageable): Page<T> =
 		findAll(T::class.java, pageable)
 
 /**
@@ -98,7 +98,10 @@ inline fun <reified T> JdbcAggregateOperations.findAll(query: Query): List<T> =
 /**
  * Extension for [JdbcAggregateOperations.findAll] with query and pagination.
  */
-inline fun <reified T> JdbcAggregateOperations.findAll(query: Query, pageable: Pageable): Page<T> =
+inline fun <reified T : Any> JdbcAggregateOperations.findAll(
+	query: Query,
+	pageable: Pageable
+): Page<T> =
 		findAll(query, T::class.java, pageable)
 
 /**
@@ -117,4 +120,4 @@ inline fun <reified T> JdbcAggregateOperations.deleteAllById(ids: Iterable<*>):
  * Extension for [JdbcAggregateOperations.deleteAll].
  */
 inline fun <reified T> JdbcAggregateOperations.deleteAll(): Unit =
-		deleteAll(T::class.java)
+		deleteAll(T::class.java)

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

@@ -75,11 +75,11 @@
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
 import org.springframework.data.repository.core.support.RepositoryFactoryCustomizer;
-import org.springframework.data.repository.query.ExtensionAwareQueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.spel.EvaluationContextProvider;
+import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.data.spel.spi.EvaluationContextExtension;
 import org.springframework.data.support.WindowIterator;
 import org.springframework.data.util.Streamable;
@@ -1573,12 +1573,12 @@ MyEventListener eventListener() {
 		}
 
 		@Bean
-		public QueryMethodEvaluationContextProvider extensionAware(List<EvaluationContextExtension> exts) {
-			return new ExtensionAwareQueryMethodEvaluationContextProvider(exts);
+		public EvaluationContextProvider extensionAware(List<EvaluationContextExtension> exts) {
+			return new ExtensionAwareEvaluationContextProvider(exts);
 		}
 
 		@Bean
-		RepositoryFactoryCustomizer customizer(QueryMethodEvaluationContextProvider provider) {
+		RepositoryFactoryCustomizer customizer(EvaluationContextProvider provider) {
 			return repositoryFactory -> repositoryFactory.setEvaluationContextProvider(provider);
 		}
 

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

@@ -40,7 +40,6 @@
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.util.TypeInformation;
@@ -72,7 +71,6 @@ class JdbcQueryLookupStrategyUnitTests {
 	private RepositoryMetadata metadata;
 	private NamedQueries namedQueries = mock(NamedQueries.class);
 	private NamedParameterJdbcOperations operations = mock(NamedParameterJdbcOperations.class);
-	QueryMethodEvaluationContextProvider evaluationContextProvider = mock(QueryMethodEvaluationContextProvider.class);
 
 	@BeforeEach
 	void setup() {

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java

@@ -50,7 +50,7 @@
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.query.ExtensionAwareQueryMethodEvaluationContextProvider;
+import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.data.spel.spi.EvaluationContextExtension;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -97,8 +97,7 @@ JdbcRepositoryFactory jdbcRepositoryFactory(
 
 		namedQueries.map(it -> it.iterator().next()).ifPresent(factory::setNamedQueries);
 
-		factory.setEvaluationContextProvider(
-				new ExtensionAwareQueryMethodEvaluationContextProvider(evaulationContextExtensions));
+		factory.setEvaluationContextProvider(new ExtensionAwareEvaluationContextProvider(evaulationContextExtensions));
 		return factory;
 	}
 
@@ -118,22 +117,24 @@ DataAccessStrategy defaultDataAccessStrategy(
 			@Qualifier("namedParameterJdbcTemplate") NamedParameterJdbcOperations template, RelationalMappingContext context,
 			JdbcConverter converter, Dialect dialect) {
 
-		return new DataAccessStrategyFactory(new SqlGeneratorSource(context, converter, dialect), converter,
-				template, new SqlParametersFactory(context, converter),
-				new InsertStrategyFactory(template, dialect)).create();
+		return new DataAccessStrategyFactory(new SqlGeneratorSource(context, converter, dialect), converter, template,
+				new SqlParametersFactory(context, converter), new InsertStrategyFactory(template, dialect)).create();
 	}
 
 	@Bean("jdbcMappingContext")
 	@Profile(PROFILE_NO_SINGLE_QUERY_LOADING)
-	JdbcMappingContext jdbcMappingContextWithOutSingleQueryLoading(Optional<NamingStrategy> namingStrategy, CustomConversions conversions) {
+	JdbcMappingContext jdbcMappingContextWithOutSingleQueryLoading(Optional<NamingStrategy> namingStrategy,
+			CustomConversions conversions) {
 
 		JdbcMappingContext mappingContext = new JdbcMappingContext(namingStrategy.orElse(DefaultNamingStrategy.INSTANCE));
 		mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		return mappingContext;
 	}
+
 	@Bean("jdbcMappingContext")
 	@Profile(PROFILE_SINGLE_QUERY_LOADING)
-	JdbcMappingContext jdbcMappingContextWithSingleQueryLoading(Optional<NamingStrategy> namingStrategy, CustomConversions conversions) {
+	JdbcMappingContext jdbcMappingContextWithSingleQueryLoading(Optional<NamingStrategy> namingStrategy,
+			CustomConversions conversions) {
 
 		JdbcMappingContext mappingContext = new JdbcMappingContext(namingStrategy.orElse(DefaultNamingStrategy.INSTANCE));
 		mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());

spring-data-r2dbc/pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-r2dbc</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 
 	<name>Spring Data R2DBC</name>
 	<description>Spring Data module for R2DBC</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcParameterAccessor.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.r2dbc.repository.query;
 
-import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -25,9 +24,11 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.reactivestreams.Publisher;
+
 import org.springframework.data.relational.repository.query.RelationalParametersParameterAccessor;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
+import org.springframework.data.util.ReactiveWrappers;
 
 /**
  * Reactive {@link org.springframework.data.repository.query.ParametersParameterAccessor} implementation that subscribes