Use ReplicateTaskSummary moved to iexec-core-library (#600)

Author: jbern0rd

CHANGELOG.md

@@ -14,14 +14,15 @@ All notable changes to this project will be documented in this file.
 - Fix `LoginServiceTests#shouldLoginOnceOnSimultaneousCalls` test. (#587)
 - Always use `WorkerpoolAuhorization` to retrieve JWT on Result Proxy. (#588)
 - Improve checks when receiving a `computed.json` file from a REST call. (#598)
-- Move `ReplicateActionResponse` from `iexec-common` to `iexec-worker`. (#599)
 
 ### Quality
 
 - Configure Gradle JVM Test Suite Plugin. (#589)
 - Remove `ResponseEntity` wrapper in feign client. (#593)
 - Use constructor injection in `Application` class. (#594)
 - Transform `CoreConfigurationService` to immutable `SchedulerConfiguration` class. (#597)
+- Move `ReplicateActionResponse` from `iexec-common` to `iexec-worker`. (#599)
+- Use `ReplicateTaskSummary` from `iexce-core-library`. (#600)
 
 ### Dependency Upgrades
 

src/main/java/com/iexec/worker/feign/CustomCoreFeignClient.java

@@ -18,11 +18,11 @@
 
 import com.iexec.common.config.WorkerModel;
 import com.iexec.common.replicate.ReplicateStatusUpdate;
-import com.iexec.common.replicate.ReplicateTaskSummary;
 import com.iexec.core.api.SchedulerClient;
 import com.iexec.core.config.PublicConfiguration;
 import com.iexec.core.notification.TaskNotification;
 import com.iexec.core.notification.TaskNotificationType;
+import com.iexec.core.replicate.ReplicateTaskSummary;
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

src/main/java/com/iexec/worker/replicate/ReplicateDemandService.java

@@ -16,11 +16,11 @@
 
 package com.iexec.worker.replicate;
 
-import com.iexec.common.replicate.ReplicateTaskSummary;
 import com.iexec.commons.poco.chain.WorkerpoolAuthorization;
 import com.iexec.core.notification.TaskNotification;
 import com.iexec.core.notification.TaskNotificationExtra;
 import com.iexec.core.notification.TaskNotificationType;
+import com.iexec.core.replicate.ReplicateTaskSummary;
 import com.iexec.worker.chain.ContributionService;
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.feign.CustomCoreFeignClient;
@@ -119,14 +119,14 @@ private boolean isNewTaskInitialized(ReplicateTaskSummary replicateTaskSummary)
      * @param replicateTaskSummary replicate task summary for computing and contribution
      */
     void startTask(ReplicateTaskSummary replicateTaskSummary) {
-        WorkerpoolAuthorization authorization = 
-            replicateTaskSummary.getWorkerpoolAuthorization();
-        String chainTaskId = authorization.getChainTaskId();
-        TaskNotificationExtra notificationExtra = TaskNotificationExtra.builder()
+        final WorkerpoolAuthorization authorization =
+                replicateTaskSummary.getWorkerpoolAuthorization();
+        final String chainTaskId = authorization.getChainTaskId();
+        final TaskNotificationExtra notificationExtra = TaskNotificationExtra.builder()
                 .workerpoolAuthorization(authorization)
                 .smsUrl(replicateTaskSummary.getSmsUrl())
                 .build();
-        TaskNotification taskNotification = TaskNotification.builder()
+        final TaskNotification taskNotification = TaskNotification.builder()
                 .chainTaskId(chainTaskId)
                 .workersAddress(Collections.emptyList())
                 .taskNotificationType(TaskNotificationType.PLEASE_START)

src/test/java/com/iexec/worker/feign/CustomCoreFeignClientTests.java

@@ -19,19 +19,19 @@
 import com.iexec.common.config.WorkerModel;
 import com.iexec.common.replicate.ReplicateStatus;
 import com.iexec.common.replicate.ReplicateStatusUpdate;
-import com.iexec.common.replicate.ReplicateTaskSummary;
 import com.iexec.core.api.SchedulerClient;
 import com.iexec.core.config.PublicConfiguration;
 import com.iexec.core.notification.TaskNotification;
 import com.iexec.core.notification.TaskNotificationType;
+import com.iexec.core.replicate.ReplicateTaskSummary;
 import feign.FeignException;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.HttpStatus;
 
 import java.util.List;
@@ -41,6 +41,7 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mockito.Mockito.*;
 
+@ExtendWith(MockitoExtension.class)
 class CustomCoreFeignClientTests {
     private static final String AUTHORIZATION = "authorization";
     private static final String CHAIN_TASK_ID = "0x123";
@@ -53,11 +54,6 @@ class CustomCoreFeignClientTests {
     @InjectMocks
     private CustomCoreFeignClient customCoreFeignClient;
 
-    @BeforeEach
-    void init() {
-        MockitoAnnotations.openMocks(this);
-    }
-
     //region getCoreVersion
     @Test
     void shouldGetCoreVersion() {

src/test/java/com/iexec/worker/replicate/ReplicateDemandServiceTests.java

@@ -16,18 +16,19 @@
 
 package com.iexec.worker.replicate;
 
-import com.iexec.common.replicate.ReplicateTaskSummary;
 import com.iexec.commons.poco.chain.WorkerpoolAuthorization;
 import com.iexec.core.notification.TaskNotification;
+import com.iexec.core.replicate.ReplicateTaskSummary;
 import com.iexec.worker.chain.ContributionService;
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.feign.CustomCoreFeignClient;
 import com.iexec.worker.pubsub.SubscriptionService;
 import com.iexec.worker.utils.AsyncUtils;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.*;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.ApplicationEventPublisher;
 
 import java.util.Optional;
@@ -36,6 +37,7 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+@ExtendWith(MockitoExtension.class)
 class ReplicateDemandServiceTests {
 
     private static final String ASK_FOR_REPLICATE_CONTEXT = "ask-for-replicate";
@@ -60,11 +62,6 @@ class ReplicateDemandServiceTests {
     @InjectMocks
     private ReplicateDemandService replicateDemandService;
 
-    @BeforeEach
-    void init() {
-        MockitoAnnotations.openMocks(this);
-    }
-
     // region triggerAskForReplicate()
     @Test
     void shouldRunAskForReplicateAsynchronouslyWhenTriggeredOneTime() {