Skip to content

Commit e125b9f

Browse files
committed
[#2209] fix more unnecessary casts to ReactiveSession
at least some of these are not actually bugs, but some others look sus
1 parent 402ce62 commit e125b9f

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveDeleteEventListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.hibernate.reactive.event.ReactiveDeleteEventListener;
4848
import org.hibernate.reactive.logging.impl.Log;
4949
import org.hibernate.reactive.logging.impl.LoggerFactory;
50+
import org.hibernate.reactive.session.ReactiveQueryProducer;
5051
import org.hibernate.reactive.session.ReactiveSession;
5152
import org.hibernate.type.CollectionType;
5253
import org.hibernate.type.CompositeType;
@@ -198,7 +199,7 @@ private CompletionStage<Void> fetchAndDelete(DeleteEvent event, DeleteContext tr
198199
}
199200

200201
//Object entity = persistenceContext.unproxyAndReassociate( event.getObject() );
201-
return ( (ReactiveSession) source )
202+
return ( (ReactiveQueryProducer) source )
202203
.reactiveFetch( objectEvent, true )
203204
.thenCompose( entity -> delete( event, transientEntities, entity ) );
204205

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveLockEventListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.hibernate.reactive.event.ReactiveLockEventListener;
3434
import org.hibernate.reactive.logging.impl.Log;
3535
import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
36+
import org.hibernate.reactive.session.ReactiveQueryProducer;
3637
import org.hibernate.reactive.session.ReactiveSession;
3738

3839
import static java.lang.invoke.MethodHandles.lookup;
@@ -80,7 +81,7 @@ public CompletionStage<Void> reactiveOnLock(LockEvent event) throws HibernateExc
8081
//TODO: if object was an uninitialized proxy, this is inefficient,
8182
// resulting in two SQL selects
8283

83-
return ( (ReactiveSession) source ).reactiveFetch( event.getObject(), true )
84+
return ( (ReactiveQueryProducer) source ).reactiveFetch( event.getObject(), true )
8485
.thenCompose( entity -> reactiveOnLock( event, entity ) );
8586
}
8687

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveRefreshEventListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.hibernate.reactive.logging.impl.Log;
3838
import org.hibernate.reactive.logging.impl.LoggerFactory;
3939
import org.hibernate.reactive.persister.entity.impl.ReactiveAbstractEntityPersister;
40-
import org.hibernate.reactive.session.ReactiveSession;
40+
import org.hibernate.reactive.session.ReactiveQueryProducer;
4141
import org.hibernate.type.CollectionType;
4242
import org.hibernate.type.CompositeType;
4343
import org.hibernate.type.Type;
@@ -84,7 +84,7 @@ public CompletionStage<Void> reactiveOnRefresh(RefreshEvent event, RefreshContex
8484
// Hibernate Reactive doesn't support detached instances in refresh()
8585
throw new IllegalArgumentException( "Unmanaged instance passed to refresh()" );
8686
}
87-
return ( (ReactiveSession) source )
87+
return ( (ReactiveQueryProducer) source )
8888
.reactiveFetch( event.getObject(), true )
8989
.thenCompose( entity -> reactiveOnRefresh( event, refreshedAlready, entity ) );
9090
}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/cte/ReactiveAbstractCteMutationHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess;
3131
import org.hibernate.query.sqm.tree.SqmDeleteOrUpdateStatement;
3232
import org.hibernate.query.sqm.tree.expression.SqmParameter;
33+
import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
3334
import org.hibernate.reactive.query.sqm.mutation.spi.ReactiveAbstractMutationHandler;
34-
import org.hibernate.reactive.session.ReactiveSession;
3535
import org.hibernate.reactive.sql.exec.internal.StandardReactiveSelectExecutor;
3636
import org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer;
3737
import org.hibernate.sql.ast.SqlAstTranslator;
@@ -176,7 +176,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
176176
);
177177
lockOptions.setAliasSpecificLockMode( explicitDmlTargetAlias, lockMode );
178178

179-
return ( (ReactiveSession) executionContext.getSession() )
179+
return ( (ReactiveSharedSessionContractImplementor) executionContext.getSession() )
180180
.reactiveAutoFlushIfRequired( select.getAffectedTableNames() )
181181
.thenCompose( v -> StandardReactiveSelectExecutor.INSTANCE.list(
182182
select,

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/mutation/internal/cte/ReactiveCteInsertHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
import org.hibernate.query.sqm.tree.insert.SqmInsertStatement;
4242
import org.hibernate.query.sqm.tree.insert.SqmInsertValuesStatement;
4343
import org.hibernate.query.sqm.tree.insert.SqmValues;
44+
import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
4445
import org.hibernate.reactive.logging.impl.Log;
4546
import org.hibernate.reactive.logging.impl.LoggerFactory;
4647
import org.hibernate.reactive.query.sqm.mutation.internal.ReactiveHandler;
47-
import org.hibernate.reactive.session.ReactiveSession;
4848
import org.hibernate.reactive.sql.exec.internal.StandardReactiveSelectExecutor;
4949
import org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer;
5050
import org.hibernate.spi.NavigablePath;
@@ -554,7 +554,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
554554
executionContext.getSession()
555555
);
556556
final JdbcOperationQuerySelect select = translator.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
557-
return ( (ReactiveSession) executionContext.getSession() )
557+
return ( (ReactiveSharedSessionContractImplementor) executionContext.getSession() )
558558
.reactiveAutoFlushIfRequired( select.getAffectedTableNames() )
559559
.thenCompose( v -> StandardReactiveSelectExecutor.INSTANCE.list(
560560
select,

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/internal/ReactiveEntityInitializerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.hibernate.persister.entity.EntityPersister;
2525
import org.hibernate.proxy.LazyInitializer;
2626
import org.hibernate.proxy.map.MapProxy;
27-
import org.hibernate.reactive.session.ReactiveSession;
27+
import org.hibernate.reactive.session.ReactiveQueryProducer;
2828
import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
2929
import org.hibernate.reactive.sql.results.graph.ReactiveInitializer;
3030
import org.hibernate.sql.results.graph.AssemblerCreationState;
@@ -532,7 +532,7 @@ protected CompletionStage<Object> reactiveResolveEntityInstance(ReactiveEntityIn
532532
// If this initializer owns the entity, we have to remove the entity holder,
533533
// because the subsequent loading process will claim the entity
534534
session.getPersistenceContextInternal().removeEntityHolder( data.getEntityKey() );
535-
return ( (ReactiveSession) session ).reactiveInternalLoad(
535+
return ( (ReactiveQueryProducer) session ).reactiveInternalLoad(
536536
data.getConcreteDescriptor().getEntityName(),
537537
data.getEntityKey().getIdentifier(),
538538
true,

0 commit comments

Comments
 (0)