adjusted test

Author: sterlp

RUN_AND_BUILD.md

@@ -1,5 +1,5 @@
 mvn versions:display-dependency-updates
-mvn versions:set -DnewVersion=1.5.3 -DgenerateBackupPoms=false
+mvn versions:set -DnewVersion=1.5.5 -DgenerateBackupPoms=false
 git tag -a v1.5.3 -m "v1.5.3 release"
 mvn versions:set -DnewVersion=1.5.4-SNAPSHOT -DgenerateBackupPoms=false
 

core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.Future;
 
 import org.springframework.lang.NonNull;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -105,6 +106,7 @@ public List<Future<TriggerKey>> triggerNextTasks() {
      * This method should not be called in a transaction!
      * </p>
      */
+    @Transactional(propagation = Propagation.NEVER)
     @NonNull
     public List<Future<TriggerKey>> triggerNextTasks(OffsetDateTime timeDue) {
         if (taskExecutor.getFreeThreads() > 0) {

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/RunTriggerComponent.java

@@ -32,19 +32,19 @@ public Optional<TriggerEntity> execute(TriggerEntity trigger) {
             return Optional.empty();
         }
 
-        final var taskAndState = getTastAndState(trigger);
+        final var runTaskWithState = buildTaskWithStateFor(trigger);
         // something went really wrong this trigger is crap
-        if (taskAndState == null) return Optional.of(trigger);
+        if (runTaskWithState == null) return Optional.of(trigger);
 
         try {
-            return taskAndState.execute(editTrigger);
+            return runTaskWithState.execute(editTrigger);
         } catch (Exception e) {
-            return failTaskAndState(taskAndState, e);
+            return failTaskAndState(runTaskWithState, e);
         }
     }
 
     @Nullable
-    private RunTaskWithStateCommand getTastAndState(TriggerEntity trigger) {
+    private RunTaskWithStateCommand buildTaskWithStateFor(TriggerEntity trigger) {
         try {
             final var task = taskService.assertIsKnown(trigger.newTaskId());
             final var trx = taskService.getTransactionTemplate(task);

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/RunTaskWithStateCommand.java

@@ -17,8 +17,10 @@ public record RunTaskWithStateCommand (
 
     public Optional<TriggerEntity> execute(EditTriggerComponent editTrigger) {
         if (trx.isPresent()) {
+            System.err.println("IN TRX");
             return trx.get().execute(t -> runTask(editTrigger));
         } else {
+            System.err.println("NO TRX");
             return runTask(editTrigger);
         }
     }

core/src/test/java/org/sterl/spring/persistent_tasks/history/HistoryServiceTest.java

@@ -17,7 +17,8 @@
 
 class HistoryServiceTest extends AbstractSpringTest {
 
-    @Autowired HistoryService subject;
+    @Autowired 
+    private HistoryService subject;
 
     @Test
     void testReQueueTrigger() {

db/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>org.sterl.spring</groupId>
     <artifactId>spring-persistent-tasks-root</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.5.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <inceptionYear>2024</inceptionYear>

ui/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>