Skip to content

Commit 19b6732

Browse files
blafondblafond
committed
fix deprecated LoadQueryInfluencers.NONE
1 parent 1b0ec2b commit 19b6732

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/DatabaseSnapshotExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class DatabaseSnapshotExecutor {
7878
LockOptions.NONE,
7979
DatabaseSnapshotExecutor::visitEmptyFetchList,
8080
true,
81-
LoadQueryInfluencers.NONE,
81+
new LoadQueryInfluencers( sessionFactory ),
8282
sessionFactory
8383
);
8484

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveNaturalIdLoaderDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public CompletionStage<Object> reactiveSelectByNaturalId(
237237
lockOptions,
238238
fetchProcessor,
239239
true,
240-
LoadQueryInfluencers.NONE,
240+
new LoadQueryInfluencers( sessionFactory ),
241241
sessionFactory
242242
);
243243

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleUniqueKeyEntityLoaderStandard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public CompletionStage<T> load(Object ukValue, LockOptions lockOptions, Boolean
7575
Collections.emptyList(),
7676
uniqueKeyAttribute,
7777
null,
78-
LoadQueryInfluencers.NONE,
78+
new LoadQueryInfluencers( sessionFactory ),
7979
LockOptions.NONE,
8080
jdbcParametersListBuilder::add,
8181
sessionFactory
@@ -131,7 +131,7 @@ public Object resolveId(Object ukValue, SharedSessionContractImplementor session
131131
Collections.singletonList( entityDescriptor.getIdentifierMapping() ),
132132
uniqueKeyAttribute,
133133
null,
134-
LoadQueryInfluencers.NONE,
134+
new LoadQueryInfluencers( sessionFactory ),
135135
LockOptions.NONE,
136136
jdbcParametersListBuilder::add,
137137
sessionFactory

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

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import org.hibernate.metamodel.mapping.*;
3737
import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
3838
import org.hibernate.persister.entity.AbstractEntityPersister;
39-
import org.hibernate.persister.entity.Lockable;
40-
import org.hibernate.persister.entity.OuterJoinLoadable;
4139
import org.hibernate.reactive.adaptor.impl.PreparedStatementAdaptor;
4240
import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
4341
import org.hibernate.reactive.loader.ast.spi.ReactiveSingleIdEntityLoader;
@@ -85,7 +83,7 @@
8583
* @see ReactiveUnionSubclassEntityPersister
8684
* @see ReactiveSingleTableEntityPersister
8785
*/
88-
public interface ReactiveAbstractEntityPersister extends ReactiveEntityPersister, OuterJoinLoadable, Lockable {
86+
public interface ReactiveAbstractEntityPersister extends ReactiveEntityPersister {
8987

9088
Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
9189

@@ -117,11 +115,11 @@ default String generateSelectLockString(LockOptions lockOptions) {
117115
final SessionFactoryImplementor factory = getFactory();
118116
final SimpleSelect select = new SimpleSelect( factory )
119117
.setLockOptions( lockOptions )
120-
.setTableName( getRootTableName() )
121-
.addColumn( getRootTableIdentifierColumnNames()[0] )
122-
.addRestriction( getRootTableIdentifierColumnNames() );
118+
.setTableName( getEntityMappingType().getMappedTableDetails().getTableName() )
119+
.addColumn( getIdentifierPropertyName() )
120+
.addRestriction( getIdentifierPropertyName() );
123121
if ( isVersioned() ) {
124-
select.addRestriction( getVersionColumnName() );
122+
select.addRestriction( getVersionMapping().getVersionAttribute().getAttributeName() );
125123
}
126124
if ( factory.getSessionFactoryOptions().isCommentsEnabled() ) {
127125
select.setComment( lockOptions.getLockMode() + " lock " + getEntityName() );
@@ -132,10 +130,10 @@ default String generateSelectLockString(LockOptions lockOptions) {
132130
default String generateUpdateLockString(LockOptions lockOptions) {
133131
final SessionFactoryImplementor factory = getFactory();
134132
final Update update = new Update( factory );
135-
update.setTableName( getRootTableName() );
136-
update.addAssignment( getVersionColumnName() );
137-
update.addRestriction( getRootTableIdentifierColumnNames() );
138-
update.addRestriction( getVersionColumnName() );
133+
update.setTableName( getEntityMappingType().getMappedTableDetails().getTableName() );
134+
update.addAssignment( getVersionMapping().getVersionAttribute().getAttributeName() );
135+
update.addRestriction( getIdentifierPropertyName() );
136+
update.addRestriction( getVersionMapping().getVersionAttribute().getAttributeName() );
139137
if ( factory.getSessionFactoryOptions().isCommentsEnabled() ) {
140138
update.setComment( lockOptions.getLockMode() + " lock " + getEntityName() );
141139
}
@@ -261,8 +259,7 @@ default Object nextVersionForLock(LockMode lockMode, Object id, Object currentVe
261259

262260
@Override
263261
default CompletionStage<Object[]> reactiveGetDatabaseSnapshot(Object id, SharedSessionContractImplementor session) {
264-
ReactiveSingleIdEntityLoader<?> reactiveSingleIdEntityLoader = getReactiveSingleIdEntityLoader();
265-
return reactiveSingleIdEntityLoader.reactiveLoadDatabaseSnapshot( id, session );
262+
return getReactiveSingleIdEntityLoader().reactiveLoadDatabaseSnapshot( id, session );
266263
}
267264

268265
default ReactiveSingleIdEntityLoader<?> getReactiveSingleIdEntityLoader() {
@@ -327,7 +324,7 @@ else if ( result instanceof PersistentCollection ) {
327324
final String[] propertyNames = getPropertyNames();
328325
for ( int index=0; index<propertyNames.length; index++ ) {
329326
if ( propertyNames[index].equals( field ) ) {
330-
setPropertyValue( entity, index, result );
327+
setValue( entity, index, result );
331328
break;
332329
}
333330
}
@@ -367,10 +364,10 @@ default CompletionStage<Object> reactiveInitializeLazyPropertiesFromDatastore(
367364

368365
LOG.tracef( "Initializing lazy properties from datastore (triggered for `%s`)", fieldName );
369366

370-
final String fetchGroup = getEntityMetamodel().getBytecodeEnhancementMetadata()
367+
final String fetchGroup = getEntityPersister().getBytecodeEnhancementMetadata()
371368
.getLazyAttributesMetadata()
372369
.getFetchGroupName( fieldName );
373-
final List<LazyAttributeDescriptor> fetchGroupAttributeDescriptors = getEntityMetamodel().getBytecodeEnhancementMetadata()
370+
final List<LazyAttributeDescriptor> fetchGroupAttributeDescriptors = getEntityPersister().getBytecodeEnhancementMetadata()
374371
.getLazyAttributesMetadata()
375372
.getFetchGroupAttributeDescriptors( fetchGroup );
376373

@@ -455,7 +452,7 @@ default CompletionStage<Object> reactiveInitializeEnhancedEntityUsedAsProxy(
455452
String nameOfAttributeBeingAccessed,
456453
SharedSessionContractImplementor session) {
457454

458-
final BytecodeEnhancementMetadata enhancementMetadata = getEntityMetamodel().getBytecodeEnhancementMetadata();
455+
final BytecodeEnhancementMetadata enhancementMetadata = getEntityPersister().getBytecodeEnhancementMetadata();
459456
final BytecodeLazyAttributeInterceptor currentInterceptor = enhancementMetadata.extractLazyInterceptor( entity );
460457
if ( currentInterceptor instanceof EnhancementAsProxyLazinessInterceptor) {
461458
final EnhancementAsProxyLazinessInterceptor proxyInterceptor =
@@ -540,11 +537,11 @@ default NaturalIdMapping generateNaturalIdMapping(
540537
//noinspection AssertWithSideEffects
541538
assert bootEntityDescriptor.hasNaturalId();
542539

543-
final int[] naturalIdAttributeIndexes = getEntityMetamodel().getNaturalIdentifierProperties();
540+
final int[] naturalIdAttributeIndexes = getEntityPersister().getNaturalIdentifierProperties();
544541
assert naturalIdAttributeIndexes.length > 0;
545542

546543
if ( naturalIdAttributeIndexes.length == 1 ) {
547-
final String propertyName = getEntityMetamodel().getPropertyNames()[naturalIdAttributeIndexes[0]];
544+
final String propertyName = getEntityPersister().getAttributeMappings().get(naturalIdAttributeIndexes[0]).getAttributeName();
548545
final AttributeMapping attributeMapping = findAttributeMapping( propertyName );
549546
final SingularAttributeMapping singularAttributeMapping = (SingularAttributeMapping) attributeMapping;
550547
return new ReactiveSimpleNaturalIdMapping( singularAttributeMapping, this, creationProcess );
@@ -584,7 +581,7 @@ default NaturalIdLoader<?> getNaturalIdLoader() {
584581
* @see AbstractEntityPersister#getLazyLoadPlanByFetchGroup()
585582
*/
586583
default Map<String, ReactiveSingleIdArrayLoadPlan> getLazyLoadPlanByFetchGroup(String[] subclassPropertyNameClosure ) {
587-
final BytecodeEnhancementMetadata metadata = delegate().getEntityMetamodel().getBytecodeEnhancementMetadata();
584+
final BytecodeEnhancementMetadata metadata = delegate().getEntityPersister().getBytecodeEnhancementMetadata();
588585
return metadata.isEnhancedForLazyLoading() && metadata.getLazyAttributesMetadata().hasLazyAttributes()
589586
? createLazyLoadPlanByFetchGroup( metadata, subclassPropertyNameClosure )
590587
: emptyMap();
@@ -626,7 +623,7 @@ default ReactiveSingleIdArrayLoadPlan createLazyLoadPlan(List<LazyAttributeDescr
626623
getIdentifierMapping(),
627624
null,
628625
1,
629-
LoadQueryInfluencers.NONE,
626+
new LoadQueryInfluencers( factory ),
630627
LockOptions.NONE,
631628
jdbcParametersListBuilder::add,
632629
factory

0 commit comments

Comments
 (0)