diff --git a/hibernate-core/src/main/java/org/hibernate/Metamodel.java b/hibernate-core/src/main/java/org/hibernate/Metamodel.java index 3c667f4b4a..f961aa0b70 100644 --- a/hibernate-core/src/main/java/org/hibernate/Metamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/Metamodel.java @@ -6,8 +6,6 @@ */ package org.hibernate; -import jakarta.persistence.metamodel.EntityType; - import org.hibernate.metamodel.model.domain.JpaMetamodel; /** @@ -26,16 +24,6 @@ public interface Metamodel extends JpaMetamodel { */ SessionFactory getSessionFactory(); - /** - * @deprecated since 5.2 - */ - @Deprecated - default EntityType getEntityTypeByName(String entityName) { - return entity( entityName ); - } - - String getImportedClassName(String className); - /** * Given the name of an entity class, determine all the class and interface names by which it can be * referenced in an HQL query. 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 125f3031fa..124d8b1e1c 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 @@ -14,7 +14,6 @@ import javax.naming.NamingException; import javax.naming.Reference; import org.hibernate.CustomEntityDirtinessStrategy; -import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.Session; @@ -26,12 +25,9 @@ import org.hibernate.boot.model.relational.SqlStringGenerationContext; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.cache.spi.CacheImplementor; import org.hibernate.context.spi.CurrentTenantIdentifierResolver; -import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.profile.FetchProfile; import org.hibernate.event.spi.EventEngine; -import org.hibernate.exception.spi.SQLExceptionConverter; import org.hibernate.graph.spi.RootGraphImplementor; import org.hibernate.id.IdentifierGenerator; import org.hibernate.internal.FastSessionServices; @@ -236,11 +232,6 @@ public class SessionFactoryDelegatingImpl implements SessionFactoryImplementor, return delegate.getMetamodel().getImplementors(className); } - @Deprecated - public String getImportedClassName(String name) { - return delegate.getMetamodel().getImportedClassName(name); - } - @Override public RootGraphImplementor findEntityGraphByName(String name) { return delegate.findEntityGraphByName( name ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java index f3ab5bb17d..8feb07f441 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -511,11 +511,6 @@ public class MappingMetamodelImpl implements MappingMetamodel, MetamodelImplemen return jpaMetamodel.getAllowedEnumLiteralTexts(); } - @Override - public String getImportedClassName(String className) { - throw new UnsupportedOperationException( ); - } - @Override public String[] getImplementors(String className) throws MappingException { // computeIfAbsent() can be a contention point and we expect all the values to be in the map at some point so