Use getResultList() and remove(…) flow for derived AOT query methods.

We now correctly obtain a list of entities to be deleted and remove those through EntityManager.remove(…). Previously, we've erroneously used executeUpdate(…) that is intended for string-based queries only.

Closes #4102

Author: mp911de

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

@@ -656,7 +656,7 @@ public CodeBlock build() {
 					: TypeName.get(context.getDomainType());
 			builder.add("\n");
 
-			if (modifying.isPresent()) {
+			if (modifying.isPresent() && !(aotQuery instanceof StringAotQuery.DerivedAotQuery)) {
 
 				if (modifying.getBoolean("flushAutomatically")) {
 					builder.addStatement("this.$L.flush()", context.fieldNameOf(EntityManager.class));

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

@@ -207,7 +207,7 @@ private Optional<Class<QueryEnhancerSelector>> getQueryEnhancerSelectorClass() {
 					.metadataOnly(aotQueries.toMetadata(queryMethod.isPageQuery()));
 		}
 
-		if (queryMethod.isModifyingQuery()) {
+		if (queryMethod.isModifyingQuery() && !(aotQueries.result() instanceof StringAotQuery.DerivedAotQuery)) {
 
 			TypeInformation<?> returnType = getRepositoryInformation().getReturnType(method);
 

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

@@ -173,7 +173,7 @@ public String getQueryName() {
 	 *
 	 * @author Mark Paluch
 	 */
-	private static class DerivedAotQuery extends StringAotQuery {
+	static class DerivedAotQuery extends StringAotQuery {
 
 		private final String queryString;
 		private final Limit limit;

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

@@ -1621,6 +1621,15 @@ void deleteOneShouldFailWhenMatchingMultipleResults() {
 				.isThrownBy(() -> repository.deleteOneByLastname(firstUser.getLastname()));
 	}
 
+	@Test // GH-4102
+	void deleteOneModifying() {
+
+		flushTestUsers();
+
+		User user = repository.deleteModifyingByLastname(firstUser.getLastname());
+		assertThat(user).isEqualTo(firstUser);
+	}
+
 	@Test // DATAJPA-460
 	void deleteByShouldRemoveElementsMatchingDerivedQuery() {
 

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

@@ -558,6 +558,31 @@ void testDerivedDeleteSingle() {
 		assertThat(yodaShouldBeGone).isNull();
 	}
 
+	@Test // GH-4102
+	void testDerivedDeleteSingleWithModifying() {
+
+		User user = fragment.deleteByEmailAddressAndIdIsNotNull("yoda@jedi.org");
+		assertThat(user).isNotNull().extracting(User::getEmailAddress).isEqualTo("yoda@jedi.org");
+
+		Object yodaShouldBeGone = em
+				.createQuery("SELECT u FROM %s u WHERE u.emailAddress = 'yoda@jedi.org'".formatted(User.class.getName()))
+				.getSingleResultOrNull();
+		assertThat(yodaShouldBeGone).isNull();
+	}
+
+	@Test // GH-4102
+	void testDerivedDeleteAndReturnCount() {
+
+		int count = fragment.deleteAndReturnCountByEmailAddress("yoda@jedi.org");
+
+		assertThat(count).isEqualTo(1);
+
+		Object yodaShouldBeGone = em
+				.createQuery("SELECT u FROM %s u WHERE u.emailAddress = 'yoda@jedi.org'".formatted(User.class.getName()))
+				.getSingleResultOrNull();
+		assertThat(yodaShouldBeGone).isNull();
+	}
+
 	@Test // GH-3830
 	void shouldReturnStreamableDelete() {
 

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

@@ -205,6 +205,11 @@ List<User> findWithParameterNameByLastnameStartingWithOrLastnameEndingWith(@Para
 
 	User deleteByEmailAddress(String username);
 
+	@Modifying
+	User deleteByEmailAddressAndIdIsNotNull(String email);
+
+	int deleteAndReturnCountByEmailAddress(String username);
+
 	Streamable<User> deleteStreamableByEmailAddress(String username);
 
 	// cannot generate delete and return a domain object

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

@@ -307,6 +307,9 @@ Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(S
 	// DATAJPA-460
 	List<User> deleteByLastname(String lastname);
 
+	@Modifying
+	User deleteModifyingByLastname(String lastname);
+
 	User deleteOneByLastname(String lastname);
 
 	Optional<User> deleteOneOptionalByLastname(String lastname);