From 6777f4f7acaea881c215f6f312b96426eecbfa5a Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Wed, 14 Dec 2022 19:26:07 +0100 Subject: [PATCH] Fixup batch method naming --- .../org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java | 2 +- .../jdbc/mutation/internal/MutationExecutorSingleBatched.java | 2 +- .../engine/jdbc/mutation/internal/MutationExecutorStandard.java | 2 +- .../java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java index 6c2afd858d..1a5a422f7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java @@ -172,7 +172,7 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator { } @Override - public Batch getBatch2(BatchKey key, Integer batchSize, Supplier statementGroupSupplier) { + public Batch getBatch(BatchKey key, Integer batchSize, Supplier statementGroupSupplier) { if ( currentBatch != null ) { if ( currentBatch.getKey().equals( key ) ) { return currentBatch; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java index a7bf22d729..fccc55de94 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorSingleBatched.java @@ -44,7 +44,7 @@ public class MutationExecutorSingleBatched extends AbstractSingleMutationExecuto private Batch resolveBatch() { if ( batch == null ) { - batch = session.getJdbcCoordinator().getBatch2( + batch = session.getJdbcCoordinator().getBatch( batchKey, batchSize, () -> new PreparedStatementGroupSingleTable( getMutationOperation(), session ) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java index 65e54d8df2..bbfe8f217d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/MutationExecutorStandard.java @@ -127,7 +127,7 @@ public class MutationExecutorStandard extends AbstractMutationExecutor { } else { final List batchedMutationsRef = batchedJdbcMutations; - this.batch = session.getJdbcCoordinator().getBatch2( + this.batch = session.getJdbcCoordinator().getBatch( batchKey, batchSize, () -> ModelMutationHelper.toPreparedStatementGroup( diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java index c49b746b8e..3a1eccf19b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java @@ -49,7 +49,7 @@ public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwn * * @implNote Any previous Batch is executed and released prior to returning */ - Batch getBatch2( + Batch getBatch( BatchKey key, Integer batchSize, Supplier statementGroupSupplier);