events now in transactions

sterlp · sterlp · commit f3ff1d77e83f · 2025-01-10T09:37:12.000+01:00
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/api/Trigger.java b/core/src/main/java/org/sterl/spring/persistent_tasks/api/Trigger.java
@@ -2,8 +2,6 @@
 
 import java.time.OffsetDateTime;
 
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
-
 import lombok.Data;
 
 @Data
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/api/TriggerStatus.java b/core/src/main/java/org/sterl/spring/persistent_tasks/api/TriggerStatus.java
@@ -1,4 +1,4 @@
-package org.sterl.spring.persistent_tasks.shared.model;
+package org.sterl.spring.persistent_tasks.api;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/history/HistoryService.java b/core/src/main/java/org/sterl/spring/persistent_tasks/history/HistoryService.java
@@ -11,11 +11,11 @@
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.lang.Nullable;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryDetailEntity;
 import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryDetailRepository;
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryLastStateRepository;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalService;
 import org.sterl.spring.persistent_tasks.trigger.TriggerService;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/history/component/TriggerHistoryComponent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/history/component/TriggerHistoryComponent.java
@@ -10,7 +10,6 @@
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryLastStateRepository;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalCompontant;
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerLifeCycleEvent;
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,27 +22,25 @@ public class TriggerHistoryComponent {
     private final TriggerHistoryLastStateRepository triggerHistoryLastStateRepository;
     private final TriggerHistoryDetailRepository triggerHistoryDetailRepository;
 
-    public void write(TriggerEntity e) {
+    @Transactional(timeout = 10)
+    @EventListener
+    public void onPersistentTaskEvent(TriggerLifeCycleEvent e) {
+        log.debug("Received event={} for {} new status={}",
+                e.getClass().getSimpleName(),
+                e.key(), e.status());
+        
+        
         var state = new TriggerHistoryLastStateEntity();
-        state.setId(e.getId());
-        state.setData(e.getData().toBuilder().build());
+        state.setId(e.id());
+        state.setData(e.getData().copy());
         triggerHistoryLastStateRepository.save(state);
 
         var detail = new TriggerHistoryDetailEntity();
-        detail.setInstanceId(e.getId());
+        detail.setInstanceId(e.id());
         detail.setData(e.getData().toBuilder()
                 .state(null)
+                .createdTime(OffsetDateTime.now())
                 .build());
-        detail.getData().setCreatedTime(OffsetDateTime.now());
         triggerHistoryDetailRepository.save(detail);
     }
-    
-    @Transactional(timeout = 10)
-    @EventListener
-    public void onPersistentTaskEvent(TriggerLifeCycleEvent triggerLifeCycleEvent) {
-        log.debug("Received event={} for {} new status={}",
-                triggerLifeCycleEvent.getClass().getSimpleName(),
-                triggerLifeCycleEvent.key(), triggerLifeCycleEvent.status());
-        write(triggerLifeCycleEvent.trigger());
-    }
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java b/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java
@@ -4,7 +4,9 @@
 import java.time.OffsetDateTime;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 
 import org.springframework.lang.NonNull;
@@ -44,6 +46,7 @@ public class SchedulerService {
     private final TaskExecutorComponent taskExecutor;
     private final EditSchedulerStatusComponent editSchedulerStatus;
     private final TransactionTemplate trx;
+    private final Map<Long, TriggerEntity> shouldRun = new ConcurrentHashMap<>();
 
     @PostConstruct
     public void start() {
@@ -136,6 +139,7 @@ public <T extends Serializable> TriggerKey runOrQueue(
             if (taskExecutor.getFreeThreads() > 0) {
                 trigger = triggerService.markTriggersAsRunning(trigger, name);
                 pingRegistry().addRunning(1);
+                shouldRun.put(trigger.getId(), trigger);
             } else {
                 log.debug("Currently not enough free thread available {} of {} in use. PersistentTask {} queued.", 
                         taskExecutor.getFreeThreads(), taskExecutor.getMaxThreads(), trigger.getKey());
@@ -147,9 +151,10 @@ public <T extends Serializable> TriggerKey runOrQueue(
     
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     void checkIfTrigerIsRunning(TriggerAddedEvent addedTrigger) {
-        if (addedTrigger.isRunningOn(name) && !taskExecutor.isRunning(addedTrigger.trigger())) {
+        final var toRun = shouldRun.remove(addedTrigger.id());
+        if (toRun != null) {
             log.debug("New triger added for imidiate execution {}", addedTrigger.key());
-            taskExecutor.submit(addedTrigger.trigger());
+            taskExecutor.submit(toRun);
         }
     }
 
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/HasTriggerData.java b/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/HasTriggerData.java
@@ -4,10 +4,18 @@
 import java.time.OffsetDateTime;
 
 import org.sterl.spring.persistent_tasks.api.TaskId;
+import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 
 public interface HasTriggerData {
     TriggerData getData();
     
+    default TriggerKey key() {
+        return getData().getKey();
+    }
+    default TriggerStatus status() {
+        return getData().getStatus();
+    }
     default boolean isRunning() {
         return getData().getStatus() == TriggerStatus.RUNNING;
     }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java b/core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java
@@ -4,6 +4,7 @@
 import java.time.OffsetDateTime;
 
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
@@ -86,4 +87,8 @@ public void updateRunningDuration() {
     private String exceptionName;
     @Lob
     private String lastException;
+    
+    public TriggerData copy() {
+        return this.toBuilder().build();
+    }
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/shared/repository/TriggerDataRepository.java b/core/src/main/java/org/sterl/spring/persistent_tasks/shared/repository/TriggerDataRepository.java
@@ -11,8 +11,8 @@
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.query.Param;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.model.HasTriggerData;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
 
 @NoRepositoryBean
 public interface TriggerDataRepository<T extends HasTriggerData> extends JpaRepository<T, Long> {
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/TriggerService.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/TriggerService.java
@@ -14,7 +14,7 @@
 import org.sterl.spring.persistent_tasks.api.AddTriggerRequest;
 import org.sterl.spring.persistent_tasks.api.TaskId;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalService;
 import org.sterl.spring.persistent_tasks.task.TaskService;
 import org.sterl.spring.persistent_tasks.trigger.component.EditTriggerComponent;
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/EditTriggerComponent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/EditTriggerComponent.java
@@ -12,8 +12,8 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.sterl.spring.persistent_tasks.api.AddTriggerRequest;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerAddedEvent;
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerCanceledEvent;
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerFailedEvent;
@@ -48,11 +48,12 @@ public Optional<TriggerEntity> completeTaskWithStatus(TriggerKey key, Serializab
             t.complete(e);
 
             if (t.getData().getStatus() == TriggerStatus.SUCCESS) {
-                publisher.publishEvent(new TriggerSuccessEvent(t, state));
+                publisher.publishEvent(new TriggerSuccessEvent(
+                        t.getId(), t.copyData(), state));
                 log.debug("Setting {} to status={} {}", key, t.getData().getStatus(),
                         e == null ? "" : "error=" + e.getClass().getSimpleName());
             } else {
-                publisher.publishEvent(new TriggerFailedEvent(t, state, e));
+                publisher.publishEvent(new TriggerFailedEvent(t.getId(), t.copyData(), state, e));
                 log.info("Setting {} to status={} {}", key, t.getData().getStatus(),
                         e == null ? "" : "error=" + e.getClass().getSimpleName());
             }
@@ -73,7 +74,8 @@ public Optional<TriggerEntity> cancelTask(TriggerKey id) {
                 .findByKey(id) //
                 .map(t -> {
                     t.cancel();
-                    publisher.publishEvent(new TriggerCanceledEvent(t, 
+                    publisher.publishEvent(new TriggerCanceledEvent(
+                            t.getId(), t.copyData(),
                             stateSerializer.deserializeOrNull(t.getData().getState())));
                     triggerRepository.delete(t);
                     return t;
@@ -94,7 +96,8 @@ public <T extends Serializable> TriggerEntity addTrigger(AddTriggerRequest<T> ti
             result = triggerRepository.save(result);
             log.debug("Added trigger={}", result);
         }
-        publisher.publishEvent(new TriggerAddedEvent(result, tigger.state()));
+        publisher.publishEvent(new TriggerAddedEvent(
+                result.getId(), result.copyData(), tigger.state()));
         return result;
     }
 
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/LockNextTriggerComponent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/LockNextTriggerComponent.java
@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 import org.sterl.spring.persistent_tasks.trigger.repository.TriggerRepository;
 
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/ReadTriggerComponent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/ReadTriggerComponent.java
@@ -10,7 +10,7 @@
 import org.springframework.lang.Nullable;
 import org.sterl.spring.persistent_tasks.api.TaskId;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalCompontant;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 import org.sterl.spring.persistent_tasks.trigger.repository.TriggerRepository;
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/RunTriggerComponent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/RunTriggerComponent.java
@@ -73,7 +73,8 @@ Optional<TriggerEntity> call() {
         }
 
         private Optional<TriggerEntity> runTask() {
-            eventPublisher.publishEvent(new TriggerRunningEvent(trigger, state));
+            eventPublisher.publishEvent(new TriggerRunningEvent(
+                    trigger.getId(), trigger.copyData(), state, trigger.getRunningOn()));
 
             persistentTask.accept(state);
 
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerAddedEvent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerAddedEvent.java
@@ -2,8 +2,14 @@
 
 import java.io.Serializable;
 
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
-
-public record TriggerAddedEvent(TriggerEntity trigger, Serializable state) implements TriggerLifeCycleEvent {
+import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
+
+/**
+ * Fired if a new trigger is added.
+ * <p>
+ * Inside a transaction, it is save to join or listen for the <code>AFTER_COMMIT</code>
+ * </p>
+ */
+public record TriggerAddedEvent(long id, TriggerData data, Serializable state) implements TriggerLifeCycleEvent {
 
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerCanceledEvent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerCanceledEvent.java
@@ -2,7 +2,13 @@
 
 import java.io.Serializable;
 
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
+import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
 
-public record TriggerCanceledEvent(TriggerEntity trigger, Serializable state) implements TriggerLifeCycleEvent {
+/**
+ * Fired if a trigger could be canceled before it is running.
+ * <p>
+ * Inside a transaction, it is save to join or listen for the <code>AFTER_COMMIT</code>
+ * </p>
+ */
+public record TriggerCanceledEvent(long id, TriggerData data, Serializable state) implements TriggerLifeCycleEvent {
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerFailedEvent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerFailedEvent.java
@@ -2,8 +2,13 @@
 
 import java.io.Serializable;
 
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
-
-public record TriggerFailedEvent(TriggerEntity trigger, Serializable state, Exception exception) implements TriggerLifeCycleEvent {
+import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
+
+/**
+ * <p>
+ * Inside a transaction, it is save to join or listen for the <code>AFTER_COMMIT</code>
+ * </p>
+ */
+public record TriggerFailedEvent(long id, TriggerData data, Serializable state, Exception exception) implements TriggerLifeCycleEvent {
 
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerLifeCycleEvent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerLifeCycleEvent.java
@@ -4,25 +4,20 @@
 
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
-import org.sterl.spring.persistent_tasks.api.TriggerKey;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
+import org.sterl.spring.persistent_tasks.shared.model.HasTriggerData;
+import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
 
 /**
- * Tag any events which are fired in case something changes on a trigger
+ * Tag any events which are fired in case something changes on a trigger.
+ * The attached data is already a copy, any modification to this data will have no effect.
  */
-public interface TriggerLifeCycleEvent {
-    default TriggerKey key() {
-        return trigger().getKey();
-    }
-    default TriggerStatus status() {
-        return trigger().getData().getStatus();
-    }
-    default boolean isRunningOn(String name) {
-        return trigger().isRunning() && name != null && name.equals(trigger().getRunningOn());
+public interface TriggerLifeCycleEvent extends HasTriggerData {
+    default TriggerData getData() {
+        return data();
     }
+    long id();
     @NonNull
-    TriggerEntity trigger();
+    TriggerData data();
     @Nullable
     Serializable state();
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerRunningEvent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerRunningEvent.java
@@ -2,11 +2,17 @@
 
 import java.io.Serializable;
 
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
+import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
 
 /**
  * Event fired before a trigger is executed
+ * <p>
+ * This event is maybe not in a transaction and so a transactional event listener will not work.
+ * </p>
  */
-public record TriggerRunningEvent(TriggerEntity trigger, Serializable state) implements TriggerLifeCycleEvent {
+public record TriggerRunningEvent(long id, TriggerData data, Serializable state, String runningOn) implements TriggerLifeCycleEvent {
 
+    public boolean isRunningOn(String name) {
+        return isRunning() && name != null && name.equals(runningOn);
+    }
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerSuccessEvent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerSuccessEvent.java
@@ -2,8 +2,13 @@
 
 import java.io.Serializable;
 
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
-
-public record TriggerSuccessEvent(TriggerEntity trigger, Serializable state) implements TriggerLifeCycleEvent {
+import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
+
+/**
+ * <p>
+ * Inside a transaction, it is save to join or listen for the <code>AFTER_COMMIT</code>
+ * </p>
+ */
+public record TriggerSuccessEvent(long id, TriggerData data, Serializable state) implements TriggerLifeCycleEvent {
 
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/TriggerEntity.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/TriggerEntity.java
@@ -4,9 +4,9 @@
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.model.HasTriggerData;
 import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
 
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
@@ -111,4 +111,9 @@ public TriggerEntity withState(byte[] state) {
         this.data.setState(state);
         return this;
     }
+    
+    public TriggerData copyData() {
+        if (data == null) return null;
+        return this.data.copy();
+    }
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/repository/TriggerRepository.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/repository/TriggerRepository.java
@@ -14,7 +14,7 @@
 import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.repository.query.Param;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.shared.repository.TriggerDataRepository;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/TaskSchedulerServiceTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/TaskSchedulerServiceTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/history/HistoryServiceTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/history/HistoryServiceTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/history/repository/TriggerHistoryDetailRepositoryTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/history/repository/TriggerHistoryDetailRepositoryTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerServiceTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerServiceTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerServiceTransactionTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerServiceTransactionTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/TaskFailoverTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/TaskFailoverTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/trigger/TriggerServiceTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/trigger/TriggerServiceTest.java
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/trigger/api/TriggerResourceTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/trigger/api/TriggerResourceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.sterl.spring.persistent_tasks.shared.model;`
	`1`	`+package org.sterl.spring.persistent_tasks.api;`
`2`	`2`
`3`	`3`	`import java.util.EnumSet;`
`4`	`4`	`import java.util.Set;`