Skip to content

Commit f63bc04

Browse files
gavinkingDavideD
gavinking
authored and
DavideD
committed
use the usual entity loader from SS.getMultiple()
now that refactoring to core haa made this possible
1 parent 9244600 commit f63bc04

File tree

6 files changed

+14
-29
lines changed

6 files changed

+14
-29
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.hibernate.engine.spi.LoadQueryInfluencers;
2121
import org.hibernate.engine.spi.SessionFactoryImplementor;
2222
import org.hibernate.engine.spi.SharedSessionContractImplementor;
23-
import org.hibernate.event.spi.EventSource;
2423
import org.hibernate.generator.Generator;
2524
import org.hibernate.generator.values.GeneratedValues;
2625
import org.hibernate.id.IdentityGenerator;
@@ -126,7 +125,7 @@ public <T> DomainResult<T> createDomainResult(
126125
/**
127126
* @see org.hibernate.persister.entity.AbstractEntityPersister#multiLoad(Object[], EventSource, MultiIdLoadOptions)`
128127
*/
129-
public <K> CompletionStage<? extends List<?>> multiLoad(K[] ids, EventSource session, MultiIdLoadOptions loadOptions) {
128+
public <K> CompletionStage<? extends List<?>> multiLoad(K[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
130129
return multiIdEntityLoader.reactiveLoad( ids, loadOptions, session );
131130
}
132131

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.hibernate.LockOptions;
1313
import org.hibernate.bytecode.BytecodeLogging;
1414
import org.hibernate.engine.spi.SharedSessionContractImplementor;
15-
import org.hibernate.event.spi.EventSource;
1615
import org.hibernate.generator.values.GeneratedValues;
1716
import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
1817
import org.hibernate.persister.entity.EntityPersister;
@@ -92,7 +91,7 @@ CompletionStage<Void> reactiveLock(
9291

9392
<K> CompletionStage<? extends List<?>> reactiveMultiLoad(
9493
K[] ids,
95-
EventSource session,
94+
SharedSessionContractImplementor session,
9695
MultiIdLoadOptions loadOptions);
9796

9897
CompletionStage<Object> reactiveLoad(

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.hibernate.engine.spi.CascadeStyle;
1818
import org.hibernate.engine.spi.EntityEntry;
1919
import org.hibernate.engine.spi.SharedSessionContractImplementor;
20-
import org.hibernate.event.spi.EventSource;
2120
import org.hibernate.generator.Generator;
2221
import org.hibernate.generator.values.GeneratedValues;
2322
import org.hibernate.loader.ast.spi.MultiIdEntityLoader;
@@ -239,7 +238,7 @@ public CompletionStage<Void> mergeReactive(
239238
}
240239

241240
@Override
242-
public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, EventSource session, MultiIdLoadOptions loadOptions) {
241+
public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
243242
return reactiveDelegate.multiLoad( ids, session, loadOptions );
244243
}
245244

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.hibernate.engine.spi.CascadeStyle;
1919
import org.hibernate.engine.spi.EntityEntry;
2020
import org.hibernate.engine.spi.SharedSessionContractImplementor;
21-
import org.hibernate.event.spi.EventSource;
2221
import org.hibernate.generator.Generator;
2322
import org.hibernate.generator.values.GeneratedValues;
2423
import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
@@ -397,7 +396,7 @@ public CompletionStage<Void> mergeReactive(
397396
}
398397

399398
@Override
400-
public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, EventSource session, MultiIdLoadOptions loadOptions) {
399+
public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
401400
return reactiveDelegate.multiLoad( ids, session, loadOptions );
402401
}
403402

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.hibernate.engine.spi.CascadeStyle;
2020
import org.hibernate.engine.spi.EntityEntry;
2121
import org.hibernate.engine.spi.SharedSessionContractImplementor;
22-
import org.hibernate.event.spi.EventSource;
2322
import org.hibernate.generator.Generator;
2423
import org.hibernate.generator.values.GeneratedValues;
2524
import org.hibernate.id.IdentityGenerator;
@@ -365,7 +364,7 @@ public CompletionStage<Void> mergeReactive(
365364
}
366365

367366
@Override
368-
public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, EventSource session, MultiIdLoadOptions loadOptions) {
367+
public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
369368
return reactiveDelegate.multiLoad( ids, session, loadOptions );
370369
}
371370

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package org.hibernate.reactive.session.impl;
77

8-
import java.util.ArrayList;
98
import java.util.List;
109
import java.util.concurrent.CompletableFuture;
1110
import java.util.concurrent.CompletionStage;
@@ -50,8 +49,6 @@
5049
import org.hibernate.query.IllegalMutationQueryException;
5150
import org.hibernate.query.UnknownNamedQueryException;
5251
import org.hibernate.query.criteria.JpaCriteriaInsert;
53-
import org.hibernate.query.criteria.JpaCriteriaQuery;
54-
import org.hibernate.query.criteria.JpaRoot;
5552
import org.hibernate.query.hql.spi.SqmQueryImplementor;
5653
import org.hibernate.query.named.NamedResultSetMappingMemento;
5754
import org.hibernate.query.spi.HqlInterpretation;
@@ -223,24 +220,17 @@ public <T> CompletionStage<List<T>> reactiveGet(Class<T> entityClass, Object...
223220
}
224221
}
225222

226-
final EntityPersister persister = getEntityPersister( entityClass.getName() );
223+
Object[] sids = new Object[ids.length];
224+
System.arraycopy( ids, 0, sids, 0, ids.length );
227225

228-
final JpaCriteriaQuery<T> query = getCriteriaBuilder().createQuery(entityClass);
229-
final JpaRoot<T> from = query.from(entityClass);
230-
query.where( from.get( persister.getIdentifierPropertyName() ).in(ids) );
231-
return createReactiveQuery(query).getReactiveResultList()
232-
.thenApply( resultList -> {
233-
final List<Object> idList = new ArrayList<>( resultList.size() );
234-
for (T entity : resultList) {
235-
idList.add( persister.getIdentifier(entity, this) );
236-
}
237-
final List<T> list = new ArrayList<>( ids.length );
238-
for (Object id : ids) {
239-
final int pos = idList.indexOf(id);
240-
list.add( pos < 0 ? null : resultList.get(pos) );
226+
return getEntityPersister( entityClass.getName() )
227+
.reactiveMultiLoad( sids, this, StatelessSessionImpl.MULTI_ID_LOAD_OPTIONS )
228+
.whenComplete( (v, e) -> {
229+
if ( getPersistenceContext().isLoadFinished() ) {
230+
getPersistenceContext().clear();
241231
}
242-
return list;
243-
});
232+
} )
233+
.thenApply( list -> (List<T>) list );
244234
}
245235

246236
@Override

0 commit comments

Comments
 (0)