From ee2d8a37654621182278eda128dec7cfed96e119 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Mon, 30 Sep 2024 13:27:10 -0500 Subject: [PATCH] HHH-18663 - Upgrade to hibernate-models 0.9.1 --- .../internal/ClassLoaderServiceLoading.java | 11 +++++++++++ .../function/array/OracleArrayIncludesFunction.java | 2 +- settings.gradle | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java index e57578c8f7..ca3fbd07dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java @@ -8,6 +8,7 @@ import java.net.URL; 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 class ClassLoaderServiceLoading implements ClassLoading { return classLoaderService.classForName( name ); } + @Override + public Class findClassForName(String name) { + try { + return classLoaderService.classForName( name ); + } + catch (ClassLoadingException e) { + return null; + } + } + @Override public Package packageForName(String name) { return classLoaderService.packageForNameOrNull( name ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java index dc658a66dd..44b76b1323 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java @@ -47,6 +47,6 @@ public class OracleArrayIncludesFunction extends AbstractArrayIncludesFunction { haystackExpression.accept( walker ); sqlAppender.append( ")))" ); } - + } } diff --git a/settings.gradle b/settings.gradle index 81e457611c..8bd262ab6a 100644 --- a/settings.gradle +++ b/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"