Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1827 - Polishing.

Browse Source 
Use ClassUtils.isAssignable(…) to simplify boxed/primitive assignability checks.

Original pull request: #438.
This commit is contained in:
Mark Paluch
2020-12-08 14:18:44 +01:00
committed by Jens Schauder
parent f21e91c5e8
commit c6443850cb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java
View File

@@ -97,7 +97,7 @@ public abstract class JpaQueryExecution {
JpaQueryMethod queryMethod = query.getQueryMethod();
Class<?> requiredType = queryMethod.getReturnType();
if (void.class.equals(requiredType) || requiredType.isAssignableFrom(result.getClass())) {
if (ClassUtils.isAssignable(requiredType, void.class) || ClassUtils.isAssignableValue(requiredType, result)) {
return result;
}
@@ -218,10 +218,11 @@ public abstract class JpaQueryExecution {
Class<?> returnType = method.getReturnType();
boolean isVoid = void.class.equals(returnType) || Void.class.equals(returnType);
boolean isInt = int.class.equals(returnType) || Integer.class.equals(returnType);
boolean isVoid = ClassUtils.isAssignable(returnType, Void.class);
boolean isInt = ClassUtils.isAssignable(returnType, Integer.class);
Assert.isTrue(isInt || isVoid, "Modifying queries can only use void or int/Integer as return type!");
Assert.isTrue(isInt || isVoid,
"Modifying queries can only use void or int/Integer as return type! Offending method: " + method);
this.em = em;
this.flush = method.getFlushAutomatically();