Skip to content

Commit ced2a74

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 9736346 commit ced2a74

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.hibernate.reactive.event.ReactiveDeleteEventListener;
4949
import org.hibernate.reactive.logging.impl.Log;
5050
import org.hibernate.reactive.logging.impl.LoggerFactory;
51+
import org.hibernate.reactive.session.ReactiveQueryProducer;
5152
import org.hibernate.reactive.session.ReactiveSession;
5253
import org.hibernate.type.CollectionType;
5354
import org.hibernate.type.CompositeType;
@@ -199,7 +200,7 @@ private CompletionStage<Void> fetchAndDelete(DeleteEvent event, DeleteContext tr
199200
}
200201

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

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.hibernate.reactive.logging.impl.Log;
3636
import org.hibernate.reactive.logging.impl.LoggerFactory;
3737
import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
38+
import org.hibernate.reactive.session.ReactiveQueryProducer;
3839
import org.hibernate.reactive.session.ReactiveSession;
3940

4041
import static org.hibernate.pretty.MessageHelper.infoString;
@@ -76,7 +77,7 @@ public CompletionStage<Void> reactiveOnLock(LockEvent event) throws HibernateExc
7677
//TODO: if object was an uninitialized proxy, this is inefficient,
7778
// resulting in two SQL selects
7879

79-
return ( (ReactiveSession) source ).reactiveFetch( event.getObject(), true )
80+
return ( (ReactiveQueryProducer) source ).reactiveFetch( event.getObject(), true )
8081
.thenCompose( entity -> reactiveOnLock( event, entity ) );
8182
}
8283

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

+2-2
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

+2-2
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;
@@ -179,7 +179,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
179179
);
180180
lockOptions.setAliasSpecificLockMode( explicitDmlTargetAlias, lockMode );
181181

182-
return ( (ReactiveSession) executionContext.getSession() )
182+
return ( (ReactiveSharedSessionContractImplementor) executionContext.getSession() )
183183
.reactiveAutoFlushIfRequired( select.getAffectedTableNames() )
184184
.thenCompose( v -> StandardReactiveSelectExecutor.INSTANCE.list(
185185
select,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
import org.hibernate.query.sqm.tree.insert.SqmInsertStatement;
4444
import org.hibernate.query.sqm.tree.insert.SqmInsertValuesStatement;
4545
import org.hibernate.query.sqm.tree.insert.SqmValues;
46+
import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
4647
import org.hibernate.reactive.logging.impl.Log;
4748
import org.hibernate.reactive.logging.impl.LoggerFactory;
4849
import org.hibernate.reactive.query.sqm.mutation.internal.ReactiveHandler;
49-
import org.hibernate.reactive.session.ReactiveSession;
5050
import org.hibernate.reactive.sql.exec.internal.StandardReactiveSelectExecutor;
5151
import org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer;
5252
import org.hibernate.spi.NavigablePath;
@@ -575,7 +575,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
575575
executionContext.getSession()
576576
);
577577
final JdbcOperationQuerySelect select = translator.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
578-
return ( (ReactiveSession) executionContext.getSession() )
578+
return ( (ReactiveSharedSessionContractImplementor) executionContext.getSession() )
579579
.reactiveAutoFlushIfRequired( select.getAffectedTableNames() )
580580
.thenCompose( v -> StandardReactiveSelectExecutor.INSTANCE.list(
581581
select,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.hibernate.persister.entity.EntityPersister;
2626
import org.hibernate.proxy.LazyInitializer;
2727
import org.hibernate.proxy.map.MapProxy;
28-
import org.hibernate.reactive.session.ReactiveSession;
28+
import org.hibernate.reactive.session.ReactiveQueryProducer;
2929
import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
3030
import org.hibernate.reactive.sql.results.graph.ReactiveInitializer;
3131
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)