Fix several issues raised by SonarQube Cloud (#749)

Author: jbern0rd

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - Compute alive workers metrics in `WorkerService#updateMetrics` scheduled job. (#739 #745)
 - Fix Spring Security deprecations after Spring Boot 3.3.8 upgrade. (#740)
 - Remove code related to reopen PoCo feature in `IexecHubService` and `TaskUpdateManager`. (#743)
+- Fix several issues raised by SonarQube Cloud. (#749)
 
 ### Breaking API changes
 

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

@@ -360,7 +360,7 @@ private Optional<TaskNotificationType> recoverReplicateInContributionPhase(Task
             return Optional.of(TaskNotificationType.PLEASE_CONTRIBUTE);
         }
 
-        if (didReplicateStartContributing && didReplicateContributeOnChain) {
+        if (didReplicateStartContributing) {
             ReplicateStatusDetails details = new ReplicateStatusDetails(blockNumber);
             final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.poolManagerRequest(CONTRIBUTED, details);
             replicatesService.updateReplicateStatus(chainTaskId, walletAddress, statusUpdate);
@@ -416,7 +416,7 @@ private Optional<TaskNotificationType> recoverReplicateInRevealPhase(Task task,
             return Optional.of(TaskNotificationType.PLEASE_REVEAL);
         }
 
-        if (didReplicateStartRevealing && didReplicateRevealOnChain) {
+        if (didReplicateStartRevealing) {
             ReplicateStatusDetails details = new ReplicateStatusDetails(blockNumber);
             final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.poolManagerRequest(REVEALED, details);
             replicatesService.updateReplicateStatus(chainTaskId, walletAddress, statusUpdate);
@@ -473,7 +473,7 @@ private Optional<TaskNotificationType> recoverReplicateInResultUploadPhase(Task
             return Optional.of(TaskNotificationType.PLEASE_UPLOAD);
         }
 
-        if (didReplicateStartUploading && didReplicateUploadWithoutNotifying) {
+        if (didReplicateStartUploading) {
             final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.poolManagerRequest(RESULT_UPLOADED);
             replicatesService.updateReplicateStatus(chainTaskId, walletAddress, statusUpdate);
 

src/main/java/com/iexec/core/utils/TaskExecutorUtils.java

@@ -1,14 +1,28 @@
-package com.iexec.core.utils;
+/*
+ * Copyright 2020-2025 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import java.util.concurrent.ThreadPoolExecutor.DiscardPolicy;
+package com.iexec.core.utils;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class TaskExecutorUtils {
-
-    public static ThreadPoolTaskExecutor newThreadPoolTaskExecutor(
-        String threadNamePrefix
-    ) {
+    public static ThreadPoolTaskExecutor newThreadPoolTaskExecutor(final String threadNamePrefix) {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(Runtime.getRuntime().availableProcessors());
         executor.setThreadNamePrefix(threadNamePrefix);
@@ -17,31 +31,13 @@ public static ThreadPoolTaskExecutor newThreadPoolTaskExecutor(
     }
 
     public static ThreadPoolTaskExecutor newThreadPoolTaskExecutor(
-        String threadNamePrefix,
-        int poolSize
+            final String threadNamePrefix,
+            final int poolSize
     ) {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(poolSize);
         executor.setThreadNamePrefix(threadNamePrefix);
         executor.initialize();
         return executor;
     }
-
-    // TODO remove this
-    public static ThreadPoolTaskExecutor singleThreadWithFixedSizeQueue(
-        int queueSize,
-        String threadNamePrefix
-    ) {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(1);
-        executor.setMaxPoolSize(1);
-        executor.setKeepAliveSeconds(0);
-        executor.setQueueCapacity(queueSize);
-        executor.setThreadNamePrefix(threadNamePrefix);
-        // Discard silently when we add a task
-        //  to the already-full queue.
-        executor.setRejectedExecutionHandler(new DiscardPolicy());
-        executor.initialize();
-        return executor;
-    }
 }

…/com/iexec/core/task/TaskTestsUtils.java …/test/java/com/iexec/core/TestUtils.javasrc/test/java/com/iexec/core/task/TaskTestsUtils.java renamed to src/test/java/com/iexec/core/TestUtils.java src/test/java/com/iexec/core/task/TaskTestsUtils.java renamed to src/test/java/com/iexec/core/TestUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2021-2025 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.
@@ -14,22 +14,28 @@
  * limitations under the License.
  */
 
-package com.iexec.core.task;
+package com.iexec.core;
 
 import com.iexec.commons.poco.tee.TeeUtils;
 import com.iexec.commons.poco.utils.BytesUtils;
+import com.iexec.core.task.Task;
+import com.iexec.core.task.TaskStatus;
+import com.iexec.core.task.TaskStatusChange;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 
-public class TaskTestsUtils {
-    public static final String WALLET_WORKER_1 = "0x1a69b2eb604db8eba185df03ea4f5288dcbbd248";
-    public static final String WALLET_WORKER_2 = "0x2a69b2eb604db8eba185df03ea4f5288dcbbd248";
-
+public class TestUtils {
     public static final String CHAIN_DEAL_ID = "0xd82223e5feff6720792ffed1665e980da95e5d32b177332013eaba8edc07f31c";
     public static final String CHAIN_TASK_ID = "0x65bc5e94ed1486b940bd6cc0013c418efad58a0a52a3d08cee89faaa21970426";
 
+    public static final String WORKER_ADDRESS = "0x87ae2b87b5db23830572988fb1f51242fbc471ce";
+    public static final String WALLET_WORKER_1 = "0x1a69b2eb604db8eba185df03ea4f5288dcbbd248";
+    public static final String WALLET_WORKER_2 = "0x2ab2674aa374fe6415d11f0a8fcbd8027fc1e6a9";
+    public static final String WALLET_WORKER_3 = "0x3a3406e69adf886c442ff1791cbf67cea679275d";
+    public static final String WALLET_WORKER_4 = "0x4aef50214110fdad4e8b9128347f2ba1ec72f614";
+
     public static final String DAPP_NAME = "dappName";
     public static final String COMMAND_LINE = "commandLine";
     public static final String NO_TEE_TAG = BytesUtils.EMPTY_HEX_STRING_32;

src/test/java/com/iexec/core/chain/DealWatcherServiceTests.java

@@ -52,7 +52,7 @@
 
 import static com.iexec.commons.poco.tee.TeeUtils.TEE_GRAMINE_ONLY_TAG;
 import static com.iexec.commons.poco.tee.TeeUtils.TEE_SCONE_ONLY_TAG;
-import static com.iexec.core.task.TaskTestsUtils.NO_TEE_TAG;
+import static com.iexec.core.TestUtils.NO_TEE_TAG;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 

src/test/java/com/iexec/core/chain/IexecHubServiceTests.java

@@ -37,15 +37,15 @@
 import java.util.function.BiFunction;
 import java.util.stream.Stream;
 
-import static com.iexec.commons.poco.utils.TestUtils.CHAIN_TASK_ID;
-import static com.iexec.commons.poco.utils.TestUtils.WORKER_ADDRESS;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 class IexecHubServiceTests {
 
+    private static final String CHAIN_TASK_ID = "0x1111111111111111111111111111111111111111111111111111111111111111";
+    private static final String WORKER_ADDRESS = "0x1a69b2eb604db8eba185df03ea4f5288dcbbd248";
     private static final String TRANSACTION_HASH = "transactionHash";
 
     @Mock

src/test/java/com/iexec/core/chain/WebSocketBlockchainListenerTests.java

@@ -86,7 +86,7 @@ private static String getServiceUrl(String serviceHost, int servicePort) {
     @Test
     void shouldConnect() {
         await().atMost(10L, TimeUnit.SECONDS)
-                .until(() -> Objects.requireNonNull(meterRegistry.find(LATEST_BLOCK_METRIC_NAME).gauge()).value() != 0.0);
+                .until(() -> web3jService.getLatestBlockNumber() != 0 && metricService.getPlatformMetrics().getLatestBlockMetric() != null);
         final Long latestBlockNumber = (long) Objects.requireNonNull(meterRegistry.find(LATEST_BLOCK_METRIC_NAME).gauge()).value();
         assertThat(latestBlockNumber).isEqualTo(web3jService.getLatestBlockNumber());
         assertThat(metricService.getPlatformMetrics())

src/test/java/com/iexec/core/detector/replicate/ReplicateResultUploadTimeoutDetectorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 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.
@@ -38,18 +38,14 @@
 import java.util.Optional;
 
 import static com.iexec.common.replicate.ReplicateStatus.RESULT_UPLOAD_FAILED;
+import static com.iexec.core.TestUtils.*;
 import static com.iexec.core.task.TaskStatus.RESULT_UPLOADING;
-import static com.iexec.core.task.TaskTestsUtils.CHAIN_TASK_ID;
-import static com.iexec.core.task.TaskTestsUtils.getStubTask;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
 
 class ReplicateResultUploadTimeoutDetectorTests {
 
-    private static final String WALLET_WORKER_1 = "0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860";
-    private static final String WALLET_WORKER_2 = "0x748e091bf16048cb5103E0E10F9D5a8b7fBDd861";
-
     @Mock
     private TaskService taskService;
 

src/test/java/com/iexec/core/detector/replicate/RevealTimeoutDetectorTests.java

@@ -36,17 +36,13 @@
 import java.util.Date;
 import java.util.List;
 
+import static com.iexec.core.TestUtils.*;
 import static com.iexec.core.task.TaskStatus.*;
-import static com.iexec.core.task.TaskTestsUtils.CHAIN_TASK_ID;
-import static com.iexec.core.task.TaskTestsUtils.getStubTask;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 class RevealTimeoutDetectorTests {
 
-    private static final String WALLET_WORKER_1 = "0x1a69b2eb604db8eba185df03ea4f5288dcbbd248";
-    private static final String WALLET_WORKER_2 = "0x1a69b2eb604db8eba185df03ea4f5288dcbbd249";
-
     @Mock
     private TaskService taskService;
 

src/test/java/com/iexec/core/detector/task/ConsensusReachedTaskDetectorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 IEXEC BLOCKCHAIN TECH
+ * Copyright 2024-2025 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.
@@ -41,8 +41,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import static com.iexec.core.task.TaskTestsUtils.CHAIN_TASK_ID;
-import static com.iexec.core.task.TaskTestsUtils.getStubTask;
+import static com.iexec.core.TestUtils.CHAIN_TASK_ID;
+import static com.iexec.core.TestUtils.getStubTask;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.*;