Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

Commit d5b0e79

Browse files
gsmetgsmet
committed
OGM-1229 Remove deprecated calls
1 parent a87d207 commit d5b0e79

File tree

44 files changed

+140
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+140
-142
lines changed

‎core/src/main/java/org/hibernate/ogm/hibernatecore/impl/BackendCustomLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private List<Object> listOfArrays(SharedSessionContractImplementor session, Iter
164164
}
165165

166166
private TupleBasedEntityLoader getLoader(SharedSessionContractImplementor session, Class<?> entityClass) {
167-
OgmEntityPersister persister = (OgmEntityPersister) ( session.getFactory() ).getEntityPersister( entityClass.getName() );
167+
OgmEntityPersister persister = (OgmEntityPersister) ( session.getFactory() ).getMetamodel().entityPersister( entityClass );
168168
TupleBasedEntityLoader loader = (TupleBasedEntityLoader) persister.getAppropriateLoader( LockOptions.READ, session );
169169
return loader;
170170
}

‎core/src/main/java/org/hibernate/ogm/hibernatecore/impl/OgmSessionFactoryImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public OgmSessionFactoryImpl(SessionFactoryImplementor delegate) {
6363
SessionFactoryRegistry.INSTANCE.addSessionFactory(
6464
uuid,
6565
delegate.getName(),
66-
delegate.getSettings().isSessionFactoryNameAlsoJndiName(),
66+
delegate.getSessionFactoryOptions().isSessionFactoryNameAlsoJndiName(),
6767
this,
6868
delegate.getServiceRegistry().getService( JndiService.class )
6969
);

‎core/src/main/java/org/hibernate/ogm/loader/entity/impl/DynamicBatchingEntityLoaderBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.hibernate.LockMode;
1717
import org.hibernate.LockOptions;
1818
import org.hibernate.dialect.pagination.LimitHelper;
19+
import org.hibernate.engine.jdbc.spi.JdbcServices;
1920
import org.hibernate.engine.spi.LoadQueryInfluencers;
2021
import org.hibernate.engine.spi.PersistenceContext;
2122
import org.hibernate.engine.spi.QueryParameters;
@@ -234,7 +235,7 @@ public List doEntityBatchFetch(
234235
}
235236
}
236237
catch ( SQLException sqle ) {
237-
throw session.getFactory().getSQLExceptionHelper().convert(
238+
throw session.getFactory().getServiceRegistry().getService( JdbcServices.class ).getSqlExceptionHelper().convert(
238239
sqle,
239240
"could not load an entity batch: " + MessageHelper.infoString(
240241
getEntityPersisters()[0],

‎core/src/main/java/org/hibernate/ogm/loader/impl/OgmLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ private void loadFromResultSet(
11211121
final Serializable id = key.getIdentifier();
11221122

11231123
// Get the persister for the _subclass_
1124-
final OgmEntityPersister persister = (OgmEntityPersister) getFactory().getEntityPersister( instanceEntityName );
1124+
final OgmEntityPersister persister = (OgmEntityPersister) getFactory().getMetamodel().entityPersister( instanceEntityName );
11251125

11261126
if ( log.isTraceEnabled() ) {
11271127
log.trace(

‎core/src/main/java/org/hibernate/ogm/loader/nativeloader/impl/BackendCustomQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private EntityMetadataInformation determineSingleEntityMetadataInformation(Sessi
7272
return null;
7373
}
7474
RootReturn rootReturn = (RootReturn) queryReturn;
75-
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getEntityPersister( rootReturn.getEntityName() );
75+
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getMetamodel().entityPersister( rootReturn.getEntityName() );
7676
metadataInformation = new EntityMetadataInformation( persister.getEntityKeyMetadata(), rootReturn.getEntityName()
7777
);
7878
}

‎core/src/main/java/org/hibernate/ogm/massindex/impl/BatchIndexingWorkspace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public BatchIndexingWorkspace(GridDialect gridDialect, SearchIntegrator search,
7171
public void run() {
7272
ErrorHandler errorHandler = searchIntegrator.getErrorHandler();
7373
try {
74-
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getEntityPersister( indexedType.getName() );
74+
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getMetamodel().entityPersister( indexedType );
7575
final EntityKeyMetadata keyMetadata = new DefaultEntityKeyMetadata( persister.getTableName(), persister.getRootTableIdentifierColumnNames() );
7676

7777
final SessionAwareRunnable consumer = new TupleIndexer( indexedType, monitor, sessionFactory, searchIntegrator, cacheMode, batchBackend, errorHandler, tenantId );

‎core/src/main/java/org/hibernate/ogm/massindex/impl/TupleIndexer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private void runInNewTransaction(Session upperSession, Tuple tuple) {
228228

229229
private Object entity(Session session, Tuple tuple) {
230230
SessionImplementor sessionImplementor = (SessionImplementor) session;
231-
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getEntityPersister( indexedType.getName() );
231+
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getMetamodel().entityPersister( indexedType );
232232

233233
TupleBasedEntityLoader loader = (TupleBasedEntityLoader) persister.getAppropriateLoader( LockOptions.READ, sessionImplementor );
234234

‎core/src/main/java/org/hibernate/ogm/persister/impl/BiDirectionalAssociationHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,6 @@ private static boolean isCollectionMatching(Joinable mainSideJoinable, OgmCollec
168168
}
169169

170170
private static OgmCollectionPersister getPersister(SessionFactoryImplementor factory, CollectionType type) {
171-
return (OgmCollectionPersister) factory.getCollectionPersister( type.getRole() );
171+
return (OgmCollectionPersister) factory.getMetamodel().collectionPersister( type.getRole() );
172172
}
173173
}

‎core/src/main/java/org/hibernate/ogm/persister/impl/ColumnBasedDiscriminator.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.Map;
1212

1313
import org.hibernate.dialect.Dialect;
14+
import org.hibernate.engine.jdbc.spi.JdbcServices;
1415
import org.hibernate.engine.spi.SessionFactoryImplementor;
1516
import org.hibernate.internal.util.MarkerObject;
1617
import org.hibernate.mapping.Column;
@@ -46,14 +47,16 @@ class ColumnBasedDiscriminator implements EntityDiscriminator {
4647
private final Map<Object, String> subclassesByValue;
4748

4849
public ColumnBasedDiscriminator(final PersistentClass persistentClass, final SessionFactoryImplementor factory, final Column column) {
50+
Dialect dialect = factory.getServiceRegistry().getService( JdbcServices.class ).getDialect();
51+
4952
forced = persistentClass.isForceDiscriminator();
50-
columnName = column.getQuotedName( factory.getDialect() );
51-
alias = column.getAlias( factory.getDialect(), persistentClass.getRootTable() );
53+
columnName = column.getQuotedName( dialect );
54+
alias = column.getAlias( dialect, persistentClass.getRootTable() );
5255
discriminatorType = persistentClass.getDiscriminator().getType() == null
5356
? StringType.INSTANCE
5457
: persistentClass.getDiscriminator().getType();
5558
value = value( persistentClass, discriminatorType );
56-
sqlValue = sqlValue( persistentClass, factory.getDialect(), value, discriminatorType );
59+
sqlValue = sqlValue( persistentClass, dialect, value, discriminatorType );
5760
subclassesByValue = subclassesByValue( persistentClass, value, discriminatorType );
5861
needed = true;
5962
}

‎core/src/main/java/org/hibernate/ogm/persister/impl/EntityAssociationUpdater.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,7 @@ private AssociationPersister createInverseAssociationPersister(int propertyIndex
193193
.context();
194194

195195
Class<?> entityType = persister.getPropertyTypes()[propertyIndex].getReturnedClass();
196-
String entityName = persister.getFactory().getClassMetadata( entityType ).getEntityName();
197-
OgmEntityPersister inverseEntityPersister = (OgmEntityPersister) persister.getFactory().getEntityPersister( entityName );
196+
OgmEntityPersister inverseEntityPersister = (OgmEntityPersister) persister.getFactory().getMetamodel().entityPersister( entityType );
198197

199198
String mainSidePropertyName = persister.getPropertyNames()[propertyIndex];
200199

@@ -228,8 +227,8 @@ private Object getReferencedEntity(int propertyIndex) {
228227
);
229228

230229
if ( id != null ) {
231-
EntityPersister hostingEntityPersister = session.getFactory().getEntityPersister(
232-
propertyType.getReturnedClass().getName()
230+
EntityPersister hostingEntityPersister = session.getFactory().getMetamodel().entityPersister(
231+
propertyType.getReturnedClass()
233232
);
234233

235234
// OGM-931 Loading the entity through Session#get() to make sure it is fetched from the store if it is

‎core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@
2828
import org.hibernate.cache.spi.access.EntityRegionAccessStrategy;
2929
import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
3030
import org.hibernate.cache.spi.entry.CacheEntry;
31+
import org.hibernate.dialect.Dialect;
3132
import org.hibernate.dialect.lock.LockingStrategy;
3233
import org.hibernate.engine.OptimisticLockStyle;
3334
import org.hibernate.engine.internal.Versioning;
35+
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
36+
import org.hibernate.engine.jdbc.spi.JdbcServices;
3437
import org.hibernate.engine.spi.EntityEntry;
3538
import org.hibernate.engine.spi.LoadQueryInfluencers;
3639
import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -225,8 +228,11 @@ public abstract class OgmEntityPersister extends AbstractEntityPersister impleme
225228
}
226229

227230
SessionFactoryImplementor factory = creationContext.getSessionFactory();
228-
229231
ServiceRegistryImplementor serviceRegistry = factory.getServiceRegistry();
232+
JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
233+
JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
234+
Dialect dialect = jdbcServices.getDialect();
235+
230236
this.gridDialect = serviceRegistry.getService( GridDialect.class );
231237
this.identityColumnAwareGridDialect = serviceRegistry.getService( IdentityColumnAwareGridDialect.class );
232238
this.optimisticLockingAwareGridDialect = serviceRegistry.getService( OptimisticLockingAwareGridDialect.class );
@@ -241,11 +247,7 @@ public abstract class OgmEntityPersister extends AbstractEntityPersister impleme
241247
throw log.getIdentityGenerationStrategyNotSupportedException( getEntityName() );
242248
}
243249

244-
tableName = persistentClass.getTable().getQualifiedName(
245-
factory.getDialect(),
246-
factory.getSettings().getDefaultCatalogName(),
247-
factory.getSettings().getDefaultSchemaName()
248-
);
250+
tableName = jdbcEnvironment.getQualifiedObjectNameFormatter().format( persistentClass.getTable().getQualifiedTableName(), dialect );
249251

250252
this.discriminator = discriminator;
251253

@@ -274,11 +276,7 @@ public abstract class OgmEntityPersister extends AbstractEntityPersister impleme
274276
Iterator<Table> tableIter = persistentClass.getSubclassTableClosureIterator();
275277
while ( tableIter.hasNext() ) {
276278
Table table = tableIter.next();
277-
subclassTables.add( table.getQualifiedName(
278-
factory.getDialect(),
279-
factory.getSettings().getDefaultCatalogName(),
280-
factory.getSettings().getDefaultSchemaName()
281-
) );
279+
subclassTables.add( jdbcEnvironment.getQualifiedObjectNameFormatter().format( table.getQualifiedTableName(), dialect ) );
282280
}
283281
subclassSpaces = ArrayHelper.toStringArray( subclassTables );
284282

@@ -293,19 +291,15 @@ public abstract class OgmEntityPersister extends AbstractEntityPersister impleme
293291
@SuppressWarnings( "unchecked" )
294292
Iterator<Table> iter = persistentClass.getSubclassTableClosureIterator();
295293
while ( iter.hasNext() ) {
296-
Table tab = iter.next();
297-
if ( !tab.isAbstractUnionTable() ) {
298-
String tableName = tab.getQualifiedName(
299-
factory.getDialect(),
300-
factory.getSettings().getDefaultCatalogName(),
301-
factory.getSettings().getDefaultSchemaName()
302-
);
294+
Table table = iter.next();
295+
if ( !table.isAbstractUnionTable() ) {
296+
String tableName = jdbcEnvironment.getQualifiedObjectNameFormatter().format( table.getQualifiedTableName(), dialect );
303297
tableNames.add( tableName );
304298
String[] key = new String[idColumnSpan];
305299

306-
Iterator<Column> citer = tab.getPrimaryKey().getColumnIterator();
300+
Iterator<Column> citer = table.getPrimaryKey().getColumnIterator();
307301
for ( int k = 0; k < idColumnSpan; k++ ) {
308-
key[k] = citer.next().getQuotedName( factory.getDialect() );
302+
key[k] = citer.next().getQuotedName( dialect );
309303
}
310304
keyColumns.add( key );
311305
}
@@ -462,7 +456,7 @@ private static Set<String> polymorphicEntityColumns(final OgmEntityPersister per
462456
@SuppressWarnings("unchecked")
463457
Set<String> subclasses = persister.getEntityMetamodel().getSubclassEntityNames();
464458
for ( String className : subclasses ) {
465-
OgmEntityPersister subEntityPersister = (OgmEntityPersister) persister.getFactory().getEntityPersister( className );
459+
OgmEntityPersister subEntityPersister = (OgmEntityPersister) persister.getFactory().getMetamodel().entityPersister( className );
466460
if ( !subEntityPersister.equals( persister ) ) {
467461
List<String> subEntityColumnNames = selectableColumnNames( subEntityPersister, null );
468462
for ( String column : subEntityColumnNames ) {
@@ -604,7 +598,7 @@ private TupleTypeContextImpl createTupleTypeContext() {
604598
for ( int index = 0; index < getPropertySpan(); index++ ) {
605599
final Type uniqueKeyType = getPropertyTypes()[index];
606600
if ( uniqueKeyType.isEntityType() ) {
607-
OgmEntityPersister associatedJoinable = (OgmEntityPersister) getFactory().getEntityPersister(
601+
OgmEntityPersister associatedJoinable = (OgmEntityPersister) getFactory().getMetamodel().entityPersister(
608602
( (EntityType) uniqueKeyType ).getAssociatedEntityName() );
609603

610604
for ( String column : getPropertyColumnNames( index ) ) {
@@ -874,7 +868,7 @@ protected void createLoaders() {
874868
//TODO: inexact, what we really need to know is: are any outer joins used?
875869
boolean disableForUpdate = getSubclassTableSpan() > 1 &&
876870
hasSubclasses() &&
877-
!getFactory().getDialect().supportsOuterJoinForUpdate();
871+
!getFactory().getServiceRegistry().getService( JdbcServices.class ).getDialect().supportsOuterJoinForUpdate();
878872

879873
loaders.put(
880874
LockMode.UPGRADE,
@@ -1614,7 +1608,7 @@ private void removeNavigationInformation(Serializable id, Object entity, SharedS
16141608
if ( propertyMightHaveNavigationalInformation[propertyIndex] ) {
16151609
CollectionType collectionType = (CollectionType) getPropertyTypes()[propertyIndex];
16161610
OgmCollectionPersister collectionPersister = (OgmCollectionPersister) getFactory()
1617-
.getCollectionPersister( collectionType.getRole() );
1611+
.getMetamodel().collectionPersister( collectionType.getRole() );
16181612

16191613
AssociationPersister associationPersister = new AssociationPersister.Builder( collectionPersister.getOwnerEntityPersister().getMappedClass() )
16201614
.hostingEntity( entity )
@@ -1955,7 +1949,7 @@ private void raiseStaleObjectStateException(Serializable id) {
19551949
SessionFactoryImplementor factory = getFactory();
19561950

19571951
if ( factory.getStatistics().isStatisticsEnabled() ) {
1958-
factory.getStatisticsImplementor().optimisticFailure( getEntityName() );
1952+
factory.getStatistics().optimisticFailure( getEntityName() );
19591953
}
19601954

19611955
throw new StaleObjectStateException( getEntityName(), id );

‎core/src/main/java/org/hibernate/ogm/query/impl/OgmQueryLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private List<Object> listOfArrays(SharedSessionContractImplementor session, Iter
125125
}
126126

127127
private TupleBasedEntityLoader getLoader(SharedSessionContractImplementor session, Class<?> entityClass) {
128-
OgmEntityPersister persister = (OgmEntityPersister) ( session.getFactory() ).getEntityPersister( entityClass.getName() );
128+
OgmEntityPersister persister = (OgmEntityPersister) ( session.getFactory() ).getMetamodel().entityPersister( entityClass.getName() );
129129
TupleBasedEntityLoader loader = (TupleBasedEntityLoader) persister.getAppropriateLoader( LockOptions.READ, session );
130130
return loader;
131131
}

‎core/src/main/java/org/hibernate/ogm/query/impl/OgmQueryTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private EntityMetadataInformation determineSingleEntityInformation(Type[] queryR
154154
return null;
155155
}
156156
EntityType rootReturn = (EntityType) queryReturn;
157-
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getEntityPersister( rootReturn.getName() );
157+
OgmEntityPersister persister = (OgmEntityPersister) sessionFactory.getMetamodel().entityPersister( rootReturn.getName() );
158158
metadataInformation = new EntityMetadataInformation( persister.getEntityKeyMetadata(), rootReturn.getReturnedClass().getName() );
159159
}
160160
}

‎core/src/main/java/org/hibernate/ogm/query/parsing/impl/ParserPropertyHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected OgmEntityPersister getPersister(String entityType) {
145145
throw new IllegalStateException( "Unknown entity name " + entityType );
146146
}
147147

148-
return (OgmEntityPersister) sessionFactory.getEntityPersister( targetedType.getName() );
148+
return (OgmEntityPersister) sessionFactory.getMetamodel().entityPersister( targetedType );
149149
}
150150

151151
/**

‎core/src/main/java/org/hibernate/ogm/service/impl/DefaultSchemaInitializationContext.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Database getDatabase() {
4848
public Set<EntityKeyMetadata> getAllEntityKeyMetadata() {
4949
Set<EntityKeyMetadata> allEntityKeyMetadata = new HashSet<>();
5050

51-
for ( EntityPersister entityPersister : factory.getEntityPersisters().values() ) {
51+
for ( EntityPersister entityPersister : factory.getMetamodel().entityPersisters().values() ) {
5252
allEntityKeyMetadata.add( ( (OgmEntityPersister) entityPersister ).getEntityKeyMetadata() );
5353
}
5454

@@ -59,11 +59,11 @@ public Set<EntityKeyMetadata> getAllEntityKeyMetadata() {
5959
public Set<AssociationKeyMetadata> getAllAssociationKeyMetadata() {
6060
Set<AssociationKeyMetadata> allAssociationKeyMetadata = new HashSet<>();
6161

62-
for ( CollectionPersister associationPersister : factory.getCollectionPersisters().values() ) {
62+
for ( CollectionPersister associationPersister : factory.getMetamodel().collectionPersisters().values() ) {
6363
allAssociationKeyMetadata.add( ( (OgmCollectionPersister) associationPersister ).getAssociationKeyMetadata() );
6464
}
6565

66-
for ( EntityPersister entityPersister : factory.getEntityPersisters().values() ) {
66+
for ( EntityPersister entityPersister : factory.getMetamodel().entityPersisters().values() ) {
6767
for ( String property : entityPersister.getPropertyNames() ) {
6868
AssociationKeyMetadata inverseOneToOneAssociationKeyMetadata = ( (OgmEntityPersister) entityPersister ).getInverseOneToOneAssociationKeyMetadata( property );
6969
if ( inverseOneToOneAssociationKeyMetadata != null ) {
@@ -89,7 +89,7 @@ public Set<IdSourceKeyMetadata> getAllIdSourceKeyMetadata() {
8989
@Override
9090
public Map<String, Class<?>> getTableEntityTypeMapping() {
9191
Map<String, Class<?>> mapping = new HashMap<>();
92-
Map<String, EntityPersister> entityPersisters = factory.getEntityPersisters();
92+
Map<String, EntityPersister> entityPersisters = factory.getMetamodel().entityPersisters();
9393

9494
for ( Entry<String, EntityPersister> entityPersisterEntry : entityPersisters.entrySet() ) {
9595
OgmEntityPersister entityPersister = (OgmEntityPersister) entityPersisterEntry.getValue();
@@ -103,7 +103,7 @@ public Map<String, Class<?>> getTableEntityTypeMapping() {
103103
* Returns all the persistent id generators which potentially require the creation of an object in the schema.
104104
*/
105105
private Iterable<PersistentNoSqlIdentifierGenerator> getPersistentGenerators() {
106-
Map<String, EntityPersister> entityPersisters = factory.getEntityPersisters();
106+
Map<String, EntityPersister> entityPersisters = factory.getMetamodel().entityPersisters();
107107

108108
Set<PersistentNoSqlIdentifierGenerator> persistentGenerators = new HashSet<PersistentNoSqlIdentifierGenerator>( entityPersisters.size() );
109109
for ( EntityPersister persister : entityPersisters.values() ) {

‎core/src/main/java/org/hibernate/ogm/service/impl/SessionFactoryEntityNamesResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ public SessionFactoryEntityNamesResolver(SessionFactory sessionFactory) {
3030

3131
@Override
3232
public Class<?> getClassFromName(String entityName) {
33-
return classLoaderService.classForName( sessionFactory.getImportedClassName( entityName ) );
33+
return classLoaderService.classForName( sessionFactory.getMetamodel().getImportedClassName( entityName ) );
3434
}
3535
}

‎core/src/main/java/org/hibernate/ogm/type/impl/EntityType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected final Object getIdentifier(Object value, SharedSessionContractImplemen
5454
return ForeignKeys.getEntityIdentifierIfNotUnsaved( associatedEntityName, value, session ); //tolerates nulls
5555
}
5656
else {
57-
final EntityPersister persister = session.getFactory().getEntityPersister( delegate.getAssociatedEntityName() );
57+
final EntityPersister persister = session.getFactory().getMetamodel().entityPersister( delegate.getAssociatedEntityName() );
5858

5959
Object propertyValue = persister.getPropertyValue( value, uniqueKeyPropertyName );
6060
// We now have the value of the property-ref we reference. However,
@@ -76,7 +76,7 @@ protected final Object getIdentifier(Object value, SessionFactoryImplementor ses
7676
return null;
7777
}
7878

79-
final EntityPersister persister = sessionFactory.getEntityPersister( delegate.getAssociatedEntityName() );
79+
final EntityPersister persister = sessionFactory.getMetamodel().entityPersister( delegate.getAssociatedEntityName() );
8080
final String uniqueKeyPropertyName = delegate.getRHSUniqueKeyPropertyName();
8181

8282
if ( StringHelper.isEmpty( uniqueKeyPropertyName ) ) {

‎core/src/main/java/org/hibernate/ogm/type/impl/ManyToOneType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public Object hydrate(Tuple rs, String[] names, SharedSessionContractImplementor
8080
private void scheduleBatchLoadIfNeeded(Serializable id, SharedSessionContractImplementor session) throws MappingException {
8181
//cannot batch fetch by unique key (property-ref associations)
8282
if ( StringHelper.isEmpty( delegate.getRHSUniqueKeyPropertyName() ) && id != null ) {
83-
EntityPersister persister = session.getFactory().getEntityPersister( delegate.getAssociatedEntityName() );
83+
EntityPersister persister = session.getFactory().getMetamodel().entityPersister( delegate.getAssociatedEntityName() );
8484
EntityKey entityKey = session.generateEntityKey( id, persister );
8585
if ( !session.getPersistenceContext().containsEntity( entityKey ) ) {
8686
session.getPersistenceContext().getBatchFetchQueue().addBatchLoadableEntityKey( entityKey );

0 commit comments

Comments
 (0)