Merge pull request #42376 from famod/fix-spring-flushAutomatically

Fix spring-data-jpa `@Modifying(flushAutomatically = true)`
quarkusio · Aug 7, 2024 · a34e10f · a34e10f
2 parents 5b7ef46 + 296b43e
commit a34e10f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.../src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java b/.../src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java
@@ -33,6 +33,7 @@ public class ModifyingQueryWithFlushAndClearTest {
     public void setUp() {
         final User user = getUser("JOHN");
         user.setLoginCounter(0);
+        user.getLoginEvents().clear();
         repo.save(user);
     }
 
@@ -69,8 +70,9 @@ public void testNoAutoFlush() {
 
         final User verifyUser = getUser("JOHN");
         // processLoginEvents did not see the new login event
+        assertThat(verifyUser.getLoginEvents()).hasSize(1);
         final boolean allProcessed = verifyUser.getLoginEvents().stream()
-                .allMatch(loginEvent -> loginEvent.isProcessed());
+                .allMatch(LoginEvent::isProcessed);
         assertThat(allProcessed).describedAs("all LoginEvents are marked as processed").isFalse();
     }
 
@@ -83,8 +85,9 @@ public void testAutoFlush() {
         repo.processLoginEventsPlainAutoClearAndFlush();
 
         final User verifyUser = getUser("JOHN");
+        assertThat(verifyUser.getLoginEvents()).hasSize(1);
         final boolean allProcessed = verifyUser.getLoginEvents().stream()
-                .allMatch(loginEvent -> loginEvent.isProcessed());
+                .allMatch(LoginEvent::isProcessed);
         assertThat(allProcessed).describedAs("all LoginEvents are marked as processed").isTrue();
     }
 

diff --git a/...ring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java b/...ring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java
@@ -78,6 +78,6 @@ public static void clear(Class<?> clazz) {
     }
 
     public static void flush(Class<?> clazz) {
-        Panache.getSession(clazz).clear();
+        Panache.getSession(clazz).flush();
     }
 }