Added state to the TriggerLifeCycleEvent

Author: sterlp

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.4.1 - (2025-01-02)
+
+-  Added state to the TriggerLifeCycleEvent
+-  @Transactional annotation is taken from the method first
+
 ## v1.4.0 - (2025-01-02)
 
 -  @Transactional Annotation support

core/src/main/java/org/sterl/spring/persistent_tasks/api/PersistentTask.java

@@ -2,6 +2,8 @@
 
 import java.io.Serializable;
 
+import org.springframework.lang.Nullable;
+
 /**
  * A Spring persistent task whose state is saved in a {@link Trigger}.
  *
@@ -12,7 +14,7 @@
  */
 @FunctionalInterface
 public interface PersistentTask<T extends Serializable> {
-    void accept(T state);
+    void accept(@Nullable T state);
 
     default RetryStrategy retryStrategy() {
         return RetryStrategy.THREE_RETRIES;

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

@@ -81,7 +81,8 @@ public Optional<TriggerEntity> cancelTask(TriggerKey id) {
                 .findByKey(id) //
                 .map(t -> {
                     t.cancel();
-                    publisher.publishEvent(new TriggerCanceledEvent(t));
+                    publisher.publishEvent(new TriggerCanceledEvent(t, 
+                            stateSerializer.deserializeOrNull(t.getData().getState())));
                     triggerRepository.delete(t);
                     return t;
                 });

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

@@ -7,6 +7,9 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class StateSerializer {
 
     public byte[] serialize(final Serializable obj) {
@@ -36,4 +39,13 @@ public Serializable deserialize(byte[] bytes) {
             throw new RuntimeException("Failed to deserialize state of length " + bytes.length, ex);
         }
     }
+    
+    public Serializable deserializeOrNull(byte[] bytes) {
+        try {
+            return deserialize(bytes);
+        } catch (Exception e) {
+            log.error("Failed to deserialize bytes", e);
+            return null;
+        }
+    }
 }

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerCanceledEvent.java

@@ -4,12 +4,5 @@
 
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 
-public record TriggerCanceledEvent(TriggerEntity trigger) implements TriggerLifeCycleEvent {
-
-    /**
-     * No state on a cancel event
-     */
-    public Serializable state() {
-        return null;
-    }
+public record TriggerCanceledEvent(TriggerEntity trigger, Serializable state) implements TriggerLifeCycleEvent {
 }

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerLifeCycleEvent.java

@@ -2,12 +2,20 @@
 
 import java.io.Serializable;
 
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+import org.sterl.spring.persistent_tasks.api.TriggerKey;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 
 /**
  * Tag any events which are fired in case something changes on a trigger
  */
 public interface TriggerLifeCycleEvent {
+    default TriggerKey key() {
+        return trigger().getKey();
+    }
+    @NonNull
     TriggerEntity trigger();
+    @Nullable
     Serializable state();
 }

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

@@ -55,14 +55,12 @@ public class TriggerEntity implements HasTriggerData {
     private OffsetDateTime lastPing;
 
     public TriggerEntity(TriggerKey key) {
-        if (this.data == null)
-            this.data = new TriggerData();
+        if (this.data == null) this.data = new TriggerData();
         this.data.setKey(key);
     }
 
     public TriggerKey getKey() {
-        if (data == null)
-            return null;
+        if (data == null) return null;
         return data.getKey();
     }