Skip to content

Commit 830723f

Browse files
authored
Remove /tasks/{chainTaskId} endpoint, the adapter must only call initialize and finalize PoCo methods (#130)
1 parent 66accf5 commit 830723f

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/vNEXT) 2024
66

7+
### Bug Fixes
8+
9+
- Remove `/tasks/{chainTaskId}` endpoint, the adapter must only call `initialize` and `finalize` **PoCo** methods. (#130)
10+
711
## [[8.3.0]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.3.0) 2024-01-10
812

913
### New Features

iexec-blockchain-adapter-api-library/src/main/java/com/iexec/blockchain/api/BlockchainAdapterApiClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
2020
import com.iexec.common.config.PublicChainConfig;
2121
import com.iexec.common.sdk.broker.BrokerOrder;
22-
import com.iexec.commons.poco.chain.ChainTask;
2322
import feign.Param;
2423
import feign.RequestLine;
2524

@@ -41,9 +40,6 @@ public interface BlockchainAdapterApiClient {
4140
@RequestLine("GET /metrics")
4241
String getMetrics();
4342

44-
@RequestLine("GET /tasks/{chainTaskId}")
45-
ChainTask getTask(@Param("chainTaskId") String chainTaskId);
46-
4743
@RequestLine("POST /tasks/initialize?chainDealId={chainDealId}&taskIndex={taskIndex}")
4844
String requestInitializeTask(@Param("chainDealId") String chainDealId,
4945
@Param("taskIndex") int taskIndex);

src/main/java/com/iexec/blockchain/command/task/TaskController.java

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2021-2024 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@
1919
import com.iexec.blockchain.api.CommandStatus;
2020
import com.iexec.blockchain.command.task.finalize.TaskFinalizeService;
2121
import com.iexec.blockchain.command.task.initialize.TaskInitializeService;
22-
import com.iexec.blockchain.tool.IexecHubService;
2322
import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
24-
import com.iexec.commons.poco.chain.ChainTask;
2523
import io.swagger.v3.oas.annotations.Operation;
2624
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
2725
import org.springframework.http.ResponseEntity;
@@ -33,33 +31,14 @@
3331
@RequestMapping("/tasks")
3432
public class TaskController {
3533

36-
private final IexecHubService iexecHubService;
3734
private final TaskInitializeService taskInitializeService;
3835
private final TaskFinalizeService taskFinalizeService;
3936

40-
public TaskController(IexecHubService iexecHubService,
41-
TaskInitializeService taskInitializeService,
42-
TaskFinalizeService taskFinalizeService) {
43-
this.iexecHubService = iexecHubService;
37+
public TaskController(TaskInitializeService taskInitializeService, TaskFinalizeService taskFinalizeService) {
4438
this.taskInitializeService = taskInitializeService;
4539
this.taskFinalizeService = taskFinalizeService;
4640
}
4741

48-
/**
49-
* Read task metadata on the blockchain.
50-
*
51-
* @param chainTaskId blockchain ID of the task
52-
* @return task metadata
53-
*/
54-
@Operation(security = @SecurityRequirement(name = SWAGGER_BASIC_AUTH))
55-
@GetMapping("/{chainTaskId}")
56-
public ResponseEntity<ChainTask> getTask(
57-
@PathVariable String chainTaskId) {
58-
return iexecHubService.getChainTask(chainTaskId)
59-
.map(ResponseEntity::ok)
60-
.orElse(ResponseEntity.notFound().build());
61-
}
62-
6342
/**
6443
* Start the asynchronous `initialize task` blockchain remote call.
6544
*

0 commit comments

Comments
 (0)