From b05b86b3ab123e6071801ce351df4192cf115b39 Mon Sep 17 00:00:00 2001 From: Barry LaFond Date: Thu, 17 Aug 2023 14:25:17 -0500 Subject: [PATCH 1/2] [#1501] Fix reactive initializer for entity loading --- .../graph/entity/ReactiveAbstractEntityInitializer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/ReactiveAbstractEntityInitializer.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/ReactiveAbstractEntityInitializer.java index abbfa6e1f..5516667fa 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/ReactiveAbstractEntityInitializer.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/graph/entity/ReactiveAbstractEntityInitializer.java @@ -26,10 +26,12 @@ import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultAssembler; import org.hibernate.sql.results.graph.Fetch; +import org.hibernate.sql.results.graph.basic.BasicFetch; import org.hibernate.sql.results.graph.entity.AbstractEntityInitializer; import org.hibernate.sql.results.graph.entity.EntityLoadingLogging; import org.hibernate.sql.results.graph.entity.EntityResultGraphNode; import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; +import org.hibernate.sql.results.graph.entity.internal.EntityResultInitializer; import org.hibernate.sql.results.jdbc.spi.RowProcessingState; import org.hibernate.stat.spi.StatisticsImplementor; @@ -41,7 +43,7 @@ import static org.hibernate.reactive.util.impl.CompletionStages.loop; import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture; -public abstract class ReactiveAbstractEntityInitializer extends AbstractEntityInitializer implements ReactiveInitializer { +public abstract class ReactiveAbstractEntityInitializer extends EntityResultInitializer implements ReactiveInitializer { private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() ); @@ -58,7 +60,7 @@ protected ReactiveAbstractEntityInitializer( navigablePath, lockMode, identifierFetch, - discriminatorFetch, + (BasicFetch) discriminatorFetch, rowIdResult, creationState ); From 4ba8cf8412cdce7f35a19d711fa712ae564e75cb Mon Sep 17 00:00:00 2001 From: Barry LaFond Date: Thu, 17 Aug 2023 14:25:59 -0500 Subject: [PATCH 2/2] [#1501] Removed @Disabled annotation from test --- .../test/java/org/hibernate/reactive/SubselectFetchTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/SubselectFetchTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/SubselectFetchTest.java index a010c7d9a..ecb87b930 100644 --- a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/SubselectFetchTest.java +++ b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/SubselectFetchTest.java @@ -14,7 +14,6 @@ import org.hibernate.annotations.FetchMode; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.vertx.junit5.Timeout; @@ -43,7 +42,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -@Disabled // see https://github.com/hibernate/hibernate-reactive/issues/1502 @Timeout(value = 10, timeUnit = MINUTES) public class SubselectFetchTest extends BaseReactiveTest {