This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit cf23b7a98e613da902177250d7ef0c3b93fd70e1 Merge: 4c491728fe f9bfaf8e3a Author: andi-huber <[email protected]> AuthorDate: Mon Jun 3 05:49:05 2024 +0200 merge from master .../core/config/CausewayConfiguration.java | 14 +++++ .../applib/CausewayModuleExtCommandLogApplib.java | 3 ++ .../applib/fakescheduler/FakeScheduler.java | 47 ++++++++++++---- .../applib/job/RunBackgroundCommandsJob.java | 46 +++++++++++----- .../spi/RunBackgroundCommandsJobListener.java | 62 ++++++++++++++++++++++ .../wicket/model/models/FileUploadModels.java | 5 +- .../scalars/ScalarPanelFormFieldAbstract.html | 2 +- 7 files changed, 155 insertions(+), 24 deletions(-) diff --cc extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java index 1f4803e0c8,cb36b3c2ca..f227b23fb1 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java @@@ -23,8 -23,11 +23,11 @@@ import java.util.UUID import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; + import org.apache.causeway.commons.internal.concurrent._ConcurrentTask; + import org.apache.causeway.extensions.commandlog.applib.spi.RunBackgroundCommandsJobListener; + import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --cc extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java index ab1ea19417,be217a7b76..ad2d8f3e25 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java @@@ -23,14 -23,21 +23,21 @@@ import java.util.Optional import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; + import org.apache.causeway.commons.functional.Try; + import org.apache.causeway.core.config.CausewayConfiguration; + import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository; + + import org.apache.causeway.extensions.commandlog.applib.spi.RunBackgroundCommandsJobListener; + import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.PersistJobDataAfterExecution; - import org.springframework.dao.DeadlockLoserDataAccessException; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DeadlockLoserDataAccessException; ++import org.springframework.dao.PessimisticLockingFailureException; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Propagation; @@@ -178,7 -200,7 +200,7 @@@ public class RunBackgroundCommandsJob i return false; } return result.getFailure() -- .map(throwable -> throwable instanceof DeadlockLoserDataAccessException) ++ .map(throwable -> throwable instanceof PessimisticLockingFailureException) .orElse(false); }
