Skip to content

Commit 240b6f2

Browse files
DavideDsebersole
authored andcommitted
HHH-18854 Revert changes for Hibernate Reactive
Because I didn't add a comment, some of the methods Hibernate Reactive uses to plug in its classess, have been removed as a refactoring.
1 parent a70f26d commit 240b6f2

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,10 @@ public boolean isSelectByUniqueKey() {
142142
public DomainResultAssembler<?> createAssembler(
143143
InitializerParent<?> parent,
144144
AssemblerCreationState creationState) {
145-
final EntityInitializer<?> entityInitializer =
146-
creationState.resolveInitializer( this, parent, this )
147-
.asEntityInitializer();
145+
final EntityInitializer<?> entityInitializer = creationState.resolveInitializer( this, parent, this )
146+
.asEntityInitializer();
148147
assert entityInitializer != null;
149-
return new EntityAssembler<>( getFetchedMapping().getJavaType(), entityInitializer );
148+
return buildEntityAssembler( entityInitializer );
150149
}
151150

152151
@Override
@@ -160,4 +159,10 @@ public EntityInitializer<?> createInitializer(
160159
@Override
161160
public abstract EntityInitializer<?> createInitializer(InitializerParent<?> parent, AssemblerCreationState creationState);
162161

162+
/**
163+
* Used By Hibernate Reactive
164+
*/
165+
protected EntityAssembler<?> buildEntityAssembler(EntityInitializer<?> entityInitializer) {
166+
return new EntityAssembler<>( getFetchedMapping().getJavaType(), entityInitializer );
167+
}
163168
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,14 @@ public FetchParent getFetchParent() {
129129
public DomainResultAssembler<?> createAssembler(
130130
InitializerParent<?> parent,
131131
AssemblerCreationState creationState) {
132-
return new EntityAssembler<>( getFetchedMapping().getJavaType(),
133-
creationState.resolveInitializer( this, parent, this )
134-
.asEntityInitializer() );
132+
return buildEntityAssembler( creationState.resolveInitializer( this, parent, this ).asEntityInitializer() );
133+
}
134+
135+
/**
136+
* Used by Hibernate Reactive
137+
*/
138+
protected EntityAssembler<?> buildEntityAssembler(EntityInitializer<?> entityInitializer) {
139+
return new EntityAssembler<>( getFetchedMapping().getJavaType(), entityInitializer );
135140
}
136141

137142
@Override

0 commit comments

Comments
 (0)