From 9ef2b5d90846f1ba0b18898970b9bcc0b2f131d9 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 26 Nov 2023 12:09:06 +0100 Subject: [PATCH] Include scroll() in SharedEntityManagerCreator's queryTerminatingMethods This commit supports the scroll() and scroll(ScrollMode) methods from Hibernate's Query API in SharedEntityManagerCreator's query-terminating methods set. See gh-31682 Closes gh-31684 --- .../springframework/orm/jpa/SharedEntityManagerCreator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java index 42d0288fdf..0f20c85315 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java @@ -77,7 +77,7 @@ public abstract class SharedEntityManagerCreator { private static final Set transactionRequiringMethods = new HashSet<>(6); - private static final Set queryTerminatingMethods = new HashSet<>(9); + private static final Set queryTerminatingMethods = new HashSet<>(10); static { transactionRequiringMethods.add("joinTransaction"); @@ -93,6 +93,7 @@ public abstract class SharedEntityManagerCreator { queryTerminatingMethods.add("getResultStream"); // javax.persistence.Query.getResultStream() queryTerminatingMethods.add("getResultList"); // javax.persistence.Query.getResultList() queryTerminatingMethods.add("list"); // org.hibernate.query.Query.list() + queryTerminatingMethods.add("scroll"); // org.hibernate.query.Query.scroll() queryTerminatingMethods.add("stream"); // org.hibernate.query.Query.stream() queryTerminatingMethods.add("uniqueResult"); // org.hibernate.query.Query.uniqueResult() queryTerminatingMethods.add("uniqueResultOptional"); // org.hibernate.query.Query.uniqueResultOptional()