slight code improvements around batch stuff

Author: gavinking

hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java

@@ -29,7 +29,7 @@ public enum ResultCheckStyle {
 	/**
 	 * No return code checking. Might mean that no checks are required, or that
 	 * failure is indicated by a {@link java.sql.SQLException} being thrown, for
-	 * example, by a {@link java.sql.CallableStatement stored procedure} which
+	 * example, by a {@linkplain java.sql.CallableStatement stored procedure} which
 	 * performs explicit checks.
 	 *
 	 * @see org.hibernate.jdbc.Expectation.None
@@ -47,7 +47,7 @@ public enum ResultCheckStyle {
 	COUNT,
 	/**
 	 * Essentially identical to {@link #COUNT} except that the row count is
-	 * obtained via an output parameter of a {@link java.sql.CallableStatement
+	 * obtained via an output parameter of a {@linkplain java.sql.CallableStatement
 	 * stored procedure}.
 	 * <p>
 	 * Statement batching is disabled when {@code PARAM} is selected.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BasicBatchKey.java

@@ -5,41 +5,13 @@
 package org.hibernate.engine.jdbc.batch.internal;
 
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
-import org.hibernate.jdbc.Expectations;
 
 /**
  * Normal implementation of {@link BatchKey}
  *
  * @author Steve Ebersole
  */
-public class BasicBatchKey implements BatchKey {
-	private final String comparison;
-
-	/**
-	 * Constructs a BasicBatchKey with {@link Expectations#NONE}
-	 */
-	public BasicBatchKey(String comparison) {
-		this.comparison = comparison;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
-			return true;
-		}
-		if ( o == null || getClass() != o.getClass() ) {
-			return false;
-		}
-
-		final BasicBatchKey that = (BasicBatchKey) o;
-		return comparison.equals( that.comparison );
-	}
-
-	@Override
-	public int hashCode() {
-		return comparison.hashCode();
-	}
-
+public record BasicBatchKey(String comparison) implements BatchKey {
 	@Override
 	public String toLoggableString() {
 		return comparison;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.engine.jdbc.batch.internal;
 
-import java.util.Collections;
 import java.util.function.Supplier;
 
 import org.hibernate.Internal;
@@ -15,11 +14,12 @@
 import org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupSingleTable;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.sql.model.TableMapping;
 import org.hibernate.sql.model.jdbc.JdbcInsertMutation;
 
+import static java.util.Collections.emptyList;
 import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_LOGGER;
-import static org.hibernate.jdbc.Expectations.NONE;
 
 /**
  * A builder for {@link Batch} instances.
@@ -134,8 +134,8 @@ public MutationDetails getDeleteDetails() {
 								null,
 								sql,
 								false,
-								NONE,
-								Collections.emptyList()
+								Expectation.None.INSTANCE,
+								emptyList()
 						),
 						session
 				),

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java

@@ -26,6 +26,7 @@
 import org.hibernate.resource.jdbc.spi.JdbcEventHandler;
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner;
 
+import static java.util.Objects.requireNonNull;
 import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_MESSAGE_LOGGER;
 import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_LOGGER;
 import static org.hibernate.engine.jdbc.batch.JdbcBatchLogging.BATCH_MESSAGE_LOGGER;
@@ -56,21 +57,18 @@ public BatchImpl(
 			PreparedStatementGroup statementGroup,
 			int batchSizeToUse,
 			JdbcCoordinator jdbcCoordinator) {
-		if ( key == null ) {
-			throw new IllegalArgumentException( "Batch key cannot be null" );
-		}
-		if ( jdbcCoordinator == null ) {
-			throw new IllegalArgumentException( "JDBC coordinator cannot be null" );
-		}
+		requireNonNull( key, "Batch key cannot be null" );
+		requireNonNull( jdbcCoordinator, "JDBC coordinator cannot be null" );
 
 		this.batchSizeToUse = batchSizeToUse;
 		this.key = key;
 		this.jdbcCoordinator = jdbcCoordinator;
 		this.statementGroup = statementGroup;
 
-		final JdbcServices jdbcServices = jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getJdbcServices();
-		this.sqlStatementLogger = jdbcServices.getSqlStatementLogger();
-		this.sqlExceptionHelper = jdbcServices.getSqlExceptionHelper();
+		final JdbcServices jdbcServices =
+				jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getJdbcServices();
+		sqlStatementLogger = jdbcServices.getSqlStatementLogger();
+		sqlExceptionHelper = jdbcServices.getSqlExceptionHelper();
 
 		if ( BATCH_LOGGER.isTraceEnabled() ) {
 			BATCH_MESSAGE_LOGGER.createBatch(
@@ -134,7 +132,8 @@ public void addToBatch(JdbcValueBindings jdbcValueBindings, TableInclusionChecke
 				else {
 					//noinspection resource
 					final PreparedStatement statement = statementDetails.resolveStatement();
-					sqlStatementLogger.logStatement( statementDetails.getSqlString() );
+					final String sqlString = statementDetails.getSqlString();
+					sqlStatementLogger.logStatement( sqlString );
 					jdbcValueBindings.beforeStatement( statementDetails );
 					try {
 						statement.addBatch();
@@ -144,7 +143,7 @@ public void addToBatch(JdbcValueBindings jdbcValueBindings, TableInclusionChecke
 						throw sqlExceptionHelper.convert(
 								e,
 								"Could not perform addBatch",
-								statementDetails.getSqlString()
+								sqlString
 						);
 					}
 					finally {
@@ -303,10 +302,11 @@ private void checkRowCounts(int[] rowCounts, PreparedStatementDetails statementD
 			);
 		}
 
+		final String sql = statementDetails.getSqlString();
 		for ( int i = 0; i < numberOfRowCounts; i++ ) {
 			try {
 				statementDetails.getExpectation()
-						.verifyOutcome( rowCounts[i], statementDetails.getStatement(), i, statementDetails.getSqlString() );
+						.verifyOutcome( rowCounts[i], statementDetails.getStatement(), i, sql );
 			}
 			catch ( StaleStateException staleStateException ) {
 				if ( staleStateMappers != null ) {

hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java

@@ -147,6 +147,7 @@ default void validate(boolean callable) throws MappingException {
 	 * @since 6.5
 	 */
 	class None implements Expectation {
+		public static final None INSTANCE = new None();
 		@Override
 		public void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
 			// nothing to do

hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java

@@ -22,7 +22,7 @@
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.FilterAliasGenerator;
-import org.hibernate.jdbc.Expectations;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.mapping.Collection;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
@@ -350,7 +350,7 @@ public RestrictedTableMutation<JdbcMutationOperation> generateDeleteAllAst(Mutat
 				null,
 				parameterBinders,
 				sqlWhereString,
-				Expectations.NONE
+				Expectation.None.INSTANCE
 		);
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/model/internal/TableUpdateNoSet.java

@@ -23,8 +23,6 @@
 import org.hibernate.sql.model.ast.TableUpdate;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
-import static org.hibernate.jdbc.Expectations.NONE;
-
 /**
  * A skipped update
  *
@@ -69,7 +67,7 @@ protected JdbcMutationOperation createMutationOperation(
 
 	@Override
 	public Expectation getExpectation() {
-		return NONE;
+		return Expectation.None.INSTANCE;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import org.hibernate.jdbc.Expectations;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
@@ -23,7 +23,7 @@ public MergeOperation(
 			MutationTarget<?> mutationTarget,
 			String sql,
 			List<? extends JdbcParameterBinder> parameterBinders) {
-		super( tableDetails, mutationTarget, sql, false, Expectations.NONE, parameterBinders );
+		super( tableDetails, mutationTarget, sql, false, Expectation.None.INSTANCE, parameterBinders );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import org.hibernate.jdbc.Expectations;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
@@ -23,7 +23,7 @@ public UpsertOperation(
 			MutationTarget<?> mutationTarget,
 			String sql,
 			List<? extends JdbcParameterBinder> parameterBinders) {
-		super( tableDetails, mutationTarget, sql, false, Expectations.NONE, parameterBinders );
+		super( tableDetails, mutationTarget, sql, false, Expectation.None.INSTANCE, parameterBinders );
 	}
 
 	@Override