From c42d4eff0e4b1d4feae51bb9ab41ead5216d5720 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Mon, 17 Feb 2025 13:25:33 +0100 Subject: [PATCH 1/2] fix up weird signature of ReactiveEntityPersister.insertReactive() --- .../engine/impl/ReactiveEntityRegularInsertAction.java | 2 +- .../persister/entity/impl/ReactiveEntityPersister.java | 6 ++---- .../entity/impl/ReactiveJoinedSubclassEntityPersister.java | 4 ++-- .../entity/impl/ReactiveSingleTableEntityPersister.java | 4 ++-- .../entity/impl/ReactiveUnionSubclassEntityPersister.java | 7 +++---- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityRegularInsertAction.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityRegularInsertAction.java index 062f0374f..977179c73 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityRegularInsertAction.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityRegularInsertAction.java @@ -63,7 +63,7 @@ public CompletionStage reactiveExecute() throws HibernateException { final ReactiveEntityPersister reactivePersister = (ReactiveEntityPersister) persister; final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); return stage - .thenCompose( v -> reactivePersister.insertReactive( id, getState(), instance, session, false ) ) + .thenCompose( v -> reactivePersister.insertReactive( id, getState(), instance, session ) ) .thenCompose( generatedValues -> { final EntityEntry entry = persistenceContext.getEntry( instance ); if ( entry == null ) { diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java index ee35d9fca..965cf7442 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java @@ -16,7 +16,6 @@ import org.hibernate.generator.values.GeneratedValues; import org.hibernate.loader.ast.spi.MultiIdLoadOptions; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.reactive.persister.entity.mutation.ReactiveInsertCoordinator; import jakarta.persistence.metamodel.Attribute; @@ -33,15 +32,14 @@ public interface ReactiveEntityPersister extends EntityPersister { * * @see EntityPersister#insert(Object, Object[], Object, SharedSessionContractImplementor) */ - default CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session) { - return ( (ReactiveInsertCoordinator) getInsertCoordinator() ).reactiveInsert( object, id, fields, session ); - }; + CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session); /** * Insert the given instance state without blocking, but it allows to specify if it's an identity insert or a regular one. * * @see EntityPersister#insert(Object, Object[], Object, SharedSessionContractImplementor) */ + @Deprecated(forRemoval = true) CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session, boolean isIdentityType); /** diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java index c4e688ce6..2b53e48b1 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java @@ -183,10 +183,10 @@ public NaturalIdMapping generateNaturalIdMapping(MappingModelCreationProcess cre @Override public CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session) { - return insertReactive( id, fields, object, session, true ); + return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, id, fields, session, false ); } - @Override + @Override @Deprecated(forRemoval = true) public CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session, boolean isIdentityInsert) { return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, id, fields, session, isIdentityInsert ); } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java index 72b8c040e..1808483ed 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java @@ -343,10 +343,10 @@ public CompletionStage insertReactive(Object[] fields, Object e @Override public CompletionStage insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session) { - return insertReactive( id, fields, entity, session, true ); + return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, false ); } - @Override + @Override @Deprecated(forRemoval = true) public CompletionStage insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session, boolean isIdentityInsert) { return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert ); } diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java index c844f7644..8e657b37c 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java @@ -310,13 +310,12 @@ private CompletionStage doReactiveLoad(Object id, Object optionalObject, @Override public CompletionStage insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session) { - return insertReactive( id, fields, entity, session, true ); + return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, false ); } - @Override + @Override @Deprecated(forRemoval = true) public CompletionStage insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session, boolean isIdentityInsert) { - return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ) - .coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert ); + return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert ); } @Override From 5cbfc9facd111df5181ed814c8e97ffbbc816725 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Mon, 17 Feb 2025 14:28:24 +0100 Subject: [PATCH 2/2] just delete the obsolete overload --- .../persister/entity/impl/ReactiveEntityPersister.java | 8 -------- .../impl/ReactiveJoinedSubclassEntityPersister.java | 5 ----- .../entity/impl/ReactiveSingleTableEntityPersister.java | 5 ----- .../entity/impl/ReactiveUnionSubclassEntityPersister.java | 5 ----- 4 files changed, 23 deletions(-) diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java index 965cf7442..0a36d048d 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java @@ -34,14 +34,6 @@ public interface ReactiveEntityPersister extends EntityPersister { */ CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session); - /** - * Insert the given instance state without blocking, but it allows to specify if it's an identity insert or a regular one. - * - * @see EntityPersister#insert(Object, Object[], Object, SharedSessionContractImplementor) - */ - @Deprecated(forRemoval = true) - CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session, boolean isIdentityType); - /** * Insert the given instance state without blocking. * diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java index 2b53e48b1..b87ba6910 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java @@ -186,11 +186,6 @@ public CompletionStage insertReactive(Object id, Object[] field return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, id, fields, session, false ); } - @Override @Deprecated(forRemoval = true) - public CompletionStage insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session, boolean isIdentityInsert) { - return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, id, fields, session, isIdentityInsert ); - } - @Override public CompletionStage insertReactive(Object[] fields, Object object, SharedSessionContractImplementor session) { return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, null, fields, session, true ); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java index 1808483ed..381a83b78 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java @@ -346,11 +346,6 @@ public CompletionStage insertReactive(Object id, Object[] field return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, false ); } - @Override @Deprecated(forRemoval = true) - public CompletionStage insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session, boolean isIdentityInsert) { - return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert ); - } - @Override public CompletionStage deleteReactive(Object id, Object version, Object entity, SharedSessionContractImplementor session) { return ( (ReactiveAbstractDeleteCoordinator) getDeleteCoordinator() ).reactiveDelete( entity, id, version, session ); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java index 8e657b37c..cb7995acb 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java @@ -313,11 +313,6 @@ public CompletionStage insertReactive(Object id, Object[] field return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, false ); } - @Override @Deprecated(forRemoval = true) - public CompletionStage insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session, boolean isIdentityInsert) { - return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert ); - } - @Override public CompletionStage insertReactive(Object[] fields, Object entity, SharedSessionContractImplementor session) { return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() )