Merge branch '6.0.x'

sdeleuze · sdeleuze · commit 5641d87ce840 · 2023-08-16T16:06:55.000+02:00
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerRuntimeHints.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerRuntimeHints.java
@@ -37,6 +37,8 @@ class EntityManagerRuntimeHints implements RuntimeHintsRegistrar {
 
 	private static final String ENTITY_MANAGER_FACTORY_CLASS_NAME = "jakarta.persistence.EntityManagerFactory";
 
+	private static final String QUERY_SQM_IMPL_CLASS_NAME = "org.hibernate.query.sqm.internal.QuerySqmImpl";
+
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 		if (ClassUtils.isPresent(HIBERNATE_SESSION_FACTORY_CLASS_NAME, classLoader)) {
@@ -53,5 +55,11 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 						Collections.emptyList(), ExecutableMode.INVOKE);
 			});
 		}
+		try {
+			Class<?> clazz = ClassUtils.forName(QUERY_SQM_IMPL_CLASS_NAME, classLoader);
+			hints.proxies().registerJdkProxy(ClassUtils.getAllInterfacesForClass(clazz, classLoader));
+		}
+		catch (ClassNotFoundException ignored) {
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ class EntityManagerRuntimeHints implements RuntimeHintsRegistrar {`
`37`	`37`
`38`	`38`	`private static final String ENTITY_MANAGER_FACTORY_CLASS_NAME = "jakarta.persistence.EntityManagerFactory";`
`39`	`39`
	`40`	`+ private static final String QUERY_SQM_IMPL_CLASS_NAME = "org.hibernate.query.sqm.internal.QuerySqmImpl";`
	`41`	`+`
`40`	`42`	`@Override`
`41`	`43`	`public void registerHints(RuntimeHints hints, ClassLoader classLoader) {`
`42`	`44`	`if (ClassUtils.isPresent(HIBERNATE_SESSION_FACTORY_CLASS_NAME, classLoader)) {`
`@@ -53,5 +55,11 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {`
`53`	`55`	`Collections.emptyList(), ExecutableMode.INVOKE);`
`54`	`56`	`});`
`55`	`57`	`}`
	`58`	`+ try {`
	`59`	`+ Class<?> clazz = ClassUtils.forName(QUERY_SQM_IMPL_CLASS_NAME, classLoader);`
	`60`	`+ hints.proxies().registerJdkProxy(ClassUtils.getAllInterfacesForClass(clazz, classLoader));`
	`61`	`+ }`
	`62`	`+ catch (ClassNotFoundException ignored) {`
	`63`	`+ }`
`56`	`64`	`}`
`57`	`65`	`}`