Merge branch 'main' into main

Signed-off-by: Artemiy Degtyarev <[email protected]>

Author: chrshnv

README.adoc

@@ -30,6 +30,17 @@ Here is a quick teaser of an application using Spring Data JDBC Repositories in
 
 [source,java]
 ----
+@Table
+public class Person {
+
+    @Id
+    private Long id;
+    private String firstname;
+    private String lastname;
+
+    // getters and setters
+}
+
 interface PersonRepository extends CrudRepository<Person, Long> {
 
     @Query("SELECT * FROM person WHERE lastname = :lastname")

pom.xml

@@ -35,22 +35,22 @@
 		<h2.version>2.4.240</h2.version>
 		<hikari.version>5.1.0</hikari.version>
 		<hsqldb.version>2.7.3</hsqldb.version>
-		<mariadb-java-client.version>3.5.5</mariadb-java-client.version>
-		<mssql.version>13.2.0.jre11</mssql.version>
-		<mysql-connector-java.version>9.4.0</mysql-connector-java.version>
+		<mariadb-java-client.version>3.5.6</mariadb-java-client.version>
+		<mssql.version>13.2.1.jre11</mssql.version>
+		<mysql-connector-java.version>9.5.0</mysql-connector-java.version>
 		<postgresql.version>42.7.8</postgresql.version>
-		<oracle.version>23.9.0.25.07</oracle.version>
+		<oracle.version>23.26.0.0.0</oracle.version>
 
 		<!-- R2DBC driver dependencies-->
-		<r2dbc-postgresql.version>1.0.7.RELEASE</r2dbc-postgresql.version>
-		<r2dbc-h2.version>1.0.0.RELEASE</r2dbc-h2.version>
+		<r2dbc-postgresql.version>1.1.1.RELEASE</r2dbc-postgresql.version>
+		<r2dbc-h2.version>1.1.0.RELEASE</r2dbc-h2.version>
 		<r2dbc-mariadb.version>1.3.0</r2dbc-mariadb.version>
 		<r2dbc-mssql.version>1.0.3.RELEASE</r2dbc-mssql.version>
 		<r2dbc-mysql.version>1.4.1</r2dbc-mysql.version>
 		<oracle-r2dbc.version>1.3.0</oracle-r2dbc.version>
 
 		<!-- test dependencies -->
-		<archunit.version>1.3.0</archunit.version>
+		<archunit.version>1.4.1</archunit.version>
 
 		<mbr.version>0.4.0.BUILD-SNAPSHOT</mbr.version>
 	</properties>

spring-data-jdbc/pom.xml

@@ -23,18 +23,6 @@
 		<project.root>${basedir}/..</project.root>
 	</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers-bom</artifactId>
-				<version>${testcontainers}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 
 		<dependency>
@@ -205,6 +193,13 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.jmolecules</groupId>
+			<artifactId>jmolecules-ddd</artifactId>
+			<version>${jmolecules}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.jmolecules.integrations</groupId>
 			<artifactId>jmolecules-spring</artifactId>
@@ -241,9 +236,16 @@
 
 		<!-- Testcontainers -->
 
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.19.0</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>mysql</artifactId>
+			<artifactId>testcontainers-mysql</artifactId>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -255,31 +257,31 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>postgresql</artifactId>
+			<artifactId>testcontainers-postgresql</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>mariadb</artifactId>
+			<artifactId>testcontainers-mariadb</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>mssqlserver</artifactId>
+			<artifactId>testcontainers-mssqlserver</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>db2</artifactId>
+			<artifactId>testcontainers-db2</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>oracle-free</artifactId>
+			<artifactId>testcontainers-oracle-free</artifactId>
 			<scope>test</scope>
 		</dependency>
 

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

@@ -230,7 +230,11 @@ public interface JdbcAggregateOperations {
 	 * @param pageable the pagination information. Must not be {@code null}.
 	 * @return Guaranteed to be not {@code null}.
 	 * @since 2.0
+	 * @deprecated since 4.0. Use {@link #findAll(Class, Sort)} together with {@link #count(Class)} to construct results
+	 *             of type {@link Page}.The API design is conflicts regarding pagination information. Also, pagination is
+	 *             primarily a feature of the repository and not the template API.
 	 */
+	@Deprecated(since = "4.0", forRemoval = true)
 	<T> Page<T> findAll(Class<T> domainType, Pageable pageable);
 
 	/**
@@ -275,7 +279,11 @@ public interface JdbcAggregateOperations {
 	 * @param pageable can be null.
 	 * @return a {@link Page} of entities matching the given {@link Example}.
 	 * @since 3.0
+	 * @deprecated since 4.0. Use {@link #findAll(Query, Class)} together with {@link #count(Query, Class)} to construct
+	 *             results of type {@link Page}. The API design is conflicts regarding pagination information. Also,
+	 *             pagination is primarily a feature of the repository and not the template API.
 	 */
+	@Deprecated(since = "4.0", forRemoval = true)
 	<T> Page<T> findAll(Query query, Class<T> domainType, Pageable pageable);
 
 	/**

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

@@ -31,6 +31,7 @@
 import java.util.stream.StreamSupport;
 
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -41,7 +42,6 @@
 import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
 import org.springframework.data.jdbc.core.convert.EntityRowMapper;
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
-import org.springframework.data.jdbc.core.convert.QueryMappingConfiguration;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.relational.core.EntityLifecycleEventDelegate;
@@ -78,6 +78,7 @@
  * @author Sergey Korotaev
  * @author Mikhail Polivakha
  */
+@SuppressWarnings("removal")
 public class JdbcAggregateTemplate implements JdbcAggregateOperations, ApplicationContextAware {
 
 	private final EntityLifecycleEventDelegate eventDelegate = new EntityLifecycleEventDelegate();
@@ -88,7 +89,6 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations, Applicati
 	private final JdbcConverter converter;
 
 	private @Nullable EntityCallbacks entityCallbacks;
-	private QueryMappingConfiguration queryMappingConfiguration = QueryMappingConfiguration.EMPTY;
 
 	/**
 	 * Creates a new {@link JdbcAggregateTemplate} given {@link RelationalMappingContext} and {@link DataAccessStrategy}.
@@ -360,6 +360,7 @@ public <T> Stream<T> streamAll(Class<T> domainType, Sort sort) {
 	}
 
 	@Override
+	@Deprecated(since = "4.0", forRemoval = true)
 	public <T> Page<T> findAll(Class<T> domainType, Pageable pageable) {
 
 		Assert.notNull(domainType, "Domain type must not be null");
@@ -389,6 +390,7 @@ public <T> Stream<T> streamAll(Query query, Class<T> domainType) {
 	}
 
 	@Override
+	@Deprecated(since = "4.0", forRemoval = true)
 	public <T> Page<T> findAll(Query query, Class<T> domainType, Pageable pageable) {
 
 		Iterable<T> items = triggerAfterConvert(accessStrategy.findAll(query, domainType, pageable));

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

@@ -18,10 +18,10 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.relational.core.mapping.AggregatePath;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.domain.RowDocument;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.jdbc.core.RowMapper;
 
 /**

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

@@ -18,12 +18,13 @@
 import java.sql.SQLType;
 
 import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.domain.RowDocument;
-import org.springframework.data.util.TypeInformation;
 
 /**
  * A {@link JdbcConverter} is responsible for converting for values to the native relational representation and vice

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

@@ -29,6 +29,7 @@
 import org.springframework.data.convert.ConverterBuilder;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.jdbc.core.mapping.JdbcSimpleTypes;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.relational.core.dialect.Dialect;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
@@ -177,9 +178,8 @@ static JdbcConverterConfigurer from(Dialect dialect) {
 			converters.addAll(dialect.getConverters());
 			converters.addAll(JdbcCustomConversions.storeConverters());
 
-			StoreConversions storeConversions = StoreConversions.of(JdbcSimpleTypes.HOLDER, converters);
-
-			return new JdbcConverterConfigurer(storeConversions);
+			SimpleTypeHolder simpleTypeHolder = new SimpleTypeHolder(dialect.simpleTypes(), JdbcSimpleTypes.HOLDER);
+			return new JdbcConverterConfigurer(StoreConversions.of(simpleTypeHolder, converters));
 		}
 
 		/**

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

@@ -20,10 +20,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.relational.core.mapping.AggregatePath;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.domain.RowDocument;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.util.Assert;
 

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

@@ -26,10 +26,12 @@
 import java.util.function.Function;
 
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.jdbc.core.mapping.AggregateReference;
 import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.jdbc.support.JdbcUtil;
@@ -45,7 +47,6 @@
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.domain.RowDocument;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLExceptionSubclassTranslator;