diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java index 35bc794f5ec0..72b504e5f816 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java @@ -8,7 +8,6 @@ import jakarta.persistence.metamodel.Bindable; -import org.hibernate.metamodel.model.domain.JpaMetamodel; import org.hibernate.metamodel.model.domain.PathSource; import org.hibernate.query.sqm.tree.domain.SqmDomainType; import org.hibernate.query.sqm.tree.SqmExpressibleAccessor; @@ -35,16 +34,6 @@ public interface SqmPathSource @Override SqmDomainType getPathType(); - /** - * The type of {@linkplain SqmPath path} this source creates. - * - * @deprecated Use {@link #getPathType()}. - */ - @Deprecated(since = "7.0", forRemoval = true) - default SqmDomainType getSqmPathType() { - return getPathType(); - } - /** * Find a {@link SqmPathSource} by name relative to this source. * @@ -54,18 +43,6 @@ default SqmDomainType getSqmPathType() { */ SqmPathSource findSubPathSource(String name); - /** - * Find a {@link SqmPathSource} by name relative to this source. - * - * @return null if the subPathSource is not found - * @throws IllegalStateException to indicate that this source cannot be de-referenced - * @deprecated Use {@link #findSubPathSource(String, boolean)} instead - */ - @Deprecated(forRemoval = true, since = "7.0") - default SqmPathSource findSubPathSource(String name, JpaMetamodel metamodel) { - return findSubPathSource( name, true ); - } - /** * Find a {@link SqmPathSource} by name relative to this source. If {@code includeSubtypes} is set * to {@code true} and this path source is polymorphic, also try finding subtype attributes. @@ -101,29 +78,6 @@ default SqmPathSource getSubPathSource(String name) { return subPathSource; } - /** - * Find a {@link SqmPathSource} by name relative to this source and all its subtypes. - * - * @throws IllegalStateException to indicate that this source cannot be de-referenced - * @throws IllegalArgumentException if the subPathSource is not found - * @deprecated Use #{@link #getSubPathSource(String, boolean)} instead - */ - @Deprecated(forRemoval = true, since = "7.0") - default SqmPathSource getSubPathSource(String name, JpaMetamodel metamodel) { - final SqmPathSource subPathSource = findSubPathSource( name, true ); - if ( subPathSource == null ) { - throw new PathElementException( - String.format( - Locale.ROOT, - "Could not resolve attribute '%s' of '%s'", - name, - getExpressible().getTypeName() - ) - ); - } - return subPathSource; - } - /** * Find a {@link SqmPathSource} by name relative to this source. If {@code subtypes} is set * to {@code true} and this path source is polymorphic, also try finding subtype attributes. @@ -134,7 +88,7 @@ default SqmPathSource getSubPathSource(String name, JpaMetamodel metamodel) { * @throws IllegalArgumentException if the subPathSource is not found */ default SqmPathSource getSubPathSource(String name, boolean subtypes) { - final SqmPathSource subPathSource = findSubPathSource( name, true ); + final SqmPathSource subPathSource = findSubPathSource( name, subtypes ); if ( subPathSource == null ) { throw new PathElementException( String.format(