This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ff4a635fea15 CAMEL-27239: camel-jpa - make lockSkipLocked work with
Jakarta Persistence 4.0 (#30420)
ff4a635fea15 is described below
commit ff4a635fea15eee7462393ae6f292b74f88f000a
Author: Jiří Ondrušek <[email protected]>
AuthorDate: Thu Nov 19 16:36:06 2026 +0100
CAMEL-27239: camel-jpa - make lockSkipLocked work with Jakarta Persistence
4.0 (#30420)
Call EntityManager.createQuery(CriteriaSelect) instead of
createQuery(CriteriaQuery), which Jakarta Persistence 4.0 removed.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../src/main/java/org/apache/camel/component/jpa/JpaConsumer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
index dfc91da668d9..c8828ce89243 100644
---
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
+++
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
@@ -36,6 +36,7 @@ import jakarta.persistence.PessimisticLockException;
import jakarta.persistence.Query;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaSelect;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.metamodel.EntityType;
@@ -503,7 +504,8 @@ public class JpaConsumer extends
ScheduledBatchPollingConsumer {
CriteriaQuery<T> query = builder.createQuery(type.getJavaType());
Root<T> root = query.from(type);
query.select(root).where(builder.equal(root, entity));
- return entityManager.createQuery(query)
+ // the CriteriaSelect overload exists in Jakarta Persistence 3.2 and
4.0, the CriteriaQuery one only in 3.2
+ return entityManager.createQuery((CriteriaSelect<T>) query)
.setLockMode(rowLock)
.setHint(LOCK_TIMEOUT, SKIP_LOCKED)
// a lock has no side effect: do not flush the changes of the
entities routed before