This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v4 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit dff1429377867fe5b10e4e0eeeee7c79d01e395b Merge: a4266e60024 0e72eb982b9 Author: Andi Huber <[email protected]> AuthorDate: Wed Jun 18 06:36:03 2025 +0200 Merge remote-tracking branch 'origin/main' into v4 .../integration/deadlock/DeadlockRecognizerDefault.java | 6 +++--- .../interact/WrapperInteraction_1_IntegTest.java | 5 ++--- .../interact/WrapperInteraction_2_IntegTest.java | 5 ++--- .../interact/WrapperInteraction_3_IntegTest.java | 9 ++++----- .../interact/WrapperInteraction_4_IntegTest.java | 5 ++--- .../persistence/jpa/wrapper/JpaWrapperSyncTest.java | 8 +++----- .../security/keycloak/CausewayModuleSecurityKeycloak.java | 14 ++++++-------- .../testing/h2console/ui/webmodule/WebModuleH2Console.java | 9 ++++----- 8 files changed, 26 insertions(+), 35 deletions(-) diff --cc persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java index 5f95c902709,d6d7d38ea6f..1534c9c4a67 --- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java +++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java @@@ -19,9 -19,8 +19,7 @@@ package org.apache.causeway.persistence.commons.integration.deadlock; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; - +import lombok.extern.slf4j.Slf4j; - import lombok.val; - import jakarta.annotation.Priority; import jakarta.inject.Inject; @@@ -30,6 -29,6 +28,7 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.core.metamodel.services.deadlock.DeadlockRecognizer; import org.springframework.dao.DeadlockLoserDataAccessException; ++import org.springframework.dao.PessimisticLockingFailureException; import org.springframework.stereotype.Component; /** @@@ -47,8 -46,8 +46,9 @@@ public class DeadlockRecognizerDefault static final String SQL_SERVER_DEADLOCK_MESSAGE = "chosen as the deadlock victim"; @Override - public boolean isDeadlock(Throwable ex) { - var whetherDeadlock = ex instanceof DeadlockLoserDataAccessException || isMessage(ex, SQL_SERVER_DEADLOCK_MESSAGE); + public boolean isDeadlock(final Throwable ex) { - val whetherDeadlock = ex instanceof DeadlockLoserDataAccessException || isMessage(ex, SQL_SERVER_DEADLOCK_MESSAGE); ++ var whetherDeadlock = ex instanceof PessimisticLockingFailureException ++ || isMessage(ex, SQL_SERVER_DEADLOCK_MESSAGE); if (whetherDeadlock) { log.warn("Detected deadlock"); log.debug("Detected deadlock details:", ex); diff --cc testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java index eb5499ce328,8b96e9674a9..d252c5bdeab --- a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java +++ b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java @@@ -45,8 -45,7 +45,7 @@@ import org.apache.causeway.core.webapp. import org.apache.causeway.core.webapp.modules.WebModuleContext; import lombok.Getter; - import lombok.val; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; /** * @since 2.0 {@index}
