Add @PreDetroy annotation in services implementing Purgeable (#724)

Author: nabil-Tounarti

CHANGELOG.md

@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
 - Update `contribution` and `contributionAndFinalize` detector tests.
   TEE tasks with callback are now eligible to `contributeAndFinalize` flow. (#719)
 - Resolve deprecations caused by `TaskDescription` in `ReplicatesService` and `ResultService`. (#723)
+- Add missing `@PreDestroy` annotation in services implementing `Purgeable`. (#724)
 
 ### Dependency Upgrades
 

src/main/java/com/iexec/core/chain/IexecHubService.java

@@ -29,6 +29,7 @@
 import org.web3j.protocol.core.methods.request.EthFilter;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 
+import javax.annotation.PreDestroy;
 import java.math.BigInteger;
 import java.time.Instant;
 import java.util.Date;
@@ -411,12 +412,15 @@ private EthFilter createEthFilter(long fromBlock, long toBlock, Event event) {
     // endregion
 
     @Override
-    public boolean purgeTask(String chainTaskId) {
+    public boolean purgeTask(final String chainTaskId) {
+        log.debug("purgeTask [chainTaskId: {}]", chainTaskId);
         return super.purgeTask(chainTaskId);
     }
 
     @Override
+    @PreDestroy
     public void purgeAllTasksData() {
+        log.info("Method purgeAllTasksData() called to perform task data cleanup.");
         super.purgeAllTasksData();
     }
 }

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

@@ -41,6 +41,7 @@
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PreDestroy;
 import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -531,13 +532,16 @@ private TaskAbortCause getTaskAbortCause(Task task) {
 
     // region purge locks
     @Override
-    public boolean purgeTask(String chainTaskId) {
+    public boolean purgeTask(final String chainTaskId) {
+        log.debug("purgeTask [chainTaskId: {}]", chainTaskId);
         taskAccessForNewReplicateLocks.remove(chainTaskId);
         return !taskAccessForNewReplicateLocks.containsKey(chainTaskId);
     }
 
     @Override
+    @PreDestroy
     public void purgeAllTasksData() {
+        log.info("Method purgeAllTasksData() called to perform task data cleanup.");
         taskAccessForNewReplicateLocks.clear();
     }
     // endregion

src/test/java/com/iexec/core/task/update/TaskUpdateManagerTests.java

@@ -164,7 +164,7 @@ void shouldNotUpgrade2ReopenedSinceCurrentStatusWrong() {
     @Test
     void shouldNotUpgrade2ReopenedSinceNotAfterRevealDeadline() {
         final Task task = getStubTask(CONSENSUS_REACHED);
-        task.setRevealDeadline(new Date(new Date().getTime() + 100));
+        task.setRevealDeadline(new Date(new Date().getTime() + 500));
         taskRepository.save(task);
         when(replicatesService.getNbReplicatesWithCurrentStatus(CHAIN_TASK_ID, ReplicateStatus.REVEALED)).thenReturn(0);