Feature/immutable events

src/main/java/com/iexec/core/replicate/ReplicateUpdatedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,13 @@
 package com.iexec.core.replicate;
 
 import com.iexec.common.replicate.ReplicateStatusUpdate;
+import lombok.Builder;
+import lombok.Value;
 
-import lombok.*;
-
-@Data
+@Value
 @Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
 public class ReplicateUpdatedEvent {
-
-    private String chainTaskId;
-    private String walletAddress;
-    private ReplicateStatusUpdate replicateStatusUpdate;
+    String chainTaskId;
+    String walletAddress;
+    ReplicateStatusUpdate replicateStatusUpdate;
 }

src/main/java/com/iexec/core/task/event/ConsensusReachedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,13 @@
 
 package com.iexec.core.task.event;
 
-import lombok.*;
+import lombok.Builder;
+import lombok.Value;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
+@Value
 @Builder
 public class ConsensusReachedEvent {
-
-    private String chainTaskId;
-    private String consensus;
-    private long blockNumber;
+    String chainTaskId;
+    String consensus;
+    long blockNumber;
 }

src/main/java/com/iexec/core/task/event/ContributionTimeoutEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,7 @@
 
 import lombok.*;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
-@Builder
+@Value
 public class ContributionTimeoutEvent {
-
-    private String chainTaskId;
+    String chainTaskId;
 }

src/main/java/com/iexec/core/task/event/PleaseUploadEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,10 @@
 
 package com.iexec.core.task.event;
 
-import lombok.*;
+import lombok.Value;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
+@Value
 public class PleaseUploadEvent {
-    private String chainTaskId;
-    private String workerWallet;
+    String chainTaskId;
+    String workerWallet;
 }

src/main/java/com/iexec/core/task/event/ResultUploadTimeoutEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,9 @@
 
 package com.iexec.core.task.event;
 
-import lombok.*;
+import lombok.Value;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
-@Builder
+@Value
 public class ResultUploadTimeoutEvent {
-
-    private String chainTaskId;
-}
+    String chainTaskId;
+}

src/main/java/com/iexec/core/task/event/TaskCompletedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,9 @@
 package com.iexec.core.task.event;
 
 import com.iexec.core.task.Task;
-import lombok.*;
+import lombok.Value;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
+@Value
 public class TaskCompletedEvent {
-
-    private Task task;
+    Task task;
 }

src/main/java/com/iexec/core/task/event/TaskCreatedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,9 @@
 
 package com.iexec.core.task.event;
 
-import lombok.*;
+import lombok.Value;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
+@Value
 public class TaskCreatedEvent {
-
-    private String chainTaskId;
+    String chainTaskId;
 }

src/main/java/com/iexec/core/task/event/TaskFailedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,9 @@
 
 package com.iexec.core.task.event;
 
-import lombok.*;
+import lombok.Value;
 
-@AllArgsConstructor
-@Getter
+@Value
 public class TaskFailedEvent {
-
-    private String chainTaskId;
+    String chainTaskId;
 }

src/main/java/com/iexec/core/task/event/TaskRunningFailedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 IEXEC BLOCKCHAIN TECH
+ * Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,9 @@
 
 package com.iexec.core.task.event;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.Value;
 
-@AllArgsConstructor
-@Getter
-@Builder
+@Value
 public class TaskRunningFailedEvent {
-    private String chainTaskId;
+    String chainTaskId;
 }

src/main/java/com/iexec/core/task/update/TaskUpdateManager.java

@@ -312,7 +312,7 @@ void running2ConsensusReached(Task task) {
             if (optional.isEmpty()) return;
             ChainTask chainTask = optional.get();
 
-            // change the the revealDeadline and consensus of the task from the chainTask info
+            // change the revealDeadline and consensus of the task from the chainTask info
             task.setRevealDeadline(new Date(chainTask.getRevealDeadline()));
             task.setConsensus(chainTask.getConsensusValue());
             long consensusBlockNumber = iexecHubService.getConsensusBlock(chainTaskId, task.getInitializationBlockNumber()).getBlockNumber();
@@ -376,9 +376,7 @@ void initializedOrRunning2ContributionTimeout(Task task) {
         if (isInitializedOrRunningTask && isNowAfterContributionDeadline) {
             updateTaskStatusAndSave(task, CONTRIBUTION_TIMEOUT);
             updateTaskStatusAndSave(task, FAILED);
-            applicationEventPublisher.publishEvent(ContributionTimeoutEvent.builder()
-                    .chainTaskId(task.getChainTaskId())
-                    .build());
+            applicationEventPublisher.publishEvent(new ContributionTimeoutEvent(task.getChainTaskId()));
         }
     }
 
@@ -430,9 +428,7 @@ void running2RunningFailed(Task task) {
         // - e.g. failing script, dataset can't be retrieved, app can't be downloaded, ...
         updateTaskStatusAndSave(task, RUNNING_FAILED);
         updateTaskStatusAndSave(task, FAILED);
-        applicationEventPublisher.publishEvent(TaskRunningFailedEvent.builder()
-                .chainTaskId(task.getChainTaskId())
-                .build());
+        applicationEventPublisher.publishEvent(new TaskRunningFailedEvent(task.getChainTaskId()));
     }
 
     void consensusReached2AtLeastOneReveal2ResultUploading(Task task) {
@@ -553,9 +549,7 @@ void resultUploading2UploadTimeout(Task task) {
 
         if (isTaskInResultUploading && isNowAfterFinalDeadline) {
             updateTaskStatusAndSave(task, RESULT_UPLOAD_TIMEOUT);
-            applicationEventPublisher.publishEvent(ResultUploadTimeoutEvent.builder()
-                    .chainTaskId(task.getChainTaskId())
-                    .build());
+            applicationEventPublisher.publishEvent(new ResultUploadTimeoutEvent(task.getChainTaskId()));
             updateTaskStatusAndSave(task, FAILED);
         }
     }

src/test/java/com/iexec/core/task/listener/TaskListenerTest.java

@@ -70,16 +70,14 @@ void init() {
 
     @Test
     void shouldUpdateTaskOnTasCreatedEvent() {
-        TaskCreatedEvent event = new TaskCreatedEvent();
-        event.setChainTaskId(CHAIN_TASK_ID);
+        TaskCreatedEvent event = new TaskCreatedEvent(CHAIN_TASK_ID);
         taskListeners.onTaskCreatedEvent(event);
         verify(taskUpdateRequestManager).publishRequest(anyString());
     }
 
     @Test
     void shouldProcessContributionTimeoutEvent() {
-        ContributionTimeoutEvent event = new ContributionTimeoutEvent();
-        event.setChainTaskId(CHAIN_TASK_ID);
+        ContributionTimeoutEvent event = new ContributionTimeoutEvent(CHAIN_TASK_ID);
         Replicate replicate1 = new Replicate(WALLET1, CHAIN_TASK_ID);
         Replicate replicate2 = new Replicate(WALLET2, CHAIN_TASK_ID);
         List<Replicate> replicates = List.of(replicate1, replicate2);
@@ -102,9 +100,11 @@ void shouldProcessContributionTimeoutEvent() {
     void shouldNotifyWinnersAndLosersOnTaskConsensusReached() {
         String winningHash = "hash";
         String badHash = "bad";
-        ConsensusReachedEvent event = new ConsensusReachedEvent();
-        event.setChainTaskId(CHAIN_TASK_ID);
-        event.setConsensus(winningHash);
+        ConsensusReachedEvent event = ConsensusReachedEvent.builder()
+                .chainTaskId(CHAIN_TASK_ID)
+                .consensus(winningHash)
+                .blockNumber(0L)
+                .build();
         Replicate replicate1 = new Replicate(WALLET1, CHAIN_TASK_ID);
         replicate1.setContributionHash(winningHash);
         Replicate replicate2 = new Replicate(WALLET2, CHAIN_TASK_ID);