Merge branch 'main' into bugfix/HHH-18675

Author: leonschenk

hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java

@@ -8,6 +8,7 @@
 import java.util.Collection;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.models.spi.ClassLoading;
 
 /**
@@ -27,6 +28,16 @@ public <T> Class<T> classForName(String name) {
 		return classLoaderService.classForName( name );
 	}
 
+	@Override
+	public <T> Class<T> findClassForName(String name) {
+		try {
+			return classLoaderService.classForName( name );
+		}
+		catch (ClassLoadingException e) {
+			return null;
+		}
+	}
+
 	@Override
 	public Package packageForName(String name) {
 		return classLoaderService.packageForNameOrNull( name );

hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java

@@ -47,6 +47,6 @@ public void render(
 			haystackExpression.accept( walker );
 			sqlAppender.append( ")))" );
 		}
-		
+
 	}
 }

hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java

@@ -12,8 +12,6 @@
 
 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
  * and each the path sub-path from the root references a domain or mapping model part
@@ -76,20 +74,6 @@ public NavigablePath(NavigablePath parent, String localName, @Nullable String al
 		}
 	}
 
-	/**
-	 * @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(
 			@Nullable NavigablePath parent,
 			String localName,
@@ -145,8 +129,7 @@ public boolean equals(@Nullable Object other) {
 			return false;
 		}
 
-		if ( otherPath instanceof NavigablePath ) {
-			final NavigablePath otherNavigablePath = (NavigablePath) otherPath;
+		if ( otherPath instanceof NavigablePath otherNavigablePath ) {
 			if ( ! Objects.equals( getAlias(), otherNavigablePath.getAlias() ) ) {
 				return false;
 			}
@@ -329,50 +312,4 @@ public String getFullPath() {
 	public String toString() {
 		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() : "";
-	}
 }

hibernate-core/src/main/java/org/hibernate/spi/TreatedNavigablePath.java

@@ -33,16 +33,6 @@ public TreatedNavigablePath(NavigablePath parent, String entityTypeName, @Nullab
 		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
 	public NavigablePath treatAs(String entityName) {
 		return new TreatedNavigablePath( castNonNull( getRealParent() ), entityName );

settings.gradle

@@ -76,7 +76,7 @@ dependencyResolutionManagement {
             def byteBuddyVersion = version "byteBuddy", "1.14.18"
             def classmateVersion = version "classmate", "1.5.1"
             def geolatteVersion = version "geolatte", "1.9.1"
-            def hibernateModelsVersion = version "hibernateModels", "0.9.0"
+            def hibernateModelsVersion = version "hibernateModels", "0.9.1"
             def jandexVersion = version "jandex", "3.2.0"
             def jacksonVersion = version "jackson", "2.17.0"
             def jbossLoggingVersion = version "jbossLogging", "3.6.0.Final"