Remove unversioned /tasks REST endpoints which are deprecated

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file.
 
 - Use no more `iexec-commons-poco` deprecated code in integration tests. (#163)
 
+### Breaking API changes
+
+- Remove unversioned /tasks REST endpoints which are deprecated. (#164)
+
 ### Dependency Upgrades
 
 - Upgrade to `eclipse-temurin:17.0.13_11-jre-focal`. (#162)

src/main/java/com/iexec/blockchain/command/task/TaskController.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.
@@ -27,16 +27,16 @@
 
 import static com.iexec.blockchain.swagger.OpenApiConfig.SWAGGER_BASIC_AUTH;
 
-/**
- * @deprecated Call /v1/tasks endpoints in {@code TaskControllerV1}
- */
-@Deprecated(forRemoval = true)
 @RestController
-@RequestMapping("/tasks")
-public class TaskController extends TaskControllerV1 {
+@RequestMapping("/v1/tasks")
+public class TaskController {
+
+    private final TaskInitializeService taskInitializeService;
+    private final TaskFinalizeService taskFinalizeService;
 
     public TaskController(TaskInitializeService taskInitializeService, TaskFinalizeService taskFinalizeService) {
-        super(taskInitializeService, taskFinalizeService);
+        this.taskInitializeService = taskInitializeService;
+        this.taskFinalizeService = taskFinalizeService;
     }
 
     /**
@@ -46,13 +46,15 @@ public TaskController(TaskInitializeService taskInitializeService, TaskFinalizeS
      * @param taskIndex   index of the task int the bag
      * @return blockchain task ID if successful
      */
-    @Override
     @Operation(security = @SecurityRequirement(name = SWAGGER_BASIC_AUTH))
     @PostMapping("/initialize")
-    public ResponseEntity<String> requestInitializeTask(
-            @RequestParam String chainDealId,
-            @RequestParam int taskIndex) {
-        return super.requestInitializeTask(chainDealId, taskIndex);
+    public ResponseEntity<String> requestInitializeTask(@RequestParam String chainDealId,
+                                                        @RequestParam int taskIndex) {
+        String chainTaskId = taskInitializeService.start(chainDealId, taskIndex);
+        if (!chainTaskId.isEmpty()) {
+            return ResponseEntity.ok(chainTaskId);
+        }
+        return ResponseEntity.badRequest().build();
     }
 
     /**
@@ -61,12 +63,12 @@ public ResponseEntity<String> requestInitializeTask(
      * @param chainTaskId blockchain ID of the task
      * @return status
      */
-    @Override
     @Operation(security = @SecurityRequirement(name = SWAGGER_BASIC_AUTH))
     @GetMapping("/initialize/{chainTaskId}/status")
-    public ResponseEntity<CommandStatus> getStatusForInitializeTaskRequest(
-            @PathVariable String chainTaskId) {
-        return super.getStatusForInitializeTaskRequest(chainTaskId);
+    public ResponseEntity<CommandStatus> getStatusForInitializeTaskRequest(@PathVariable String chainTaskId) {
+        return taskInitializeService.getStatusForCommand(chainTaskId)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
     }
 
     /**
@@ -76,13 +78,14 @@ public ResponseEntity<CommandStatus> getStatusForInitializeTaskRequest(
      * @param args        input arguments for `finalize task`
      * @return blockchain task ID if successful
      */
-    @Override
     @Operation(security = @SecurityRequirement(name = SWAGGER_BASIC_AUTH))
     @PostMapping("/finalize/{chainTaskId}")
-    public ResponseEntity<String> requestFinalizeTask(
-            @PathVariable String chainTaskId,
-            @RequestBody TaskFinalizeArgs args) {
-        return super.requestFinalizeTask(chainTaskId, args);
+    public ResponseEntity<String> requestFinalizeTask(@PathVariable String chainTaskId,
+                                                      @RequestBody TaskFinalizeArgs args) {
+        if (!taskFinalizeService.start(chainTaskId, args.getResultLink(), args.getCallbackData()).isEmpty()) {
+            return ResponseEntity.ok(chainTaskId);
+        }
+        return ResponseEntity.badRequest().build();
     }
 
     /**
@@ -91,12 +94,12 @@ public ResponseEntity<String> requestFinalizeTask(
      * @param chainTaskId blockchain ID of the task
      * @return status
      */
-    @Override
     @Operation(security = @SecurityRequirement(name = SWAGGER_BASIC_AUTH))
     @GetMapping("/finalize/{chainTaskId}/status")
-    public ResponseEntity<CommandStatus> getStatusForFinalizeTaskRequest(
-            @PathVariable String chainTaskId) {
-        return super.getStatusForFinalizeTaskRequest(chainTaskId);
+    public ResponseEntity<CommandStatus> getStatusForFinalizeTaskRequest(@PathVariable String chainTaskId) {
+        return taskFinalizeService.getStatusForCommand(chainTaskId)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
     }
 
 }

src/test/java/com/iexec/blockchain/command/task/TaskControllerV1Tests.java → src/test/java/com/iexec/blockchain/command/task/TaskControllerTests.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.
@@ -35,7 +35,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class TaskControllerV1Tests {
+class TaskControllerTests {
 
     private static final String CHAIN_DEAL_ID = "0x1";
     private static final int TASK_INDEX = 0;
@@ -46,7 +46,7 @@ class TaskControllerV1Tests {
     @Mock
     private TaskFinalizeService taskFinalizeService;
     @InjectMocks
-    private TaskControllerV1 taskController;
+    private TaskController taskController;
 
     // region requestInitializeTask
     @Test