Skip to content

Commit c42d4ef

Browse files
committed
fix up weird signature of ReactiveEntityPersister.insertReactive()
1 parent 9917783 commit c42d4ef

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityRegularInsertAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public CompletionStage<Void> reactiveExecute() throws HibernateException {
6363
final ReactiveEntityPersister reactivePersister = (ReactiveEntityPersister) persister;
6464
final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
6565
return stage
66-
.thenCompose( v -> reactivePersister.insertReactive( id, getState(), instance, session, false ) )
66+
.thenCompose( v -> reactivePersister.insertReactive( id, getState(), instance, session ) )
6767
.thenCompose( generatedValues -> {
6868
final EntityEntry entry = persistenceContext.getEntry( instance );
6969
if ( entry == null ) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.hibernate.generator.values.GeneratedValues;
1717
import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
1818
import org.hibernate.persister.entity.EntityPersister;
19-
import org.hibernate.reactive.persister.entity.mutation.ReactiveInsertCoordinator;
2019

2120
import jakarta.persistence.metamodel.Attribute;
2221

@@ -33,15 +32,14 @@ public interface ReactiveEntityPersister extends EntityPersister {
3332
*
3433
* @see EntityPersister#insert(Object, Object[], Object, SharedSessionContractImplementor)
3534
*/
36-
default CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session) {
37-
return ( (ReactiveInsertCoordinator) getInsertCoordinator() ).reactiveInsert( object, id, fields, session );
38-
};
35+
CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session);
3936

4037
/**
4138
* Insert the given instance state without blocking, but it allows to specify if it's an identity insert or a regular one.
4239
*
4340
* @see EntityPersister#insert(Object, Object[], Object, SharedSessionContractImplementor)
4441
*/
42+
@Deprecated(forRemoval = true)
4543
CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session, boolean isIdentityType);
4644

4745
/**

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ public NaturalIdMapping generateNaturalIdMapping(MappingModelCreationProcess cre
183183

184184
@Override
185185
public CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session) {
186-
return insertReactive( id, fields, object, session, true );
186+
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, id, fields, session, false );
187187
}
188188

189-
@Override
189+
@Override @Deprecated(forRemoval = true)
190190
public CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session, boolean isIdentityInsert) {
191191
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( object, id, fields, session, isIdentityInsert );
192192
}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ public CompletionStage<GeneratedValues> insertReactive(Object[] fields, Object e
343343

344344
@Override
345345
public CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session) {
346-
return insertReactive( id, fields, entity, session, true );
346+
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, false );
347347
}
348348

349-
@Override
349+
@Override @Deprecated(forRemoval = true)
350350
public CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session, boolean isIdentityInsert) {
351351
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert );
352352
}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,12 @@ private CompletionStage<Object> doReactiveLoad(Object id, Object optionalObject,
310310

311311
@Override
312312
public CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session) {
313-
return insertReactive( id, fields, entity, session, true );
313+
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, false );
314314
}
315315

316-
@Override
316+
@Override @Deprecated(forRemoval = true)
317317
public CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object entity, SharedSessionContractImplementor session, boolean isIdentityInsert) {
318-
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() )
319-
.coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert );
318+
return ( (ReactiveInsertCoordinatorStandard) getInsertCoordinator() ).coordinateReactiveInsert( entity, id, fields, session, isIdentityInsert );
320319
}
321320

322321
@Override

0 commit comments

Comments
 (0)