Merge branch 'spring-projects:main' into main

Author: ShenFeng312

.github/workflows/codeql.yml

@@ -41,7 +41,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +68,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.gitignore

@@ -11,6 +11,7 @@ target/
 *.graphml
 package-lock.json
 .mvn/.develocity
+.mvn/maven.config
 
 build/
 node_modules

README.adoc

@@ -1,4 +1,4 @@
-= Spring Data Relational image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-jdbc%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-jdbc/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Relational Parent"]
+= Spring Data Relational image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-jdbc%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-jdbc/] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Relational Parent"]
 
 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
@@ -202,7 +202,6 @@ https://docs.spring.io/spring-data/relational/reference/[reference documentation
 If you are just starting out with Spring, try one of the https://spring.io/guides[guides].
 * If you are upgrading, check out the https://github.com/spring-projects/spring-data-relational/releases[changelog] for "`new and noteworthy`" features.
 * Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data`].
-You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
 
 == Reporting Issues
 

pom.xml

@@ -35,22 +35,21 @@
 		<h2.version>2.3.232</h2.version>
 		<hikari.version>5.1.0</hikari.version>
 		<hsqldb.version>2.7.3</hsqldb.version>
-		<mariadb-java-client.version>3.5.1</mariadb-java-client.version>
-		<mssql.version>12.8.1.jre11</mssql.version>
-		<mysql-connector-java.version>8.0.33</mysql-connector-java.version>
-		<postgresql.version>42.7.4</postgresql.version>
+		<mariadb-java-client.version>3.5.3</mariadb-java-client.version>
+		<mssql.version>12.10.0.jre11</mssql.version>
+		<mysql-connector-java.version>9.2.0</mysql-connector-java.version>
+		<postgresql.version>42.7.5</postgresql.version>
 		<oracle.version>23.7.0.25.01</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-mariadb.version>1.1.4</r2dbc-mariadb.version>
 		<r2dbc-mssql.version>1.0.2.RELEASE</r2dbc-mssql.version>
-		<r2dbc-mysql.version>1.3.2</r2dbc-mysql.version>
+		<r2dbc-mysql.version>1.4.1</r2dbc-mysql.version>
 		<oracle-r2dbc.version>1.3.0</oracle-r2dbc.version>
 
 		<!-- test dependencies -->
-		<awaitility.version>4.2.0</awaitility.version>
 		<archunit.version>1.3.0</archunit.version>
 
 		<jmh.version>1.37</jmh.version>

spring-data-jdbc/pom.xml

@@ -124,8 +124,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
 			<version>${mysql-connector-java.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
-			<version>${awaitility.version}</version>
+			<version>${awaitility}</version>
 			<scope>test</scope>
 		</dependency>
 

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

@@ -557,7 +557,6 @@ private <T> RootAggregateChange<T> createInsertChange(T instance) {
 	}
 
 	private <T> RootAggregateChange<T> createUpdateChange(EntityAndPreviousVersion<T> entityAndVersion) {
-
 		RootAggregateChange<T> aggregateChange = MutableAggregateChange.forSave(entityAndVersion.entity,
 				entityAndVersion.version);
 		new RelationalEntityUpdateWriter<T>(context).write(entityAndVersion.entity, aggregateChange);

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

@@ -0,0 +1,71 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.core.convert;
+
+import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.relational.core.conversion.MutableAggregateChange;
+import org.springframework.data.relational.core.dialect.Dialect;
+import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
+import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveCallback;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.util.Assert;
+
+/**
+ * Callback for generating identifier values through a database sequence.
+ *
+ * @author Mikhail Polivakha
+ * @author Mark Paluch
+ * @since 3.5
+ */
+public class IdGeneratingEntityCallback implements BeforeSaveCallback<Object> {
+
+	private final MappingContext<RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> context;
+	private final SequenceEntityCallbackDelegate delegate;
+
+	public IdGeneratingEntityCallback(
+			MappingContext<RelationalPersistentEntity<?>, ? extends RelationalPersistentProperty> context, Dialect dialect,
+			NamedParameterJdbcOperations operations) {
+
+		this.context = context;
+		this.delegate = new SequenceEntityCallbackDelegate(dialect, operations);
+	}
+
+	@Override
+	public Object onBeforeSave(Object aggregate, MutableAggregateChange<Object> aggregateChange) {
+
+		Assert.notNull(aggregate, "Aggregate must not be null");
+
+		RelationalPersistentEntity<?> entity = context.getRequiredPersistentEntity(aggregate.getClass());
+
+		if (!entity.hasIdProperty()) {
+			return aggregate;
+		}
+
+		RelationalPersistentProperty property = entity.getRequiredIdProperty();
+		PersistentPropertyAccessor<Object> accessor = entity.getPropertyAccessor(aggregate);
+
+		if (!entity.isNew(aggregate) || delegate.hasValue(property, accessor) || !property.hasSequence()) {
+			return aggregate;
+		}
+
+		delegate.generateSequenceValue(property, accessor);
+
+		return accessor.getBean();
+	}
+
+}

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

@@ -22,8 +22,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.AggregateContext;
 import org.springframework.data.jdbc.core.convert.RowDocumentExtractorSupport.RowDocumentSink;
@@ -45,8 +45,8 @@
  */
 class RowDocumentResultSetExtractor {
 
-	private static final Logger log = LoggerFactory.getLogger(RowDocumentResultSetExtractor.class);
-	public static final String DUPLICATE_COLUMN_WARNING = "ResultSet contains column \"{}\" multiple times. Later column index is {}";
+	private static final Log log = LogFactory.getLog(RowDocumentResultSetExtractor.class);
+	public static final String DUPLICATE_COLUMN_WARNING = "ResultSet contains column \"%s\" multiple times. Later column index is %s";
 
 	private final RelationalMappingContext context;
 	private final PathToColumnMapping propertyToColumn;
@@ -76,7 +76,7 @@ static RowDocument toRowDocument(ResultSet resultSet) throws SQLException {
 			String columnName = JdbcUtils.lookupColumnName(md, i+1);
 			Object old = document.putIfAbsent(columnName, rsv instanceof Array a ? a.getArray() : rsv);
 			if (old != null) {
-				log.warn(DUPLICATE_COLUMN_WARNING, columnName, i);
+				log.warn(DUPLICATE_COLUMN_WARNING.formatted(columnName, i));
 			}
 		}
 
@@ -120,7 +120,7 @@ public Map<String, Integer> getColumnMap(ResultSet result) {
 					String columnLabel = metaData.getColumnLabel(i + 1);
 					Object old = columns.put(columnLabel, i + 1);
 					if (old != null) {
-						log.warn(DUPLICATE_COLUMN_WARNING, columnLabel, i);
+						log.warn(DUPLICATE_COLUMN_WARNING.formatted( columnLabel, i));
 					}
 				}
 				return columns;

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

@@ -0,0 +1,102 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.core.convert;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.relational.core.dialect.Dialect;
+import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
+import org.springframework.data.relational.core.sql.SqlIdentifier;
+import org.springframework.data.util.ReflectionUtils;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.NumberUtils;
+
+/**
+ * Support class for generating identifier values through a database sequence.
+ *
+ * @author Mikhail Polivakha
+ * @author Mark Paluch
+ * @since 3.5
+ * @see org.springframework.data.relational.core.mapping.Sequence
+ */
+class SequenceEntityCallbackDelegate {
+
+	private static final Log LOG = LogFactory.getLog(SequenceEntityCallbackDelegate.class);
+	private final static MapSqlParameterSource EMPTY_PARAMETERS = new MapSqlParameterSource();
+
+	private final Dialect dialect;
+	private final NamedParameterJdbcOperations operations;
+
+	public SequenceEntityCallbackDelegate(Dialect dialect, NamedParameterJdbcOperations operations) {
+		this.dialect = dialect;
+		this.operations = operations;
+	}
+
+	@SuppressWarnings("unchecked")
+	protected void generateSequenceValue(RelationalPersistentProperty property,
+			PersistentPropertyAccessor<Object> accessor) {
+
+		Object sequenceValue = getSequenceValue(property);
+
+		if (sequenceValue == null) {
+			return;
+		}
+
+		Class<?> targetType = ClassUtils.resolvePrimitiveIfNecessary(property.getType());
+		if (sequenceValue instanceof Number && Number.class.isAssignableFrom(targetType)) {
+			sequenceValue = NumberUtils.convertNumberToTargetClass((Number) sequenceValue,
+					(Class<? extends Number>) targetType);
+		}
+
+		accessor.setProperty(property, sequenceValue);
+	}
+
+	protected boolean hasValue(PersistentProperty<?> property, PersistentPropertyAccessor<Object> propertyAccessor) {
+
+		Object identifier = propertyAccessor.getProperty(property);
+
+		if (property.getType().isPrimitive()) {
+
+			Object primitiveDefault = ReflectionUtils.getPrimitiveDefault(property.getType());
+			return !primitiveDefault.equals(identifier);
+		}
+
+		return identifier != null;
+	}
+
+	private @Nullable Object getSequenceValue(RelationalPersistentProperty property) {
+
+		SqlIdentifier sequence = property.getSequence();
+
+		if (sequence != null && !dialect.getIdGeneration().sequencesSupported()) {
+			LOG.warn("""
+					Aggregate type '%s' is marked for sequence usage but configured dialect '%s'
+					does not support sequences. Falling back to identity columns.
+					""".formatted(property.getOwner().getType(), ClassUtils.getQualifiedName(dialect.getClass())));
+			return null;
+		}
+
+		String sql = dialect.getIdGeneration().createSequenceQuery(sequence);
+		return operations.queryForObject(sql, EMPTY_PARAMETERS, (rs, rowNum) -> rs.getObject(1));
+	}
+
+}