Fix method return for delete execution returning primitive numbers.

We now properly check for assignability of numeric values considering primitive types.

Closes #4015

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaCodeBlocks.java

@@ -706,7 +706,8 @@ public CodeBlock build() {
 					builder.addStatement("return ($T) $L", List.class, context.localVariable("resultList"));
 
 				} else if (returnCount) {
-					builder.addStatement("return $T.valueOf($L.size())", methodReturn.getActualClassName(),
+					builder.addStatement("return $T.valueOf($L.size())",
+							ClassUtils.resolvePrimitiveIfNecessary(methodReturn.getActualReturnClass()),
 								context.localVariable("resultList"));
 					} else {
 

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

@@ -405,9 +405,10 @@ public DeleteExecution(EntityManager em) {
 
 			Query query = jpaQuery.createQuery(accessor);
 			List<?> resultList = query.getResultList();
+			Class<?> returnType = jpaQuery.getQueryMethod().getReturnType();
 
-			boolean simpleBatch = Number.class.isAssignableFrom(jpaQuery.getQueryMethod().getReturnType())
-					|| org.springframework.data.util.ReflectionUtils.isVoid(jpaQuery.getQueryMethod().getReturnType());
+			boolean simpleBatch = ClassUtils.isAssignable(Number.class, returnType)
+					|| org.springframework.data.util.ReflectionUtils.isVoid(returnType);
 			boolean collectionQuery = jpaQuery.getQueryMethod().isCollectionQuery();
 
 			if (!simpleBatch && !collectionQuery) {

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

@@ -1623,12 +1623,21 @@ void deleteByShouldRemoveElementsMatchingDerivedQuery() {
 		assertThat(repository.countByLastname(firstUser.getLastname())).isZero();
 	}
 
-	@Test // DATAJPA-460
+	@Test // DATAJPA-460, GH-4015
 	void deleteByShouldReturnNumberOfEntitiesRemovedIfReturnTypeIsLong() {
 
 		flushTestUsers();
 
 		assertThat(repository.removeByLastname(firstUser.getLastname())).isOne();
+		assertThat(repository.removeOneByLastname(secondUser.getLastname())).isOne();
+	}
+
+	@Test // GH-4015
+	void deleteByShouldReturnNumberOfEntitiesRemovedIfReturnTypeIsInt() {
+
+		flushTestUsers();
+
+		assertThat(repository.removeOneMoreByLastname(secondUser.getLastname())).isOne();
 	}
 
 	@Test // DATAJPA-460

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

@@ -299,6 +299,10 @@ Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(S
 	// DATAJPA-460
 	Long removeByLastname(String lastname);
 
+	long removeOneByLastname(String lastname);
+
+	int removeOneMoreByLastname(String lastname);
+
 	// DATAJPA-460
 	List<User> deleteByLastname(String lastname);