Polishing.

Align assignability check for modifying execution.

See #4015

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryExecution.java

@@ -352,12 +352,11 @@ public ModifyingExecution(JpaQueryMethod method, EntityManager em) {
 
 			Class<?> returnType = method.getReturnType();
 
-			boolean isVoid = ClassUtils.isAssignable(returnType, Void.class);
-			boolean isInt = ClassUtils.isAssignable(returnType, Integer.class);
-			boolean isLong = ClassUtils.isAssignable(returnType, Long.class);
+			boolean isVoid = org.springframework.data.util.ReflectionUtils.isVoid(returnType);
+			boolean isNumber = ClassUtils.isAssignable(Number.class, returnType);
 
-			Assert.isTrue(isInt || isLong || isVoid,
-					"Modifying queries can only use void or int/Integer as return type; Offending method: " + method);
+			Assert.isTrue(isNumber || isVoid,
+					"Modifying queries can only use void, int/Integer, or long/Long as return type; Offending method: " + method);
 
 			this.em = em;
 			this.flush = method.getFlushAutomatically();
@@ -377,10 +376,6 @@ protected Object doExecute(AbstractJpaQuery query, JpaParametersParameterAccesso
 				em.clear();
 			}
 
-			if (ClassUtils.isAssignable(method.getReturnType(), Long.class)) {
-				return (long) result;
-			}
-
 			return result;
 		}
 	}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java

@@ -24,7 +24,6 @@
 import jakarta.persistence.TypedQuery;
 
 import java.lang.reflect.Method;
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Optional;
@@ -171,7 +170,7 @@ void allowsMethodReturnTypesForModifyingQuery() {
 	@Test
 	void modifyingExecutionRejectsNonIntegerOrVoidReturnType() {
 
-		when(method.getReturnType()).thenReturn((Class) BigDecimal.class);
+		when(method.getReturnType()).thenReturn((Class) String.class);
 		assertThatIllegalArgumentException().isThrownBy(() -> new ModifyingExecution(method, em));
 	}