Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

import java.time.Instant;
import java.time.format.DateTimeParseException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.concurrent.Flow;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Instance;
Expand Down Expand Up @@ -208,7 +210,21 @@ public HTTPRestResponse listTasks(@Nullable String contextId, @Nullable String s
paramsBuilder.contextId(contextId);
}
if (status != null) {
paramsBuilder.status(TaskState.valueOf(status));
try {
paramsBuilder.status(TaskState.fromString(status));
} catch (IllegalArgumentException e) {
try {
paramsBuilder.status(TaskState.valueOf(status));
} catch (IllegalArgumentException valueOfError) {
String validStates = Arrays.stream(TaskState.values())
.map(TaskState::asString)
.collect(Collectors.joining(", "));
Map<String, Object> errorData = new HashMap<>();
errorData.put("parameter", "status");
errorData.put("reason", "Must be one of: " + validStates);
throw new InvalidParamsError(null, "Invalid params", errorData);
}
}
}
if (pageSize != null) {
paramsBuilder.pageSize(pageSize);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,31 @@ public void testGetTaskNotFound() {
Assertions.assertTrue(response.getBody().contains("TaskNotFoundError"));
}

@Test
public void testListTasksStatusWireString() {
RestHandler handler = new RestHandler(CARD, requestHandler, internalExecutor);
taskStore.save(MINIMAL_TASK);

RestHandler.HTTPRestResponse response = handler.listTasks(null, "submitted", null, null,
null, null, null, "", callContext);

Assertions.assertEquals(200, response.getStatusCode());
Assertions.assertEquals("application/json", response.getContentType());
Assertions.assertTrue(response.getBody().contains(MINIMAL_TASK.id()));
}

@Test
public void testListTasksInvalidStatus() {
RestHandler handler = new RestHandler(CARD, requestHandler, internalExecutor);

RestHandler.HTTPRestResponse response = handler.listTasks(null, "not-a-status", null, null,
null, null, null, "", callContext);

Assertions.assertEquals(422, response.getStatusCode());
Assertions.assertEquals("application/json", response.getContentType());
Assertions.assertTrue(response.getBody().contains("InvalidParamsError"));
}

@Test
public void testSendMessage() throws InvalidProtocolBufferException {
RestHandler handler = new RestHandler(CARD, requestHandler, internalExecutor);
Expand Down