Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove some deprecated methods

This commit is contained in:
Gavin King 2024-10-01 05:45:04 +02:00
parent c66b27d193
commit df735cdebd
2 changed files with 1 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java
View File

@ -12,8 +12,6 @@ import org.hibernate.internal.util.StringHelper;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import static org.hibernate.internal.util.NullnessUtil.castNonNull;
/** /**
* A compound name where the root path element is an entity name or a collection role * A compound name where the root path element is an entity name or a collection role
* and each the path sub-path from the root references a domain or mapping model part * and each the path sub-path from the root references a domain or mapping model part
@ -76,20 +74,6 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
} }
} }
/**
* @deprecated Since {@link FullPathCalculator} is no longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
public NavigablePath(
@Nullable NavigablePath parent,
String localName,
@Nullable String alias,
String identifierForTableGroup,
FullPathCalculator fullPathCalculator,
int hashCode) {
this( parent, localName, alias, identifierForTableGroup, hashCode );
}
public NavigablePath( public NavigablePath(
@Nullable NavigablePath parent, @Nullable NavigablePath parent,
String localName, String localName,
@ -145,8 +129,7 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
return false; return false;
} }
if ( otherPath instanceof NavigablePath ) { if ( otherPath instanceof NavigablePath otherNavigablePath ) {
final NavigablePath otherNavigablePath = (NavigablePath) otherPath;
if ( ! Objects.equals( getAlias(), otherNavigablePath.getAlias() ) ) { if ( ! Objects.equals( getAlias(), otherNavigablePath.getAlias() ) ) {
return false; return false;
} }
@ -329,50 +312,4 @@ public class NavigablePath implements DotIdentifierSequence, Serializable {
public String toString() { public String toString() {
return getFullPath(); return getFullPath();
} }
/**
* Effectively a tri-function
*
* @deprecated No longer used
*/
@FunctionalInterface
@Deprecated( since = "6.6", forRemoval = true )
protected interface FullPathCalculator extends Serializable {
String calculateFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias);
}
/**
* The pattern used for root NavigablePaths
*
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
protected static String calculateRootFullPath(@Nullable NavigablePath parent, String rootName, @Nullable String alias) {
assert parent == null;
return alias == null ? rootName : rootName + "(" + alias + ")";
}
/**
* The normal pattern used for the "full path"
*
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
private static String calculateNormalFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias) {
final String parentFullPath = castNonNull( parent ).getFullPath();
final String baseFullPath = StringHelper.isEmpty( parentFullPath )
? localName
: parentFullPath + "." + localName;
return alias == null ? baseFullPath : baseFullPath + "(" + alias + ")";
}
/**
* Pattern used for `_identifierMapper`
*
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
protected static String calculateIdMapperFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias) {
return parent != null ? parent.getFullPath() : "";
}
} }

10
hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java
View File

@ -33,16 +33,6 @@ public class TreatedNavigablePath extends NavigablePath {
assert !( parent instanceof TreatedNavigablePath ); assert !( parent instanceof TreatedNavigablePath );
} }
/**
* @deprecated No longer used
*/
@Deprecated( since = "6.6", forRemoval = true )
protected static String calculateTreatedFullPath(@Nullable NavigablePath parent, String localName, @Nullable String alias) {
return alias == null
? "treat(" + parent + " as " + localName + ")"
: "treat(" + parent + " as " + localName + ")(" + alias + ")";
}
@Override @Override
public NavigablePath treatAs(String entityName) { public NavigablePath treatAs(String entityName) {
return new TreatedNavigablePath( castNonNull( getRealParent() ), entityName ); return new TreatedNavigablePath( castNonNull( getRealParent() ), entityName );