spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Adapt query proxy if necessary (for compatibility with Hibernate 8.0)

Browse Source 
Closes gh-36878
This commit is contained in:
Juergen Hoeller
2026-06-09 22:40:22 +02:00
parent 298e1db625
commit 0b5a9ea30a
1 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+34 -6
View File
@@ -239,10 +239,19 @@ public abstract class SharedEntityManagerCreator {
Object result = method.invoke(target, args);
if (result instanceof Query query) {
if (newTarget) {
InvocationHandler ih = new DeferredQueryInvocationHandler(query, target);
Class<?>[] ifcs = cachedQueryInterfaces.computeIfAbsent(query.getClass(), key ->
ClassUtils.getAllInterfacesForClass(key, this.proxyClassLoader));
result = Proxy.newProxyInstance(this.proxyClassLoader, ifcs,
new DeferredQueryInvocationHandler(query, target));
try {
result = Proxy.newProxyInstance(this.proxyClassLoader, ifcs, ih);
}
catch (IllegalArgumentException ex) {
// Hibernate 8.0 NativeMutationOrSelectionQueryImpl multi-interface mismatch?
// Fall back to single declared interface from method signature.
Class<?>[] singleIfc = new Class<?>[] {method.getReturnType()};
cachedQueryInterfaces.put(query.getClass(), singleIfc);
result = Proxy.newProxyInstance(this.proxyClassLoader, singleIfc, ih);
}
close = false;
}
else {
@@ -503,7 +512,7 @@ public abstract class SharedEntityManagerCreator {
private @Nullable Map<@Nullable Object, @Nullable Object> outputParameters;
public DeferredQueryInvocationHandler(Query target, Object entityHandler) {
public DeferredQueryInvocationHandler(Query target, @Nullable Object entityHandler) {
this.target = target;
this.entityHandler = entityHandler;
}
@@ -531,7 +540,11 @@ public abstract class SharedEntityManagerCreator {
return proxy;
}
else {
return this.target.unwrap(targetClass);
Object retVal = this.target.unwrap(targetClass);
if (retVal instanceof Query query && targetClass.isInterface()) {
retVal = adaptQueryProxy(proxy, query, targetClass);
}
return retVal;
}
}
case "getOutputParameterValue" -> {
@@ -552,14 +565,21 @@ public abstract class SharedEntityManagerCreator {
// Invoke method on actual Query object.
try {
Object retVal = method.invoke(this.target, args);
if (method.getName().equals("registerStoredProcedureParameter") && args.length == 3 &&
Class<?> returnType = method.getReturnType();
if (retVal == this.target && returnType.isInstance(proxy)) {
retVal = proxy;
}
else if (retVal instanceof Query query) {
retVal = adaptQueryProxy(proxy, query, returnType);
}
else if (method.getName().equals("registerStoredProcedureParameter") && args.length == 3 &&
(args[2] == ParameterMode.OUT || args[2] == ParameterMode.INOUT)) {
if (this.outputParameters == null) {
this.outputParameters = new LinkedHashMap<>();
}
this.outputParameters.put(args[0], null);
}
return (retVal == this.target ? proxy : retVal);
return retVal;
}
catch (InvocationTargetException ex) {
throw ex.getTargetException();
@@ -589,6 +609,14 @@ public abstract class SharedEntityManagerCreator {
}
}
}
private Object adaptQueryProxy(Object proxy, Query query, Class<?> expectedType) {
InvocationHandler ih = this;
if (query != this.target) {
ih = new DeferredQueryInvocationHandler(query, this.entityHandler);
}
return Proxy.newProxyInstance(proxy.getClass().getClassLoader(), new Class<?>[] {expectedType}, ih);
}
}
}