diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java index dd4b4f7245f2..2e9d9ccc5ce4 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java @@ -111,7 +111,7 @@ public BulkOperationCleanupAction(SharedSessionContractImplementor session, Enti public BulkOperationCleanupAction(SharedSessionContractImplementor session, Set tableSpaces) { final LinkedHashSet spacesList = new LinkedHashSet<>( tableSpaces ); - final MappingMetamodelImplementor metamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor metamodel = session.getFactory().getMappingMetamodel(); metamodel.forEachEntityDescriptor( (entityDescriptor) -> { final String[] entitySpaces = (String[]) entityDescriptor.getQuerySpaces(); if ( affectedEntity( tableSpaces, entitySpaces ) ) { @@ -143,7 +143,7 @@ public BulkOperationCleanupAction(SharedSessionContractImplementor session, Set< public static void schedule(SharedSessionContractImplementor session, SqmDmlStatement statement) { final List entityPersisters = new ArrayList<>( 1 ); - final MappingMetamodelImplementor metamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor metamodel = session.getFactory().getMappingMetamodel(); if ( !( statement instanceof InsertSelectStatement ) ) { entityPersisters.add( metamodel.getEntityDescriptor( statement.getTarget().getEntityName() ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java index e04a720116fc..df489f1bd770 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java @@ -130,11 +130,10 @@ private void logCannotResolveNonNullableTransientDependencies(SharedSessionContr for ( Map.Entry> entry : dependentActionsByTransientEntity.entrySet() ) { final Object transientEntity = entry.getKey(); final String transientEntityName = session.guessEntityName( transientEntity ); - final Object transientEntityId = session.getFactory() - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( transientEntityName ) - .getIdentifier( transientEntity, session ); + final Object transientEntityId = + session.getFactory().getMappingMetamodel() + .getEntityDescriptor( transientEntityName ) + .getIdentifier( transientEntity, session ); final String transientEntityString = infoString( transientEntityName, transientEntityId ); final Set dependentEntityStrings = new TreeSet<>(); final Set nonNullableTransientPropertyPaths = new TreeSet<>(); diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java index 8ccf6e02e828..afb1c8f42afc 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java @@ -98,7 +98,7 @@ private void evictCache(Object entity, EntityPersister persister, EventSource se try { SessionFactoryImplementor factory = persister.getFactory(); - final MappingMetamodelImplementor metamodel = factory.getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor metamodel = factory.getMappingMetamodel(); Set collectionRoles = metamodel.getCollectionRolesByEntityParticipant( persister.getEntityName() ); if ( collectionRoles == null || collectionRoles.isEmpty() ) { return; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java index b6fb7cebcc93..73253aa89155 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java @@ -37,7 +37,6 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.model.domain.NavigableRole; -import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; @@ -227,10 +226,9 @@ public boolean containsEntity(Class entityClass, Object identifier) { @Override public boolean containsEntity(String entityName, Object identifier) { - final EntityPersister entityDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName ); + final EntityPersister entityDescriptor = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityName ); final EntityDataAccess cacheAccess = entityDescriptor.getCacheAccessStrategy(); if ( cacheAccess == null ) { return false; @@ -256,10 +254,9 @@ public void evictEntityData(Class entityClass, Object identifier) { @Override public void evictEntityData(String entityName, Object identifier) { - final EntityPersister entityDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName ); + final EntityPersister entityDescriptor = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityName ); final EntityDataAccess cacheAccess = entityDescriptor.getCacheAccessStrategy(); if ( cacheAccess == null ) { return; @@ -283,10 +280,9 @@ public void evictEntityData(Class entityClass) { @Override public void evictEntityData(String entityName) { - final EntityPersister entityDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName ); + final EntityPersister entityDescriptor = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityName ); evictEntityData( entityDescriptor ); } @@ -317,10 +313,7 @@ private void evictEntityData(NavigableRole navigableRole, EntityDataAccess cache @Override public void evictEntityData() { - final MappingMetamodelImplementor mappingMetamodel = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel(); - mappingMetamodel.forEachEntityDescriptor( this::evictEntityData ); + sessionFactory.getMappingMetamodel().forEachEntityDescriptor( this::evictEntityData ); } @@ -335,10 +328,9 @@ public void evictNaturalIdData(Class entityClass) { @Override public void evictNaturalIdData(String entityName) { - final EntityPersister entityDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName ); + final EntityPersister entityDescriptor = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityName ); evictNaturalIdData( entityDescriptor ); } @@ -371,10 +363,9 @@ private void evictNaturalIdData(NavigableRole rootEntityRole, NaturalIdDataAcces @Override public boolean containsCollection(String role, Object ownerIdentifier) { - final CollectionPersister collectionDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getCollectionDescriptor( role ); + final CollectionPersister collectionDescriptor = + sessionFactory.getMappingMetamodel() + .getCollectionDescriptor( role ); final CollectionDataAccess cacheAccess = collectionDescriptor.getCacheAccessStrategy(); if ( cacheAccess == null ) { @@ -387,10 +378,9 @@ public boolean containsCollection(String role, Object ownerIdentifier) { @Override public void evictCollectionData(String role, Object ownerIdentifier) { - final CollectionPersister collectionDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getCollectionDescriptor( role ); + final CollectionPersister collectionDescriptor = + sessionFactory.getMappingMetamodel() + .getCollectionDescriptor( role ); final CollectionDataAccess cacheAccess = collectionDescriptor.getCacheAccessStrategy(); if ( cacheAccess == null ) { @@ -410,10 +400,9 @@ public void evictCollectionData(String role, Object ownerIdentifier) { @Override public void evictCollectionData(String role) { - final CollectionPersister collectionDescriptor = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getCollectionDescriptor( role ); + final CollectionPersister collectionDescriptor = + sessionFactory.getMappingMetamodel() + .getCollectionDescriptor( role ); evictCollectionData( collectionDescriptor ); } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java index 68a4577282d0..10480d844e4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java @@ -34,35 +34,26 @@ public StructuredCacheEntry(EntityPersister persister) { } @Override - @SuppressWarnings("unchecked") public Object destructure(Object structured, SessionFactoryImplementor factory) { - final Map map = (Map) structured; + final var map = (Map) structured; final String subclass = (String) map.get( SUBCLASS_KEY ); final Object version = map.get( VERSION_KEY ); - - final EntityPersister subclassPersister = factory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( subclass ); - - final String[] names = subclassPersister.getPropertyNames(); + final String[] names = + factory.getMappingMetamodel() + .getEntityDescriptor( subclass ) + .getPropertyNames(); final Serializable[] disassembledState = new Serializable[names.length]; for ( int i = 0; i < names.length; i++ ) { disassembledState[i] = (Serializable) map.get( names[i] ); } - return new StandardCacheEntryImpl( - disassembledState, - subclass, - version - ); + return new StandardCacheEntryImpl( disassembledState, subclass, version ); } @Override - @SuppressWarnings("unchecked") public Object structure(Object item) { final CacheEntry entry = (CacheEntry) item; final String[] names = persister.getPropertyNames(); - final Map map = new HashMap( names.length + 3, 1f ); + final Map map = new HashMap<>( names.length + 3, 1f ); map.put( SUBCLASS_KEY, entry.getSubclass() ); map.put( VERSION_KEY, entry.getVersion() ); for ( int i=0; i coll, final CollectionPersister loadedPersister = entry.getLoadedPersister(); if ( loadedPersister != null && LOG.isDebugEnabled() ) { - LOG.debugf( - "Collection dereferenced: %s", - MessageHelper.collectionInfoString( loadedPersister, - coll, entry.getLoadedKey(), session - ) - ); + LOG.debug("Collection dereferenced: " + + collectionInfoString( loadedPersister, coll, entry.getLoadedKey(), session ) ); } // do a check final boolean hasOrphanDelete = loadedPersister != null && loadedPersister.hasOrphanDelete(); if ( hasOrphanDelete ) { - Object ownerId = loadedPersister.getOwnerEntityPersister().getIdentifier( coll.getOwner(), session ); - if ( ownerId == null ) { - // the owning entity may have been deleted and its identifier unset due to - // identifier-rollback; in which case, try to look up its identifier from - // the persistence context - if ( session.getFactory().getSessionFactoryOptions().isIdentifierRollbackEnabled() ) { - final EntityEntry ownerEntry = persistenceContext.getEntry( coll.getOwner() ); - if ( ownerEntry != null ) { - ownerId = ownerEntry.getId(); - } - } - if ( ownerId == null ) { - throw new AssertionFailure( "Unable to determine collection owner identifier for orphan-delete processing" ); - } - } + final Object ownerId = getOwnerId( coll, session, loadedPersister ); final EntityKey key = session.generateEntityKey( ownerId, loadedPersister.getOwnerEntityPersister() ); final Object owner = persistenceContext.getEntity( key ); if ( owner == null ) { - throw new AssertionFailure( - "collection owner not associated with session: " + - loadedPersister.getRole() - ); + throw new AssertionFailure( "collection owner not associated with session: " + loadedPersister.getRole() ); } final EntityEntry e = persistenceContext.getEntry( owner ); //only collections belonging to deleted entities are allowed to be dereferenced in the case of orphan delete if ( e != null && !e.getStatus().isDeletedOrGone() ) { throw new HibernateException( - "A collection with orphan deletion was no longer referenced by the owning entity instance: " + - loadedPersister.getRole() + "A collection with orphan deletion was no longer referenced by the owning entity instance: " + + loadedPersister.getRole() ); } } @@ -108,21 +81,43 @@ private static void processDereferencedCollection(PersistentCollection coll, } + private static Object getOwnerId( + PersistentCollection coll, + SessionImplementor session, + CollectionPersister loadedPersister) { + + Object ownerId = + loadedPersister.getOwnerEntityPersister() + .getIdentifier( coll.getOwner(), session ); + if ( ownerId == null ) { + // the owning entity may have been deleted and its identifier unset due to + // identifier-rollback; in which case, try to look up its identifier from + // the persistence context + if ( session.getFactory().getSessionFactoryOptions() + .isIdentifierRollbackEnabled() ) { + final EntityEntry ownerEntry = + session.getPersistenceContextInternal() + .getEntry( coll.getOwner() ); + if ( ownerEntry != null ) { + ownerId = ownerEntry.getId(); + } + } + if ( ownerId == null ) { + throw new AssertionFailure( "Unable to determine collection owner identifier for orphan delete processing" ); + } + } + return ownerId; + } + private static void processNeverReferencedCollection(PersistentCollection coll, SessionImplementor session) throws HibernateException { - final PersistenceContext persistenceContext = session.getPersistenceContextInternal(); - final CollectionEntry entry = persistenceContext.getCollectionEntry( coll ); + final CollectionEntry entry = + session.getPersistenceContextInternal() + .getCollectionEntry( coll ); if ( LOG.isDebugEnabled() ) { - LOG.debugf( - "Found collection with unloaded owner: %s", - MessageHelper.collectionInfoString( - entry.getLoadedPersister(), - coll, - entry.getLoadedKey(), - session - ) - ); + LOG.debug( "Found collection with unloaded owner: " + + collectionInfoString( entry.getLoadedPersister(), coll, entry.getLoadedKey(), session ) ); } entry.setCurrentPersister( entry.getLoadedPersister() ); @@ -146,34 +141,34 @@ public static void processReachableCollection( Object entity, SessionImplementor session) { collection.setOwner( entity ); - final CollectionEntry ce = session.getPersistenceContextInternal().getCollectionEntry( collection ); + final CollectionEntry ce = + session.getPersistenceContextInternal() + .getCollectionEntry( collection ); if ( ce == null ) { // refer to comment in StatefulPersistenceContext.addCollection() - throw new HibernateException( - "Found two representations of same collection: " + - type.getRole() - ); + throw new HibernateException( "Found two representations of same collection: " + type.getRole() ); } final SessionFactoryImplementor factory = session.getFactory(); - final CollectionPersister persister = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getCollectionDescriptor( type.getRole() ); + final CollectionPersister persister = + factory.getMappingMetamodel() + .getCollectionDescriptor( type.getRole() ); ce.setCurrentPersister( persister ); //TODO: better to pass the id in as an argument? ce.setCurrentKey( type.getKeyOfOwner( entity, session ) ); - final boolean isBytecodeEnhanced = persister.getOwnerEntityPersister().getBytecodeEnhancementMetadata().isEnhancedForLazyLoading(); + final boolean isBytecodeEnhanced = + persister.getOwnerEntityPersister() + .getBytecodeEnhancementMetadata() + .isEnhancedForLazyLoading(); if ( isBytecodeEnhanced && !collection.wasInitialized() ) { // the class of the collection owner is enhanced for lazy loading and we found an un-initialized PersistentCollection // - skip it if ( LOG.isDebugEnabled() ) { - LOG.debugf( - "Skipping uninitialized bytecode-lazy collection: %s", - MessageHelper.collectionInfoString(persister, collection, ce.getCurrentKey(), session) - ); + LOG.debug( "Skipping uninitialized bytecode-lazy collection: " + + collectionInfoString( persister, collection, ce.getCurrentKey(), session ) ); } ce.setReached( true ); ce.setProcessed( true ); @@ -184,9 +179,7 @@ public static void processReachableCollection( // who set up circular or shared references between/to collections. if ( ce.isReached() ) { // We've been here before - throw new HibernateException( - "Found shared references to a collection: " + type.getRole() - ); + throw new HibernateException( "Found shared references to a collection: " + type.getRole() ); } ce.setReached( true ); @@ -195,13 +188,13 @@ public static void processReachableCollection( if ( collection.wasInitialized() ) { LOG.debugf( "Collection found: %s, was: %s (initialized)", - MessageHelper.collectionInfoString( + collectionInfoString( persister, collection, ce.getCurrentKey(), session ), - MessageHelper.collectionInfoString( + collectionInfoString( ce.getLoadedPersister(), collection, ce.getLoadedKey(), @@ -212,13 +205,13 @@ public static void processReachableCollection( else { LOG.debugf( "Collection found: %s, was: %s (uninitialized)", - MessageHelper.collectionInfoString( + collectionInfoString( persister, collection, ce.getCurrentKey(), session ), - MessageHelper.collectionInfoString( + collectionInfoString( ce.getLoadedPersister(), collection, ce.getLoadedKey(), @@ -250,25 +243,21 @@ private static void prepareCollectionForUpdate( if ( loadedPersister != null || currentPersister != null ) { // it is or was referenced _somewhere_ - // check if the key changed - // excludes marking key changed when the loaded key is a DelayedPostInsertIdentifier. - final boolean keyChanged = currentPersister != null - && entry != null - && !currentPersister.getKeyType().isEqual( entry.getLoadedKey(), entry.getCurrentKey(), factory ) - && !( entry.getLoadedKey() instanceof DelayedPostInsertIdentifier ); // if either its role changed, or its key changed - final boolean ownerChanged = loadedPersister != currentPersister || keyChanged; + final boolean ownerChanged = + loadedPersister != currentPersister + || wasKeyChanged( entry, factory, currentPersister ); if ( ownerChanged ) { // do a check final boolean orphanDeleteAndRoleChanged = loadedPersister != null && currentPersister != null && loadedPersister.hasOrphanDelete(); - if (orphanDeleteAndRoleChanged) { + if ( orphanDeleteAndRoleChanged ) { throw new HibernateException( - "Don't change the reference to a collection with delete-orphan enabled : " - + loadedPersister.getRole() + "Don't change the reference to a collection with delete orphan enabled: " + + loadedPersister.getRole() ); } @@ -293,6 +282,17 @@ else if ( collection.isDirty() ) { } } + /** + * Check if the key changed. + * Excludes marking key changed when the loaded key is a {@code DelayedPostInsertIdentifier}. + */ + private static boolean wasKeyChanged( + CollectionEntry entry, SessionFactoryImplementor factory, CollectionPersister currentPersister) { + return currentPersister != null + && !currentPersister.getKeyType().isEqual( entry.getLoadedKey(), entry.getCurrentKey(), factory ) + && !(entry.getLoadedKey() instanceof DelayedPostInsertIdentifier); + } + /** * Determines if we can skip the explicit SQL delete statement, since * the rows will be deleted by {@code on delete cascade}. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index d6c1175e928d..ff541894726c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -1471,9 +1471,7 @@ public Entry[] reentrantSafeEntityEntries() { public Object getOwnerId(String entityName, String propertyName, Object childEntity, Map mergeMap) { final String collectionRole = entityName + '.' + propertyName; - final MappingMetamodelImplementor mappingMetamodel = session.getFactory() - .getRuntimeMetamodels() - .getMappingMetamodel(); + final MappingMetamodelImplementor mappingMetamodel = session.getFactory().getMappingMetamodel(); final EntityPersister persister = mappingMetamodel.getEntityDescriptor( entityName ); final CollectionPersister collectionPersister = mappingMetamodel.getCollectionDescriptor( collectionRole ); @@ -1601,7 +1599,7 @@ private boolean isFoundInParent( @Override public Object getIndexInOwner(String entity, String property, Object childEntity, Map mergeMap) { - final MappingMetamodelImplementor metamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor metamodel = session.getFactory().getMappingMetamodel(); final EntityPersister persister = metamodel.getEntityDescriptor( entity ); final CollectionPersister cp = metamodel.getCollectionDescriptor( entity + '.' + property ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java index cd658759b97b..87fa82bfd309 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java @@ -281,7 +281,7 @@ private void setLoadedPersister(@Nullable CollectionPersister persister) { void afterDeserialize(@Nullable SessionFactoryImplementor factory) { loadedPersister = factory == null ? null - : factory.getRuntimeMetamodels().getMappingMetamodel() + : factory.getMappingMetamodel() .getCollectionDescriptor( castNonNull( role ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java index 556af57d26c2..0c1c58a5a91e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java @@ -11,11 +11,12 @@ import org.hibernate.AssertionFailure; import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; import org.checkerframework.checker.nullness.qual.Nullable; +import static org.hibernate.pretty.MessageHelper.collectionInfoString; + /** * Uniquely identifies a collection instance in a particular session. * @@ -70,10 +71,10 @@ public Object getKey() { @Override public String toString() { - final CollectionPersister collectionDescriptor = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getCollectionDescriptor( role ); - return "CollectionKey" + MessageHelper.collectionInfoString( collectionDescriptor, key, factory ); + final CollectionPersister collectionDescriptor = + factory.getMappingMetamodel() + .getCollectionDescriptor( role ); + return "CollectionKey" + collectionInfoString( collectionDescriptor, key, factory ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java index 9b4270a4acef..750fa2907aa5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java @@ -148,10 +148,9 @@ public void serialize(ObjectOutputStream oos) throws IOException { public static EntityKey deserialize(ObjectInputStream ois, SessionFactoryImplementor sessionFactory) throws IOException, ClassNotFoundException { final Object id = ois.readObject(); final String entityName = (String) ois.readObject(); - final EntityPersister entityPersister = sessionFactory - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName); + final EntityPersister entityPersister = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityName); return new EntityKey( id, entityPersister ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java deleted file mode 100644 index 96d2a42af1d0..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * SPDX-License-Identifier: LGPL-2.1-or-later - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.engine.spi; - -import org.hibernate.type.Type; -import org.hibernate.type.MappingContext; - -/** - * Declares operations used by implementors of {@link Type} that are common to - * "compiled" mappings held at runtime by a {@link org.hibernate.SessionFactory} - * and "uncompiled" mappings held by a {@link org.hibernate.cfg.Configuration}. - * - * @see Type - * @see org.hibernate.internal.SessionFactoryImpl - * @see org.hibernate.cfg.Configuration - * - * @author Gavin King - * - * @deprecated Use {@link org.hibernate.type.spi.TypeConfiguration}, - * {@link org.hibernate.boot.Metadata}, - * {@link org.hibernate.metamodel.RuntimeMetamodels}, - * or {@link MappingContext} to access such information - */ -@Deprecated(since = "6.0", forRemoval = true) -public interface Mapping extends MappingContext { -} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java index 4b4b68f2b2be..36df4c831819 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java @@ -253,7 +253,7 @@ public SessionImplementor openTemporarySession() throws HibernateException { @Deprecated public Set getCollectionRolesByEntityParticipant(String entityName) { - return delegate.getRuntimeMetamodels().getMappingMetamodel().getCollectionRolesByEntityParticipant( entityName ); + return delegate.getMappingMetamodel().getCollectionRolesByEntityParticipant( entityName ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java index 82a3728d255a..949ae2129807 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java @@ -35,7 +35,7 @@ public String resolveEntityName(Object entity) { } } - final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getMappingMetamodel(); for ( EntityNameResolver resolver : mappingMetamodel.getEntityNameResolvers() ) { entityName = resolver.resolveEntityName( entity ); if ( entityName != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java index 93ee4454e690..cf8d78f708f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/FetchProfileHelper.java @@ -43,7 +43,9 @@ public static Map getFetchProfiles( } static void addFetchProfiles( - MetadataImplementor bootMetamodel, RuntimeMetamodels runtimeMetamodels, Map fetchProfiles) { + MetadataImplementor bootMetamodel, + RuntimeMetamodels runtimeMetamodels, + Map fetchProfiles) { for ( org.hibernate.mapping.FetchProfile mappingProfile : bootMetamodel.getFetchProfiles() ) { final FetchProfile fetchProfile = createFetchProfile( runtimeMetamodels.getMappingMetamodel(), mappingProfile ); fetchProfiles.put( fetchProfile.getName(), fetchProfile ); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java index c174cd1e311c..ee3fb34a7a97 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java @@ -38,9 +38,9 @@ public final class EntityPrinter { * @return the entity rendered to a string */ public String toString(String entityName, Object entity) throws HibernateException { - final EntityPersister entityPersister = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName ); + final EntityPersister entityPersister = + factory.getMappingMetamodel() + .getEntityDescriptor( entityName ); if ( entityPersister == null || !entityPersister.isInstance( entity ) ) { return entity.getClass().getName(); } diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java index d3b41555f572..181d497328a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java @@ -149,9 +149,9 @@ private Object getIdentifierFromPersister(Object entity) { final Class entityClass = Hibernate.getClass( entity ); final EntityPersister persister; try { - persister = sessionFactory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityClass ); + persister = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityClass ); if ( persister == null ) { throw new IllegalArgumentException( entityClass.getName() + " is not an entity" ); } @@ -166,9 +166,9 @@ private Object getVersionFromPersister(Object entity) { final Class entityClass = Hibernate.getClass( entity ); final EntityPersister persister; try { - persister = sessionFactory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityClass ); + persister = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( entityClass ); if ( persister == null ) { throw new IllegalArgumentException( entityClass.getName() + " is not an entity" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java index 8df2cdf28133..1224ef333ef1 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java @@ -63,9 +63,9 @@ public EntityConcreteTypeLoader(EntityMappingType entityDescriptor, SessionFacto public EntityMappingType getConcreteType(Object id, SharedSessionContractImplementor session) { final SessionFactoryImplementor sessionFactory = session.getSessionFactory(); - final SqlAstTranslatorFactory sqlAstTranslatorFactory = sessionFactory.getJdbcServices() - .getJdbcEnvironment() - .getSqlAstTranslatorFactory(); + final SqlAstTranslatorFactory sqlAstTranslatorFactory = + sessionFactory.getJdbcServices().getJdbcEnvironment() + .getSqlAstTranslatorFactory(); final JdbcParameterBindings jdbcParamBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() ); int offset = jdbcParamBindings.registerParametersForEachJdbcValue( @@ -95,11 +95,11 @@ public EntityMappingType getConcreteType(Object id, SharedSessionContractImpleme else { assert results.size() == 1; final Object result = results.get( 0 ); - final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getRuntimeMetamodels() - .getMappingMetamodel(); - final EntityPersister concreteType = result instanceof Class - ? mappingMetamodel.getEntityDescriptor( (Class) result ) - : mappingMetamodel.getEntityDescriptor( (String) result ); + final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getMappingMetamodel(); + final EntityPersister concreteType = + result instanceof Class concreteClass + ? mappingMetamodel.getEntityDescriptor( concreteClass ) + : mappingMetamodel.getEntityDescriptor( (String) result ); if ( !concreteType.isTypeOrSuperType( entityDescriptor ) ) { throw new WrongClassException( concreteType.getEntityName(), diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/CacheLoadHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/CacheLoadHelper.java index 10c1de17c89c..b1973d2882b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/internal/CacheLoadHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/CacheLoadHelper.java @@ -253,7 +253,7 @@ private static Object convertCacheEntryToEntity( EntityKey entityKey) { final EntityPersister subclassPersister = - source.getFactory().getRuntimeMetamodels().getMappingMetamodel() + source.getFactory().getMappingMetamodel() .getEntityDescriptor( entry.getSubclass() ); final PersistenceContext persistenceContext = source.getPersistenceContextInternal(); final EntityHolder oldHolder = persistenceContext.getEntityHolder( entityKey ); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index d8fc57e5d2fc..3c9ba8337946 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -21,7 +21,6 @@ import org.hibernate.collection.internal.CustomCollectionTypeSemantics; import org.hibernate.collection.spi.CollectionSemantics; import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle; -import org.hibernate.engine.spi.Mapping; import org.hibernate.internal.FilterConfiguration; import org.hibernate.internal.util.PropertiesHelper; import org.hibernate.internal.util.StringHelper; @@ -378,14 +377,6 @@ public void setFetchMode(FetchMode fetchMode) { this.fetchMode = fetchMode; } - /** - * @deprecated use {@link #validate(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - public void validate(Mapping mapping) throws MappingException { - validate( (MappingContext) mapping); - } - public void validate(MappingContext mappingContext) throws MappingException { assert getKey() != null : "Collection key not bound : " + getRole(); assert getElement() != null : "Collection element not bound : " + getRole(); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java index d76b1d0fbe78..937aca41fdb1 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java @@ -19,7 +19,6 @@ import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.Size; -import org.hibernate.engine.spi.Mapping; import org.hibernate.loader.internal.AliasConstantsHelper; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.query.sqm.function.SqmFunctionRegistry; @@ -281,14 +280,6 @@ public boolean equals(Column column) { : name.equalsIgnoreCase( column.name ) ); } - /** - * @deprecated use {@link #getSqlTypeCode(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - public int getSqlTypeCode(Mapping mapping) throws MappingException{ - return getSqlTypeCode((MappingContext) mapping); - } - public int getSqlTypeCode(MappingContext mapping) throws MappingException { if ( sqlTypeCode == null ) { final Type type = getValue().getType(); @@ -422,14 +413,6 @@ public String getSqlType(Metadata mapping) { return getSqlTypeName( database.getTypeConfiguration(), database.getDialect(), mapping ); } - /** - * @deprecated use {@link #getSqlType(Metadata)} - */ - @Deprecated(since = "6.2", forRemoval = true) - public String getSqlType(TypeConfiguration typeConfiguration, Dialect dialect, Mapping mapping) { - return getSqlTypeName( typeConfiguration, dialect, mapping ); - } - @Override public String getTypeName() { return sqlTypeName; @@ -460,14 +443,6 @@ public int getDecimalDigits() { return scale == null ? 0 : scale; } - /** - * @deprecated use {@link #getColumnSize(Dialect, MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - public Size getColumnSize(Dialect dialect, Mapping mapping) { - return getColumnSize(dialect, (MappingContext) mapping); - } - public Size getColumnSize(Dialect dialect, MappingContext mappingContext) { if ( columnSize == null ) { columnSize = calculateColumnSize( dialect, mappingContext ); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java index 6400141ad318..fef01aece8da 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java @@ -8,7 +8,6 @@ import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.engine.spi.Mapping; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.MappingContext; import org.hibernate.usertype.UserCollectionType; @@ -66,11 +65,6 @@ void createPrimaryKey() { // create an index on the key columns?? } - @Deprecated(forRemoval = true) - public void validate(Mapping mapping) throws MappingException { - validate( (MappingContext) mapping); - } - public void validate(MappingContext mappingContext) throws MappingException { super.validate( mappingContext ); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java index d5762b53fcef..ceb3a44170c5 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java @@ -8,7 +8,6 @@ import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.engine.spi.Mapping; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.MappingContext; import org.hibernate.usertype.UserCollectionType; @@ -96,11 +95,6 @@ void createPrimaryKey() { // } } - @Deprecated(forRemoval = true) - public void validate(Mapping mapping) throws MappingException { - validate( (MappingContext) mapping); - } - public void validate(MappingContext mappingContext) throws MappingException { super.validate( mappingContext ); diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java index 5cb6139f6e5e..5af4284ab0a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java @@ -18,7 +18,6 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.CascadeStyle; import org.hibernate.engine.spi.CascadeStyles; -import org.hibernate.engine.spi.Mapping; import org.hibernate.jpa.event.spi.CallbackDefinition; import org.hibernate.metamodel.RepresentationMode; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; @@ -276,14 +275,6 @@ public void setMetaAttributes(Map metas) { this.metaAttributes = metas; } - /** - * @deprecated use {@link #isValid(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - public boolean isValid(Mapping mapping) throws MappingException { - return isValid( (MappingContext) mapping); - } - public boolean isValid(MappingContext mappingContext) throws MappingException { final Value value = getValue(); if ( value instanceof BasicValue basicValue && basicValue.isDisallowedWrapperArray() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java index ba55206f6e82..49a772c593ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java @@ -8,7 +8,6 @@ import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.engine.spi.Mapping; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.CollectionType; import org.hibernate.type.OrderedSetType; @@ -48,11 +47,6 @@ public Set copy() { return new Set( this ); } - @Deprecated(forRemoval = true) - public void validate(Mapping mapping) throws MappingException { - validate( (MappingContext) mapping ); - } - public void validate(MappingContext mappingContext) throws MappingException { super.validate( mappingContext ); //for backward compatibility, disable this: diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java index e4ffa5cb9deb..1f1871573ab6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java @@ -13,7 +13,6 @@ import org.hibernate.Internal; import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.engine.spi.Mapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.service.ServiceRegistry; import org.hibernate.type.CompositeType; @@ -72,14 +71,6 @@ default List getConstraintColumns() { Type getType() throws MappingException; - /** - * @deprecated use {@link #getSelectableType(MappingContext, int)} - */ - @Deprecated(since = "7.0", forRemoval = true) - default JdbcMapping getSelectableType(Mapping factory, int index) throws MappingException { - return getSelectableType( (MappingContext) factory, index ); - } - @Incubating default JdbcMapping getSelectableType(MappingContext mappingContext, int index) throws MappingException { return getType( mappingContext, getType(), index ); @@ -143,14 +134,6 @@ private Type getIdType(EntityType entityType) { boolean isSimpleValue(); - /** - * @deprecated use {@link #isValid(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - default boolean isValid(Mapping mapping) throws MappingException{ - return isValid( (MappingContext) mapping ); - } - boolean isValid(MappingContext mappingContext) throws MappingException; void setTypeUsingReflection(String className, String propertyName) throws MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java index 466ae382234c..a20bf8d39117 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java @@ -207,9 +207,9 @@ else if ( attributeMapping instanceof ToOneAttributeMapping toOneAttributeMappin @Override public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) { final SessionFactoryImplementor factory = session.getFactory(); - final EntityPersister entityDescriptor = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entity.getClass() ); + final EntityPersister entityDescriptor = + factory.getMappingMetamodel() + .getEntityDescriptor( entity.getClass() ); final Object[] propertyValues = new Object[attributeMappings.size()]; virtualIdEmbeddable.forEachAttribute( (position, virtualIdAttribute) -> { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java index 8104efd342ae..13beb5ca1348 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java @@ -8,7 +8,6 @@ import java.util.List; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.spi.Mapping; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.mapping.Selectable; import org.hibernate.mapping.Value; @@ -55,34 +54,6 @@ private static void resolveJdbcMappings(List jdbcMappings, MappingC } } - /** - * @deprecated use {@link #from(String, Value, int[], MappingContext, TypeConfiguration, boolean[], boolean[], Dialect, SqmFunctionRegistry, RuntimeModelCreationContext)} - */ - @Deprecated(since = "7.0") - public static SelectableMappings from( - String containingTableExpression, - Value value, - int[] propertyOrder, - Mapping mapping, - TypeConfiguration typeConfiguration, - boolean[] insertable, - boolean[] updateable, - Dialect dialect, - SqmFunctionRegistry sqmFunctionRegistry, - RuntimeModelCreationContext creationContext) { - return from( - containingTableExpression, - value, propertyOrder, - (MappingContext) mapping, - typeConfiguration, - insertable, - updateable, - dialect, - sqmFunctionRegistry, - creationContext - ); - } - public static SelectableMappings from( String containingTableExpression, Value value, diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index a44e3eb4eb1f..a745fddb55f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -1446,9 +1446,9 @@ public Object initializeLazyProperty(String fieldName, Object entity, SharedSess if ( type instanceof CollectionType collectionType ) { // we have a condition where a collection attribute is being access via enhancement: // we can circumvent all the rest and just return the PersistentCollection - final CollectionPersister persister = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getCollectionDescriptor( collectionType.getRole() ); + final CollectionPersister persister = + factory.getMappingMetamodel() + .getCollectionDescriptor( collectionType.getRole() ); // Get/create the collection, and make sure it is initialized! This initialized part is // different from proxy-based scenarios where we have to create the PersistentCollection diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java index 0b04eaf91587..9c88ba8f55e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java @@ -1134,7 +1134,7 @@ public TableDetails getIdentifierTableDetails() { @Override public void pruneForSubclasses(TableGroup tableGroup, Map entityNameUses) { final Set retainedTableReferences = new HashSet<>( entityNameUses.size() ); - final MappingMetamodelImplementor metamodel = getFactory().getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor metamodel = getFactory().getMappingMetamodel(); // We can only do this optimization if the table group reports canUseInnerJoins or isRealTableGroup, // because the switch for table reference joins to INNER must be cardinality preserving. // If canUseInnerJoins is true, this is trivially given, but also if the table group is real diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java index 6e3563fc5a94..85202d286673 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java @@ -565,9 +565,7 @@ public void pruneForSubclasses(TableGroup tableGroup, Map return; } // The following optimization is to add the discriminator filter fragment for all treated entity names - final MappingMetamodelImplementor mappingMetamodel = getFactory() - .getRuntimeMetamodels() - .getMappingMetamodel(); + final MappingMetamodelImplementor mappingMetamodel = getFactory().getMappingMetamodel(); boolean containsTreatUse = false; for ( Map.Entry entry : entityNameUses.entrySet() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java index 3fa14b0b64e5..760bbab39e95 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java @@ -473,7 +473,7 @@ protected String generateSubquery(Map entityNameUses) { } final Dialect dialect = getFactory().getJdbcServices().getDialect(); - final MappingMetamodelImplementor metamodel = getFactory().getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor metamodel = getFactory().getMappingMetamodel(); // Collect all selectables of every entity subtype and group by selection expression as well as table name final LinkedHashMap> selectables = new LinkedHashMap<>(); final Set tablesToUnion = new HashSet<>( entityNameUses.size() ); diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index d64ecf529577..d6e9d60987b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -769,9 +769,9 @@ public ProcedureCallImplementor addSynchronizedQuerySpace(String querySpace) @Override public ProcedureCallImplementor addSynchronizedEntityName(String entityName) { - final EntityPersister entityDescriptor = getSession().getFactory().getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityName ); + final EntityPersister entityDescriptor = + getSession().getFactory().getMappingMetamodel() + .getEntityDescriptor( entityName ); addSynchronizedQuerySpaces( entityDescriptor ); return this; } @@ -782,9 +782,9 @@ protected void addSynchronizedQuerySpaces(EntityPersister persister) { @Override public ProcedureCallImplementor addSynchronizedEntityClass(@SuppressWarnings("rawtypes") Class entityClass) { - final EntityPersister entityDescriptor = getSession().getFactory().getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( entityClass ); + final EntityPersister entityDescriptor = + getSession().getFactory().getMappingMetamodel() + .getEntityDescriptor( entityClass ); addSynchronizedQuerySpaces( entityDescriptor ); return this; } diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java index 02daa8d6bb48..490d1c5b01e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java @@ -80,7 +80,7 @@ public final Object getIdentifier() { } private MappingMetamodelImplementor getMappingMetamodel() { - return session.getFactory().getRuntimeMetamodels().getMappingMetamodel(); + return session.getFactory().getMappingMetamodel(); } private EntityPersister getEntityDescriptor() { @@ -146,7 +146,7 @@ private static EntityKey generateEntityKeyOrNull(Object id, SharedSessionContrac } else { final EntityPersister entityDescriptor = - session.getFactory().getRuntimeMetamodels().getMappingMetamodel() + session.getFactory().getMappingMetamodel() .getEntityDescriptor( entityName ); return session.generateEntityKey( id, entityDescriptor ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java index 4eabf9ef4dfd..ee3375a90382 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java @@ -20,6 +20,7 @@ import org.hibernate.metamodel.mapping.internal.DiscriminatedAssociationAttributeMapping; import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; +import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.NativeQuery; import org.hibernate.query.internal.ResultSetMappingResolutionContext; @@ -157,9 +158,9 @@ public static ResultBuilder attributeResult( ); } - final RuntimeMetamodels runtimeMetamodels = sessionFactory.getRuntimeMetamodels(); - final String fullEntityName = runtimeMetamodels.getMappingMetamodel().getImportedName( entityName ); - final EntityPersister entityMapping = runtimeMetamodels.getMappingMetamodel().findEntityDescriptor( fullEntityName ); + final MappingMetamodelImplementor mappingMetamodel = sessionFactory.getMappingMetamodel(); + final String fullEntityName = mappingMetamodel.getImportedName( entityName ); + final EntityPersister entityMapping = mappingMetamodel.findEntityDescriptor( fullEntityName ); if ( entityMapping == null ) { throw new IllegalArgumentException( "Could not locate entity mapping : " + fullEntityName ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java index 2fc1b09d4448..dab2dc0ca5fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java @@ -169,9 +169,9 @@ public void addAffectedTableNames(Set affectedTableNames, SessionFactory return; } - final EntityPersister entityDescriptor = sessionFactory.getRuntimeMetamodels() - .getMappingMetamodel() - .findEntityDescriptor( mappingIdentifier ); + final EntityPersister entityDescriptor = + sessionFactory.getMappingMetamodel() + .findEntityDescriptor( mappingIdentifier ); if ( entityDescriptor == null ) { return; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java index e8e78f0a2a72..5d88e749261f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java @@ -792,10 +792,9 @@ public

CommonQueryContract setParameter(String name, P value, Class

javaT paramType = basicType; } else { - final ManagedDomainType

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -876,10 +875,9 @@ public

CommonQueryContract setParameter(int position, P value, Class

java paramType = basicType; } else { - final ManagedDomainType

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -932,10 +930,9 @@ public

CommonQueryContract setParameter(QueryParameter

parameter, P value paramType = basicType; } else { - final ManagedDomainType

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -1051,10 +1048,9 @@ public

CommonQueryContract setParameterList(String name, Collection managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -1098,10 +1094,9 @@ public

CommonQueryContract setParameterList(String name, P[] values, Class

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -1143,10 +1138,9 @@ public

CommonQueryContract setParameterList(int position, Collection managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -1189,10 +1183,9 @@ public

CommonQueryContract setParameterList(int position, P[] values, Class< paramType = basicType; } else { - final ManagedDomainType

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -1236,10 +1229,9 @@ public

CommonQueryContract setParameterList(QueryParameter

parameter, Col paramType = basicType; } else { - final ManagedDomainType

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } @@ -1282,10 +1274,9 @@ public

CommonQueryContract setParameterList(QueryParameter

parameter, P[] paramType = basicType; } else { - final ManagedDomainType

managedDomainType = getSession().getFactory() - .getRuntimeMetamodels() - .getJpaMetamodel() - .managedType( javaType ); + final ManagedDomainType

managedDomainType = + getSession().getFactory().getJpaMetamodel() + .managedType( javaType ); if ( managedDomainType != null ) { paramType = managedDomainType; } diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java index 508800ddccb8..e92204c2cb2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java @@ -449,8 +449,7 @@ private CompleteResultBuilderCollectionStandard createSuffixedResultBuilder( } private EntityPersister getSQLLoadable(String entityName) throws MappingException { - return factory.getRuntimeMetamodels().getMappingMetamodel() - .getEntityDescriptor( entityName ); + return factory.getMappingMetamodel().getEntityDescriptor( entityName ); } private String generateEntitySuffix() { @@ -519,7 +518,7 @@ private void addPersister(String alias, Map propertyResult, En private void addCollection(String role, String alias, Map propertyResults) { final CollectionPersister collectionDescriptor = - factory.getRuntimeMetamodels().getMappingMetamodel() + factory.getMappingMetamodel() .getCollectionDescriptor( role ); alias2CollectionPersister.put( alias, collectionDescriptor ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java index 392331e4e7bb..f21a5f232870 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java @@ -630,9 +630,9 @@ protected String addDmlCtes( final EntityPersister entityPersister = entityDescriptor.getEntityPersister(); final String rootEntityName = entityPersister.getRootEntityName(); - final EntityPersister rootEntityDescriptor = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( rootEntityName ); + final EntityPersister rootEntityDescriptor = + factory.getMappingMetamodel() + .getEntityDescriptor( rootEntityName ); final String hierarchyRootTableName = rootEntityDescriptor.getTableName(); final TableReference hierarchyRootTableReference = updatingTableGroup.resolveTableReference( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java index 078385388a5f..deb5ef08f6da 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java @@ -126,9 +126,9 @@ public int executeUpdate( protected void checkMatch(SqmDeleteOrUpdateStatement sqmStatement) { final String targetEntityName = sqmStatement.getTarget().getEntityName(); - final EntityPersister targetEntityDescriptor = sessionFactory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( targetEntityName ); + final EntityPersister targetEntityDescriptor = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( targetEntityName ); if ( targetEntityDescriptor != rootDescriptor && ! rootDescriptor.isSubclassEntityName( targetEntityDescriptor.getEntityName() ) ) { throw new IllegalArgumentException( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java index 83977b79aab5..848e5df03857 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteUpdateHandler.java @@ -79,9 +79,9 @@ protected void addDmlCtes( final EntityPersister entityPersister = entityDescriptor.getEntityPersister(); final String rootEntityName = entityPersister.getRootEntityName(); - final EntityPersister rootEntityDescriptor = factory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( rootEntityName ); + final EntityPersister rootEntityDescriptor = + factory.getMappingMetamodel() + .getEntityDescriptor( rootEntityName ); final String hierarchyRootTableName = rootEntityDescriptor.getTableName(); final TableReference hierarchyRootTableReference = updatingTableGroup.resolveTableReference( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java index 2dff8b511915..da69b0657e2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java @@ -96,7 +96,7 @@ public int execute(DomainQueryExecutionContext executionContext) { } domainParameterXref.clearExpansions(); - final MappingMetamodel domainModel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodel domainModel = sessionFactory.getMappingMetamodel(); final String mutatingEntityName = sqmUpdate.getTarget().getModel().getHibernateEntityName(); final EntityPersister entityDescriptor = domainModel.getEntityDescriptor( mutatingEntityName ); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java index c6eaa14c689d..f2e0f2dacadc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/RestrictedDeleteExecutionDelegate.java @@ -88,9 +88,9 @@ public RestrictedDeleteExecutionDelegate( @Override public int execute(DomainQueryExecutionContext executionContext) { - final EntityPersister entityDescriptor = getSessionFactory().getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( getSqmDelete().getTarget().getEntityName() ); + final EntityPersister entityDescriptor = + getSessionFactory().getMappingMetamodel() + .getEntityDescriptor( getSqmDelete().getTarget().getEntityName() ); final String hierarchyRootTableName = entityDescriptor.getTableName(); final TableGroup deletingTableGroup = getConverter().getMutatingTableGroup(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java index 0922ac0f8438..e1d1d0e5182a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/SoftDeleteExecutionDelegate.java @@ -86,10 +86,9 @@ public SoftDeleteExecutionDelegate( @Override public int execute(DomainQueryExecutionContext domainQueryExecutionContext) { final String targetEntityName = getSqmDelete().getTarget().getEntityName(); - final EntityPersister targetEntityDescriptor = getSessionFactory() - .getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( targetEntityName ); + final EntityPersister targetEntityDescriptor = + getSessionFactory().getMappingMetamodel() + .getEntityDescriptor( targetEntityName ); final EntityMappingType rootEntityDescriptor = targetEntityDescriptor.getRootEntityDescriptor(); diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java index f2489357d659..0fd75166ac85 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java @@ -112,9 +112,9 @@ public int execute(DomainQueryExecutionContext executionContext) { } protected ExecutionDelegate resolveDelegate(DomainQueryExecutionContext executionContext) { - final EntityPersister entityDescriptor = sessionFactory.getRuntimeMetamodels() - .getMappingMetamodel() - .getEntityDescriptor( getSqmInsertStatement().getTarget().getEntityName() ); + final EntityPersister entityDescriptor = + sessionFactory.getMappingMetamodel() + .getEntityDescriptor( getSqmInsertStatement().getTarget().getEntityName() ); final MultiTableSqmMutationConverter converterDelegate = new MultiTableSqmMutationConverter( entityDescriptor, diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java index 99b3acc59f34..3f53c82d93a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java @@ -88,8 +88,9 @@ public int execute(DomainQueryExecutionContext executionContext) { protected ExecutionDelegate resolveDelegate(DomainQueryExecutionContext executionContext) { final SessionFactoryImplementor sessionFactory = getSessionFactory(); - final MappingMetamodel domainModel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel(); - final EntityPersister entityDescriptor = domainModel.getEntityDescriptor( getSqmDeleteOrUpdateStatement().getTarget().getEntityName() ); + final MappingMetamodel domainModel = sessionFactory.getMappingMetamodel(); + final EntityPersister entityDescriptor = + domainModel.getEntityDescriptor( getSqmDeleteOrUpdateStatement().getTarget().getEntityName() ); final String rootEntityName = entityDescriptor.getRootEntityName(); final EntityPersister rootEntityDescriptor = domainModel.getEntityDescriptor( rootEntityName ); diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java index e7d7fccd508c..c5832ffa53d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java +++ b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java @@ -5,7 +5,6 @@ package org.hibernate.service; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.hibernate.boot.cfgxml.internal.CfgXmlAccessServiceInitiator; @@ -42,6 +41,8 @@ import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator; import org.hibernate.tool.schema.internal.script.SqlScriptExtractorInitiator; +import static java.util.Collections.unmodifiableList; + /** * Central definition of the standard set of service initiators defined by Hibernate. * @@ -157,6 +158,6 @@ private static List> buildStandardServiceInitiatorLi serviceInitiators.trimToSize(); - return Collections.unmodifiableList( serviceInitiators ); + return unmodifiableList( serviceInitiators ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java index f3e3db02ea22..3c79f2970383 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java @@ -134,7 +134,7 @@ public StatisticsImpl(SessionFactoryImplementor sessionFactory) { 20 ); resetStart(); - metamodel = sessionFactory.getRuntimeMetamodels().getMappingMetamodel(); + metamodel = sessionFactory.getMappingMetamodel(); cache = sessionFactory.getCache(); secondLevelCacheEnabled = sessionFactoryOptions.isSecondLevelCacheEnabled(); queryCacheEnabled = sessionFactoryOptions.isQueryCacheEnabled(); diff --git a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java index 76779d476c7b..95927e709f57 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java @@ -189,7 +189,7 @@ private EntityPersister guessEntityPersister(Object object, SessionFactoryImplem } if ( entityName == null ) { - final MappingMetamodelImplementor mappingMetamodel = factory.getRuntimeMetamodels().getMappingMetamodel(); + final MappingMetamodelImplementor mappingMetamodel = factory.getMappingMetamodel(); for ( EntityNameResolver resolver : mappingMetamodel.getEntityNameResolvers() ) { entityName = resolver.resolveEntityName( entity ); if ( entityName != null ) { @@ -203,7 +203,7 @@ private EntityPersister guessEntityPersister(Object object, SessionFactoryImplem entityName = object.getClass().getName(); } - return factory.getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor( entityName ); + return factory.getMappingMetamodel().getEntityDescriptor( entityName ); } @Override @@ -296,7 +296,7 @@ public String toLoggableString(Object value, SessionFactoryImplementor factory) final String entityName = factory.bestGuessEntityName(value); final EntityPersister descriptor = entityName == null ? null - : factory.getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor( entityName ); + : factory.getMappingMetamodel().getEntityDescriptor( entityName ); return infoString( descriptor, value, factory ); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java index b91cda6ec61a..9e7b371f33bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java @@ -13,7 +13,6 @@ import org.hibernate.MappingException; import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor; import org.hibernate.engine.spi.EntityUniqueKey; -import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.PersistentAttributeInterceptor; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -567,19 +566,6 @@ public boolean isLogicalOneToOne() { return isOneToOne(); } - /** - * Convenience method to locate the identifier type of the associated entity. - * - * @param factory The mappings... - * - * @return The identifier type - * @deprecated use {@link #getIdentifierType(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - Type getIdentifierType(final Mapping factory) { - return getIdentifierType( (MappingContext) factory ); - } - Type getIdentifierType(final MappingContext mappingContext) { final Type type = associatedIdentifierType; //The following branch implements a simple lazy-initialization, but rather than the canonical @@ -612,24 +598,6 @@ Type getIdentifierType(final SharedSessionContractImplementor session) { } } - /** - * Determine the type of either (1) the identifier if we reference the - * associated entity's PK or (2) the unique key to which we refer (i.e. - * the property-ref). - * - * @param factory The mappings... - * - * @return The appropriate type. - * - * @throws MappingException Generally, if unable to resolve the associated entity name - * or unique key property name. - * @deprecated use {@link #getIdentifierOrUniqueKeyType(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - public final Type getIdentifierOrUniqueKeyType(Mapping factory) throws MappingException { - return getIdentifierOrUniqueKeyType( (MappingContext) factory ); - } - /** * Determine the type of either: *

    @@ -657,24 +625,6 @@ public final Type getIdentifierOrUniqueKeyType(MappingContext mappingContext) th } } - /** - * The name of the property on the associated entity to which our FK - * refers - * - * @param factory The mappings... - * - * @return The appropriate property name. - * - * @throws MappingException Generally, if unable to resolve the associated entity name - * - * @deprecated No longer used - */ - @Deprecated(since = "7", forRemoval = true) - public final String getIdentifierOrUniqueKeyPropertyName(Mapping factory) - throws MappingException { - return getIdentifierOrUniqueKeyPropertyName( (MappingContext) factory); - } - /** * The name of the property on the associated entity to which our FK * refers diff --git a/hibernate-core/src/main/java/org/hibernate/type/MapType.java b/hibernate-core/src/main/java/org/hibernate/type/MapType.java index 80123b8fb4b9..7a39d64621ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/MapType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/MapType.java @@ -65,7 +65,7 @@ public Object replaceElements( final Map copyCache, final SharedSessionContractImplementor session) throws HibernateException { final CollectionPersister persister = - session.getFactory().getRuntimeMetamodels().getMappingMetamodel() + session.getFactory().getMappingMetamodel() .getCollectionDescriptor( getRole() ); final Map source = (Map) original; diff --git a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java index 93ee26c4b3a3..052e4920f1b4 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java @@ -7,7 +7,6 @@ import org.hibernate.HibernateException; import org.hibernate.Internal; import org.hibernate.MappingException; -import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.collections.ArrayHelper; @@ -120,14 +119,6 @@ public String toXMLString(Object value, SessionFactoryImplementor factory) throw return (String) value; //value is the entity name } - /** - * @deprecated use {@link #fromXMLString(String, MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - public Object fromXMLString(String xml, Mapping factory) throws HibernateException { - return fromXMLString( xml, (MappingContext) factory ); - } - public Object fromXMLString(String xml, MappingContext mappingContext) throws HibernateException { return xml; //xml is the entity name } diff --git a/hibernate-core/src/main/java/org/hibernate/type/Type.java b/hibernate-core/src/main/java/org/hibernate/type/Type.java index da6aa6f73ec3..3a99266cbd70 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/Type.java +++ b/hibernate-core/src/main/java/org/hibernate/type/Type.java @@ -12,7 +12,6 @@ import org.hibernate.HibernateException; import org.hibernate.Internal; import org.hibernate.MappingException; -import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -91,23 +90,6 @@ public interface Type extends Serializable { */ boolean isComponentType(); - /** - * How many columns are used to persist this type? - *

    - * Always the same as {@link #getSqlTypeCodes(MappingContext) getSqlTypCodes(mapping).length}. - * - * @param mapping The mapping object :/ - * - * @return The number of columns - * - * @throws MappingException Generally indicates an issue accessing the passed mapping object. - * @deprecated use {@link #getColumnSpan(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - default int getColumnSpan(Mapping mapping) throws MappingException{ - return getColumnSpan( (MappingContext) mapping); - } - /** * How many columns are used to persist this type? *

    @@ -121,24 +103,6 @@ default int getColumnSpan(Mapping mapping) throws MappingException{ */ int getColumnSpan(MappingContext mappingContext) throws MappingException; - /** - * Return the JDBC types codes as defined by {@link java.sql.Types} or {@link SqlTypes} - * for the columns mapped by this type. - *

    - * The number of elements in this array must match the return from {@link #getColumnSpan}. - * - * @param mapping The mapping object :/ - * - * @return The JDBC type codes. - * - * @throws MappingException Generally indicates an issue accessing the passed mapping object. - * @deprecated use {@link #getSqlTypeCodes(MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - default int[] getSqlTypeCodes(Mapping mapping) throws MappingException{ - return getSqlTypeCodes((MappingContext) mapping); - } - /** * Return the JDBC types codes as defined by {@link java.sql.Types} or {@link SqlTypes} * for the columns mapped by this type. @@ -534,21 +498,6 @@ String toLoggableString(@Nullable Object value, SessionFactoryImplementor factor Map copyCache, ForeignKeyDirection foreignKeyDirection) throws HibernateException; - /** - * Given an instance of the type, return an array of {@code boolean} values indicating which - * mapped columns would be null. - * - * @param value an instance of the type - * @param mapping The mapping abstraction - * - * @return array indicating column nullness for a value instance - * @deprecated use {@link #toColumnNullness(Object, MappingContext)} - */ - @Deprecated(since = "7.0", forRemoval = true) - default boolean[] toColumnNullness(@Nullable Object value, Mapping mapping){ - return toColumnNullness( value,(MappingContext) mapping); - } - /** * Given an instance of the type, return an array of {@code boolean} values indicating which * mapped columns would be null. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java index 50a05010c7fa..47a84eedfd22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java @@ -51,7 +51,7 @@ public void testMix() { public void testGetAndFindNonEntityThrowsIllegalArgumentException() { try { sessionFactory().getMappingMetamodel().findEntityDescriptor(Cellular.class); - sessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor( Cellular.class ); + sessionFactory().getMappingMetamodel().getEntityDescriptor( Cellular.class ); } catch (UnknownEntityTypeException ignore) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java index cd200fa85c38..443d81112ba7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java @@ -392,7 +392,7 @@ private void verifyEntityPersisterQualifiers(Class entityClass, ExpectedQuali .filter( p -> p.getMappedClass().equals( entityClass ) ) .findFirst() .orElseThrow( () -> new IllegalStateException( "Cannot find persister for " + entityClass ) ); - String jpaEntityName = sessionFactory.getRuntimeMetamodels().getJpaMetamodel().getEntities() + String jpaEntityName = sessionFactory.getJpaMetamodel().getEntities() .stream() .filter( p -> p.getBindableJavaType().equals( entityClass ) ) .findFirst() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java index 956183bea448..185acd8e20d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/contributed/EntityHidingTests.java @@ -7,7 +7,6 @@ import org.hibernate.boot.spi.AdditionalMappingContributor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.RuntimeMetamodels; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.persister.entity.EntityPersister; @@ -42,12 +41,11 @@ public class EntityHidingTests { @NotImplementedYet( reason = "Contributed entity hiding is not yet implemented" ) public void testModel(SessionFactoryScope scope) { final SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); - final RuntimeMetamodels runtimeMetamodels = sessionFactory.getRuntimeMetamodels(); - final EntityDomainType jpaModelDescriptor = runtimeMetamodels.getJpaMetamodel().entity( "DynamicEntity" ); + final EntityDomainType jpaModelDescriptor = sessionFactory.getJpaMetamodel().entity( "DynamicEntity" ); assertThat( jpaModelDescriptor, nullValue() ); - final EntityPersister mappingModelDescriptor = runtimeMetamodels.getMappingMetamodel() + final EntityPersister mappingModelDescriptor = sessionFactory.getMappingMetamodel() .findEntityDescriptor( "DynamicEntity" ); assertThat( mappingModelDescriptor, nullValue() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java index a8b317a2c673..b122809ca035 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java @@ -106,7 +106,7 @@ public void testEntityIdReferences() { interpretSelect( "select s.mate from Person s where s.pk = ?1" ); - final EntityDomainType entity = sessionFactory().getRuntimeMetamodels() + final EntityDomainType entity = sessionFactory() .getJpaMetamodel() .entity( OddOne.class ); final SingularPersistentAttribute idAttribute = entity.findIdAttribute(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java index 80adde93eada..5356a88d0284 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java @@ -49,7 +49,7 @@ public void dropTestData(SessionFactoryScope scope) { public void testBasicSelection(SessionFactoryScope scope) { scope.inTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularPersistentAttribute idAttribute = entityDescriptor.getId( Integer.class ); @@ -69,7 +69,7 @@ public void testBasicSelection(SessionFactoryScope scope) { public void testBasicStatelessSelection(SessionFactoryScope scope) { scope.inStatelessTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularPersistentAttribute idAttribute = entityDescriptor.getId( Integer.class ); @@ -89,7 +89,7 @@ public void testBasicStatelessSelection(SessionFactoryScope scope) { public void testBasicStatelessSelectionMixedPathRefs(SessionFactoryScope scope) { scope.inStatelessTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final Class idType = (Class) entityDescriptor.getIdType().getJavaType(); @@ -107,7 +107,7 @@ public void testBasicStatelessSelectionMixedPathRefs(SessionFactoryScope scope) public void testBasicTupleSelection(SessionFactoryScope scope) { scope.inTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute idAttribute = entityDescriptor.getId( Integer.class ); final SingularAttribute nameAttribute = entityDescriptor.getSingularAttribute( "name", String.class ); @@ -136,7 +136,7 @@ public void testBasicTupleSelection(SessionFactoryScope scope) { public void testCompositeSelection(SessionFactoryScope scope) { scope.inTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute compositeAttribute; compositeAttribute = entityDescriptor.getSingularAttribute( "composite", SimpleComposite.class ); @@ -156,7 +156,7 @@ public void testCompositeSelection(SessionFactoryScope scope) { public void testBasicAndCompositeTuple(SessionFactoryScope scope) { scope.inTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute idAttribute = entityDescriptor.getId( Integer.class ); final SingularAttribute compositeAttribute = entityDescriptor.getSingularAttribute( "composite", SimpleComposite.class ); @@ -186,7 +186,7 @@ public void testBasicAndCompositeTuple(SessionFactoryScope scope) { public void testBasicAndCompositeArray(SessionFactoryScope scope) { scope.inTransaction( (session) -> { final CriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute idAttribute = entityDescriptor.getId( Integer.class ); final SingularAttribute compositeAttribute = entityDescriptor.getSingularAttribute( "composite", SimpleComposite.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java index 5d219149d700..86b18a8f3331 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/param/CompositeParameterTests.java @@ -51,7 +51,7 @@ public void testInPredicateHql(SessionFactoryScope scope) { @Test public void testSimplePredicateCriteria(SessionFactoryScope scope) { final HibernateCriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute attribute = entityDescriptor.getSingularAttribute( "composite", SimpleComposite.class ); @@ -75,7 +75,7 @@ public void testSimplePredicateCriteria(SessionFactoryScope scope) { @Test public void testInPredicateCriteria(SessionFactoryScope scope) { final HibernateCriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute attribute = entityDescriptor.getSingularAttribute( "composite", SimpleComposite.class ); @@ -99,7 +99,7 @@ public void testInPredicateCriteria(SessionFactoryScope scope) { @Test public void testDeTypedInPredicateCriteria(SessionFactoryScope scope) { final HibernateCriteriaBuilder builder = scope.getSessionFactory().getCriteriaBuilder(); - final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getRuntimeMetamodels().getJpaMetamodel(); + final JpaMetamodel jpaMetamodel = scope.getSessionFactory().getJpaMetamodel(); final EntityDomainType entityDescriptor = jpaMetamodel.entity( SimpleEntity.class ); final SingularAttribute attribute = entityDescriptor.getSingularAttribute( "composite" ); diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java index bc22f7626241..0d97cecfe723 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeographyMappingTest.java @@ -8,7 +8,6 @@ import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.SqlTypes; -import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.testing.orm.junit.DomainModel; @@ -37,17 +36,12 @@ public class GeographyMappingTest { @Test public void testSimpleEntity(SessionFactoryScope scope) { final EntityPersister entityDescriptor = scope.getSessionFactory() - .getRuntimeMetamodels() .getMappingMetamodel() .getEntityDescriptor( PointEntity.class ); final JdbcTypeRegistry jdbcTypeRegistry = entityDescriptor.getFactory() .getTypeConfiguration() .getJdbcTypeRegistry(); - final JavaTypeRegistry javaTypeRegistry = entityDescriptor.getFactory() - .getTypeConfiguration() - .getJavaTypeRegistry(); - BasicValuedModelPart part = (BasicValuedModelPart) entityDescriptor.findSubPart( "location" ); assertThat( part.getJdbcMapping().getJdbcType(), equalTo( jdbcTypeRegistry.getDescriptor( SqlTypes.GEOGRAPHY ) ) ); scope.inTransaction( diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java index 31da3c05589e..9016c78e318d 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/mapping/GeometryMappingTest.java @@ -7,8 +7,6 @@ import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spatial.GeolatteGeometryJavaType; -import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry; -import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -33,16 +31,8 @@ public class GeometryMappingTest { @Test public void testSimpleEntity(SessionFactoryScope scope) { final EntityPersister entityDescriptor = scope.getSessionFactory() - .getRuntimeMetamodels() .getMappingMetamodel() .getEntityDescriptor( MLEntity.class ); - final JdbcTypeRegistry jdbcTypeRegistry = entityDescriptor.getFactory() - .getTypeConfiguration() - .getJdbcTypeRegistry(); - - final JavaTypeRegistry javaTypeRegistry = entityDescriptor.getFactory() - .getTypeConfiguration() - .getJavaTypeRegistry(); ModelPart part = entityDescriptor.findSubPart( "lineString" ); assertThat( part.getJavaType(), equalTo( GeolatteGeometryJavaType.MULTILINESTRING_INSTANCE ) );