Merge branch 'develop' into feature/rc

Author: zguesmi

src/main/java/com/iexec/worker/PingService.java

@@ -28,9 +28,9 @@
 @Service
 public class PingService {
 
-    private CustomCoreFeignClient customCoreFeignClient;
-    private CoreConfigurationService coreConfigurationService;
-    private WorkerService workerService;
+    private final CustomCoreFeignClient customCoreFeignClient;
+    private final CoreConfigurationService coreConfigurationService;
+    private final WorkerService workerService;
 
     public PingService(CustomCoreFeignClient customCoreFeignClient,
                        CoreConfigurationService coreConfigurationService,

src/main/java/com/iexec/worker/chain/ContributionService.java

@@ -36,10 +36,10 @@
 @Service
 public class ContributionService {
 
-    private IexecHubService iexecHubService;
-    private WorkerpoolAuthorizationService workerpoolAuthorizationService;
-    private EnclaveAuthorizationService enclaveAuthorizationService;
-    private CredentialsService credentialsService;
+    private final IexecHubService iexecHubService;
+    private final WorkerpoolAuthorizationService workerpoolAuthorizationService;
+    private final EnclaveAuthorizationService enclaveAuthorizationService;
+    private final CredentialsService credentialsService;
 
     public ContributionService(IexecHubService iexecHubService,
                                WorkerpoolAuthorizationService workerpoolAuthorizationService,

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

@@ -47,7 +47,7 @@ public class IexecHubService extends IexecHubAbstractService {
 
     private final CredentialsService credentialsService;
     private final ThreadPoolExecutor executor;
-    private Web3jService web3jService;
+    private final Web3jService web3jService;
 
     @Autowired
     public IexecHubService(CredentialsService credentialsService,

src/main/java/com/iexec/worker/chain/RevealService.java

@@ -18,7 +18,6 @@
 
 import com.iexec.common.chain.*;
 import com.iexec.common.contract.generated.IexecHubContract;
-import com.iexec.common.utils.HashUtils;
 import com.iexec.common.worker.result.ResultUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -30,9 +29,9 @@
 @Service
 public class RevealService {
 
-    private IexecHubService iexecHubService;
-    private CredentialsService credentialsService;
-    private Web3jService web3jService;
+    private final IexecHubService iexecHubService;
+    private final CredentialsService credentialsService;
+    private final Web3jService web3jService;
 
     public RevealService(IexecHubService iexecHubService,
                          CredentialsService credentialsService,

src/main/java/com/iexec/worker/chain/Web3jService.java

@@ -17,14 +17,11 @@
 package com.iexec.worker.chain;
 
 import com.iexec.common.chain.Web3jAbstractService;
-import com.iexec.common.utils.WaitUtils;
 import com.iexec.worker.config.PublicConfigurationService;
 import com.iexec.worker.config.WorkerConfigurationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.function.Function;
-
 @Slf4j
 @Service
 public class Web3jService extends Web3jAbstractService {

src/main/java/com/iexec/worker/chain/WorkerpoolAuthorizationService.java

@@ -33,7 +33,7 @@
 @Service
 public class WorkerpoolAuthorizationService {
 
-    private PublicConfigurationService publicConfigurationService;
+    private final PublicConfigurationService publicConfigurationService;
     private Map<String, WorkerpoolAuthorization> workerpoolAuthorizations;
     private String corePublicAddress;
 

src/main/java/com/iexec/worker/compute/pre/PreComputeService.java

@@ -17,7 +17,6 @@
 package com.iexec.worker.compute.pre;
 
 import com.iexec.common.chain.WorkerpoolAuthorization;
-import com.iexec.common.sms.secret.TaskSecrets;
 import com.iexec.common.task.TaskDescription;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.dataset.DataService;
@@ -26,26 +25,21 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 
 @Slf4j
 @Service
 public class PreComputeService {
 
     private final SmsService smsService;
     private final DataService dataService;
-    private final WorkerConfigurationService workerConfigService;
     private final DockerService dockerService;
 
     public PreComputeService(
             SmsService smsService,
-            WorkerConfigurationService workerConfigService,
             DataService dataService,
             DockerService dockerService
     ) {
         this.smsService = smsService;
-        this.workerConfigService = workerConfigService;
         this.dataService = dataService;
         this.dockerService = dockerService;
     }

src/main/java/com/iexec/worker/config/PublicConfigurationService.java

@@ -23,7 +23,7 @@
 @Service
 public class PublicConfigurationService {
 
-    private PublicConfiguration publicConfiguration;
+    private final PublicConfiguration publicConfiguration;
 
     public PublicConfigurationService(CustomCoreFeignClient customCoreFeignClient) {
         this.publicConfiguration = customCoreFeignClient.getPublicConfiguration();

src/main/java/com/iexec/worker/config/WorkerConfigurationService.java

@@ -28,7 +28,7 @@
 @Service
 public class WorkerConfigurationService {
 
-    private CredentialsService credentialsService;
+    private final CredentialsService credentialsService;
 
     @Value("${worker.name}")
     private String workerName;