Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue: Return 404 instead of 2xx codes for methods handling non-existent tasks#38 #69

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix issue: Return 404 instead of 2xx codes for methods handling non-existent tasks#38 #69

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb4eaea
Fix issue #38: Return 404 instead of 2xx codes for methods handling n…
vamshiGML Feb 11, 2024
9f25ce6
Fix issue #38: Return 404 instead of 2xx codes for methods handling n…
vamshiGML Feb 11, 2024
58abdd5
Fix issue #38: Return 404 instead of 2xx codes for methods handling n…
vamshiGML Feb 11, 2024
828bc5a
Using NotFoundException when entity is not found #38
vamshiGML Feb 15, 2024
8bf7e90
Using NotFoundException when entity is not found
vamshiGML Feb 15, 2024
b47d627
Fix issue #38 : Return 204 instead of 404 for /poll endpoints handli…
vamshiGML Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions rest/src/main/java/com/netflix/conductor/rest/controllers/TaskResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.Map;
import java.util.Optional;

import com.netflix.conductor.core.exception.NotFoundException;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
Expand Down Expand Up @@ -71,8 +72,8 @@ public ResponseEntity<List<Task>> batchPoll(
@RequestParam(value = "count", defaultValue = "1") int count,
@RequestParam(value = "timeout", defaultValue = "100") int timeout) {
// for backwards compatibility with 2.x client which expects a 204 when no Task is found
return Optional.ofNullable(
taskService.batchPoll(taskType, workerId, domain, count, timeout))
return Optional.ofNullable(taskService.batchPoll(taskType, workerId, domain, count, timeout))
.filter(tasks -> !tasks.isEmpty())
.map(ResponseEntity::ok)
.orElse(ResponseEntity.noContent().build());
}
Expand Down Expand Up @@ -103,8 +104,11 @@ public void log(@PathVariable("taskId") String taskId, @RequestBody String log)

@GetMapping("/{taskId}/log")
@Operation(summary = "Get Task Execution Logs")
public List<TaskExecLog> getTaskLogs(@PathVariable("taskId") String taskId) {
return taskService.getTaskLogs(taskId);
public ResponseEntity<List<TaskExecLog>> getTaskLogs(@PathVariable("taskId") String taskId) {
vgopari marked this conversation as resolved.
Show resolved Hide resolved
return Optional.ofNullable(taskService.getTaskLogs(taskId))
.filter(logs -> !logs.isEmpty())
.map(ResponseEntity::ok)
.orElseThrow(() -> new NotFoundException("Task logs not found for taskId: %s", taskId));
}

@GetMapping("/{taskId}")
Expand All @@ -113,7 +117,7 @@ public ResponseEntity<Task> getTask(@PathVariable("taskId") String taskId) {
// for backwards compatibility with 2.x client which expects a 204 when no Task is found
return Optional.ofNullable(taskService.getTask(taskId))
.map(ResponseEntity::ok)
.orElse(ResponseEntity.noContent().build());
.orElseThrow(() -> new NotFoundException("Task not found for taskId: %s", taskId));
}

@GetMapping("/queue/sizes")
Expand Down