Skip to content

Commit 0d7093e

Browse files
blafondDavideD
authored andcommitted
[#1714] Fix deprecations in core main
1 parent 1b0ec2b commit 0d7093e

17 files changed

+65
-68
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/common/AffectedEntities.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
*/
66
package org.hibernate.reactive.common;
77

8-
import org.hibernate.Incubating;
9-
import org.hibernate.engine.spi.SessionFactoryImplementor;
10-
import org.hibernate.internal.util.collections.ArrayHelper;
11-
128
import java.io.Serializable;
139
import java.util.ArrayList;
1410
import java.util.Arrays;
1511
import java.util.List;
1612

13+
import org.hibernate.Incubating;
14+
import org.hibernate.engine.spi.SessionFactoryImplementor;
15+
import org.hibernate.internal.util.collections.ArrayHelper;
16+
17+
import static java.util.Collections.addAll;
18+
1719
/**
1820
* A description of the entities and tables affected by a native query.
1921
* <p>
@@ -25,7 +27,6 @@
2527
*/
2628
@Incubating
2729
public class AffectedEntities {
28-
private static final Class<?>[] NO_ENTITIES = new Class[0];
2930
private static final String[] NO_TABLES = new String[0];
3031

3132
private final String[] queryTables;
@@ -36,11 +37,6 @@ public AffectedEntities(Class<?>... queryEntities) {
3637
this.queryEntities = queryEntities;
3738
}
3839

39-
public AffectedEntities(String... queryTables) {
40-
this.queryTables = queryTables;
41-
this.queryEntities = NO_ENTITIES;
42-
}
43-
4440
public String[] getAffectedTables() {
4541
return queryTables;
4642
}
@@ -51,11 +47,11 @@ public Class<?>[] getAffectedEntities() {
5147

5248
public String[] getAffectedSpaces(SessionFactoryImplementor factory) {
5349
List<String> spaces = new ArrayList<>();
54-
for ( String table : getAffectedTables() ) {
55-
spaces.add( table );
56-
}
50+
addAll( spaces, getAffectedTables() );
5751
for ( Class<?> entity : getAffectedEntities() ) {
58-
Serializable[] querySpaces = factory.getMetamodel().entityPersister( entity ).getQuerySpaces();
52+
Serializable[] querySpaces = factory.getMappingMetamodel()
53+
.getEntityDescriptor( entity.getName() )
54+
.getQuerySpaces();
5955
spaces.addAll( Arrays.asList( (String[]) querySpaces ) );
6056
}
6157
return spaces.toArray( ArrayHelper.EMPTY_STRING_ARRAY );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/ReactiveActionQueue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,8 +1046,8 @@ public void sort(List<ReactiveEntityInsertActionHolder> insertions) {
10461046
actionDelegate.getEntityName(),
10471047
actionDelegate.getSession()
10481048
.getFactory()
1049-
.getMetamodel()
1050-
.entityPersister( actionDelegate.getEntityName() )
1049+
.getMappingMetamodel()
1050+
.getEntityDescriptor( actionDelegate.getEntityName() )
10511051
.getRootEntityName()
10521052
);
10531053

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/Cascade.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.hibernate.engine.spi.Status;
2727
import org.hibernate.event.spi.DeleteContext;
2828
import org.hibernate.event.spi.EventSource;
29+
import org.hibernate.metamodel.mapping.AttributeMapping;
2930
import org.hibernate.persister.collection.CollectionPersister;
3031
import org.hibernate.persister.entity.EntityPersister;
3132
import org.hibernate.proxy.HibernateProxy;
@@ -314,7 +315,7 @@ private void cascadeLogicalOneToOneOrphanRemoval(
314315
// Since the loadedState in the EntityEntry is a flat domain type array
315316
// We first have to extract the component object and then ask the component type
316317
// recursively to give us the value of the sub-property of that object
317-
final Type propertyType = entry.getPersister().getPropertyType( componentPath.get(0) );
318+
final AttributeMapping propertyType = entry.getPersister().findAttributeMapping( componentPath.get( 0) );
318319
if ( propertyType instanceof ComponentType) {
319320
loadedValue = entry.getLoadedValue( componentPath.get( 0 ) );
320321
ComponentType componentType = (ComponentType) propertyType;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/EntityTypes.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.hibernate.engine.spi.SessionFactoryImplementor;
1919
import org.hibernate.engine.spi.SessionImplementor;
2020
import org.hibernate.engine.spi.SharedSessionContractImplementor;
21+
import org.hibernate.metamodel.mapping.AttributeMapping;
2122
import org.hibernate.persister.entity.EntityPersister;
2223
import org.hibernate.proxy.HibernateProxy;
2324
import org.hibernate.proxy.LazyInitializer;
@@ -394,8 +395,8 @@ else if ( isPersistentAttributeInterceptable( value ) ) {
394395
// We now have the value of the property-ref we reference. However,
395396
// we need to dig a little deeper, as that property might also be
396397
// an entity type, in which case we need to resolve its identifier
397-
final Type type = entityPersister.getPropertyType( uniqueKeyPropertyName );
398-
if ( type.isEntityType() ) {
398+
final AttributeMapping type = entityPersister.findAttributeMapping( uniqueKeyPropertyName );
399+
if ( type.isEntityIdentifierMapping() ) {
399400
propertyValue = getIdentifier( (EntityType) type, propertyValue, session );
400401
}
401402
return completedFuture( propertyValue );
@@ -421,8 +422,8 @@ private static CompletionStage<Object> getIdentifierFromHibernateProxy(
421422
// We now have the value of the property-ref we reference. However,
422423
// we need to dig a little deeper, as that property might also be
423424
// an entity type, in which case we need to resolve its identifier
424-
final Type type = entityPersister.getPropertyType( uniqueKeyPropertyName );
425-
if ( type.isEntityType() ) {
425+
final AttributeMapping type = entityPersister.findAttributeMapping( uniqueKeyPropertyName );
426+
if ( type.isEntityIdentifierMapping() ) {
426427
propertyValue = getIdentifier( (EntityType) type, propertyValue, (SessionImplementor) session );
427428
}
428429
return completedFuture( propertyValue );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void onFlushEntity(FlushEntityEvent event) throws HibernateException {
158158
// now update the object
159159
// has to be outside the main if block above (because of collections)
160160
if ( substitute ) {
161-
persister.setPropertyValues( entity, values );
161+
persister.setValues( entity, values );
162162
}
163163

164164
// Search for collections by reachability, updating their role.
@@ -266,7 +266,7 @@ private boolean scheduleUpdate(final FlushEntityEvent event) {
266266
dirtyProperties,
267267
event.hasDirtyCollection(),
268268
status == Status.DELETED && !entry.isModifiableEntity()
269-
? persister.getPropertyValues( entity )
269+
? persister.getValues( entity )
270270
: entry.getLoadedState(),
271271
entry.getVersion(),
272272
nextVersion,

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

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

8-
import java.io.Serializable;
98
import java.lang.invoke.MethodHandles;
109
import java.util.Map;
1110
import java.util.concurrent.CompletionStage;
@@ -126,7 +125,7 @@ public CompletionStage<Void> reactiveOnMerge(MergeEvent event, MergeContext copi
126125
if ( lazyInitializer != null ) {
127126
if ( lazyInitializer.isUninitialized() ) {
128127
LOG.trace( "Ignoring uninitialized proxy" );
129-
event.setResult( source.load( lazyInitializer.getEntityName(), lazyInitializer.getInternalIdentifier() ) );
128+
event.setResult( source.getReference( lazyInitializer.getEntityName(), lazyInitializer.getInternalIdentifier() ) );
130129
return voidFuture();
131130
}
132131
else {
@@ -140,7 +139,7 @@ else if ( isPersistentAttributeInterceptable( original ) ) {
140139
final EnhancementAsProxyLazinessInterceptor proxyInterceptor = (EnhancementAsProxyLazinessInterceptor) interceptor;
141140
LOG.trace( "Ignoring uninitialized enhanced-proxy" );
142141
//no need to go async, AFAICT ?
143-
event.setResult( source.load( proxyInterceptor.getEntityName(), (Serializable) proxyInterceptor.getIdentifier() ) );
142+
event.setResult( source.getReference( proxyInterceptor.getEntityName(), proxyInterceptor.getIdentifier() ) );
144143
//EARLY EXIT!
145144
return voidFuture();
146145
}

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/ReactiveSingleIdLoadPlan.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.hibernate.loader.ast.internal.SingleIdLoadPlan;
1818
import org.hibernate.metamodel.mapping.EntityMappingType;
1919
import org.hibernate.metamodel.mapping.ModelPart;
20-
import org.hibernate.persister.entity.Loadable;
2120
import org.hibernate.query.internal.SimpleQueryOptions;
2221
import org.hibernate.query.spi.QueryOptions;
2322
import org.hibernate.query.spi.QueryParameterBindings;
@@ -36,13 +35,13 @@
3635
public class ReactiveSingleIdLoadPlan<T> extends SingleIdLoadPlan<CompletionStage<T>> {
3736

3837
public ReactiveSingleIdLoadPlan(
39-
EntityMappingType persister,
38+
EntityMappingType entityMappingType,
4039
ModelPart restrictivePart,
4140
SelectStatement sqlAst,
4241
JdbcParametersList jdbcParameters,
4342
LockOptions lockOptions,
4443
SessionFactoryImplementor sessionFactory) {
45-
super( persister, restrictivePart, sqlAst, jdbcParameters, lockOptions, sessionFactory );
44+
super( entityMappingType, restrictivePart, sqlAst, jdbcParameters, lockOptions, sessionFactory );
4645
}
4746

4847
@Override
@@ -77,7 +76,7 @@ public CompletionStage<T> load(Object restrictedValue, Object entityInstance, Bo
7776

7877
private <T> void invokeAfterLoadActions(Callback callback, SharedSessionContractImplementor session, T entity) {
7978
if ( entity != null && getLoadable() != null) {
80-
callback.invokeAfterLoadActions( session, entity, (Loadable) getLoadable() );
79+
callback.invokeAfterLoadActions( entity, (EntityMappingType) getLoadable(), session );
8180
}
8281
}
8382

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

0 commit comments

Comments
 (0)