fix: fixing the handling of historyLength being set to 0 by default in gRPC (#429)

ehsavoie · web-flow · commit f36db5ee5c25 · 2025-11-03T18:27:38.000Z
* Using int instead of Integer and setting the default value to 0. * If historyLength == 0 then we should return the full history * Removing the handling of null Issue: #423 Fixes #423 🦕 Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
diff --git a/client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransport.java b/client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransport.java
@@ -1,9 +1,5 @@
 package io.a2a.client.transport.grpc;
 
-import static io.a2a.grpc.A2AServiceGrpc.A2AServiceBlockingV2Stub;
-import static io.a2a.grpc.A2AServiceGrpc.A2AServiceStub;
-import static io.a2a.grpc.utils.ProtoUtils.FromProto;
-import static io.a2a.grpc.utils.ProtoUtils.ToProto;
 import static io.a2a.util.Assert.checkNotNullParam;
 
 import java.util.List;
@@ -127,9 +123,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
 
         GetTaskRequest.Builder requestBuilder = GetTaskRequest.newBuilder();
         requestBuilder.setName("tasks/" + request.id());
-        if (request.historyLength() != null) {
-            requestBuilder.setHistoryLength(request.historyLength());
-        }
+        requestBuilder.setHistoryLength(request.historyLength());
         GetTaskRequest getTaskRequest = requestBuilder.build();
         PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.GetTaskRequest.METHOD, getTaskRequest,
                 agentCard, context);
diff --git a/client/transport/rest/src/main/java/io/a2a/client/transport/rest/RestTransport.java b/client/transport/rest/src/main/java/io/a2a/client/transport/rest/RestTransport.java
@@ -125,7 +125,7 @@ public Task getTask(TaskQueryParams taskQueryParams, @Nullable ClientCallContext
                 agentCard, context);
         try {
             String url;
-            if (taskQueryParams.historyLength() != null) {
+            if (taskQueryParams.historyLength() > 0) {
                 url = agentUrl + String.format("/v1/tasks/%1s?historyLength=%2d", taskQueryParams.id(), taskQueryParams.historyLength());
             } else {
                 url = agentUrl + String.format("/v1/tasks/%1s", taskQueryParams.id());
diff --git a/reference/rest/src/main/java/io/a2a/server/rest/quarkus/A2AServerRoutes.java b/reference/rest/src/main/java/io/a2a/server/rest/quarkus/A2AServerRoutes.java
@@ -122,9 +122,9 @@ public void getTask(RoutingContext rc) {
             if (taskId == null || taskId.isEmpty()) {
                 response = jsonRestHandler.createErrorResponse(new InvalidParamsError("bad task id"));
             } else {
-                Integer historyLength = null;
+                int historyLength = 0;
                 if (rc.request().params().contains("history_length")) {
-                    historyLength = Integer.valueOf(rc.request().params().get("history_length"));
+                    historyLength = Integer.parseInt(rc.request().params().get("history_length"));
                 }
                 response = jsonRestHandler.getTask(taskId, historyLength, context);
             }
diff --git a/reference/rest/src/test/java/io/a2a/server/rest/quarkus/A2AServerRoutesTest.java b/reference/rest/src/test/java/io/a2a/server/rest/quarkus/A2AServerRoutesTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -137,15 +138,15 @@ public void testGetTask_MethodNameSetInContext() {
         when(mockHttpResponse.getStatusCode()).thenReturn(200);
         when(mockHttpResponse.getContentType()).thenReturn("application/json");
         when(mockHttpResponse.getBody()).thenReturn("{test:value}");
-        when(mockRestHandler.getTask(anyString(), any(), any(ServerCallContext.class))).thenReturn(mockHttpResponse);
+        when(mockRestHandler.getTask(anyString(), anyInt(), any(ServerCallContext.class))).thenReturn(mockHttpResponse);
 
         ArgumentCaptor<ServerCallContext> contextCaptor = ArgumentCaptor.forClass(ServerCallContext.class);
 
         // Act
         routes.getTask(mockRoutingContext);
 
         // Assert
-        verify(mockRestHandler).getTask(eq("task123"), eq(null), contextCaptor.capture());
+        verify(mockRestHandler).getTask(eq("task123"), anyInt(), contextCaptor.capture());
         ServerCallContext capturedContext = contextCaptor.getValue();
         assertNotNull(capturedContext);
         assertEquals(GetTaskRequest.METHOD, capturedContext.getState().get(METHOD_NAME_KEY));
diff --git a/server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java b/server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java
@@ -19,7 +19,6 @@
 import java.util.function.Supplier;
 
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import io.a2a.server.ServerCallContext;
@@ -34,7 +33,6 @@
 import io.a2a.server.events.TaskQueueExistsException;
 import io.a2a.server.tasks.PushNotificationConfigStore;
 import io.a2a.server.tasks.PushNotificationSender;
-import io.a2a.server.tasks.TaskStateProvider;
 import io.a2a.server.tasks.ResultAggregator;
 import io.a2a.server.tasks.TaskManager;
 import io.a2a.server.tasks.TaskStore;
@@ -103,10 +101,10 @@ public Task onGetTask(TaskQueryParams params, ServerCallContext context) throws
             LOGGER.debug("No task found for {}. Throwing TaskNotFoundError", params.id());
             throw new TaskNotFoundError();
         }
-        if (params.historyLength() != null && task.getHistory() != null && params.historyLength() < task.getHistory().size()) {
+        if (task.getHistory() != null && params.historyLength() < task.getHistory().size()) {
             List<Message> history;
             if (params.historyLength() <= 0) {
-                history = new ArrayList<>();
+                history = task.getHistory();
             } else {
                 history = task.getHistory().subList(
                         task.getHistory().size() - params.historyLength(),
diff --git a/spec/src/main/java/io/a2a/spec/TaskQueryParams.java b/spec/src/main/java/io/a2a/spec/TaskQueryParams.java
@@ -17,20 +17,20 @@
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record TaskQueryParams(String id, @Nullable Integer historyLength, @Nullable Map<String, Object> metadata) {
+public record TaskQueryParams(String id, int historyLength, @Nullable Map<String, Object> metadata) {
 
     public TaskQueryParams {
         Assert.checkNotNullParam("id", id);
-        if (historyLength != null && historyLength < 0) {
+        if (historyLength < 0) {
             throw new IllegalArgumentException("Invalid history length");
         }
     }
 
     public TaskQueryParams(String id) {
-        this(id, null, null);
+        this(id, 0, null);
     }
 
-    public TaskQueryParams(String id, @Nullable Integer historyLength) {
+    public TaskQueryParams(String id, int historyLength) {
         this(id, historyLength, null);
     }
 }
diff --git a/transport/rest/src/main/java/io/a2a/transport/rest/handler/RestHandler.java b/transport/rest/src/main/java/io/a2a/transport/rest/handler/RestHandler.java
@@ -162,7 +162,7 @@ public HTTPRestResponse resubscribeTask(String taskId, ServerCallContext context
         }
     }
 
-    public HTTPRestResponse getTask(String taskId, @Nullable Integer historyLength, ServerCallContext context) {
+    public HTTPRestResponse getTask(String taskId, int historyLength, ServerCallContext context) {
         try {
             TaskQueryParams params = new TaskQueryParams(taskId, historyLength);
             Task task = requestHandler.onGetTask(params, context);
diff --git a/transport/rest/src/test/java/io/a2a/transport/rest/handler/RestHandlerTest.java b/transport/rest/src/test/java/io/a2a/transport/rest/handler/RestHandlerTest.java
@@ -26,7 +26,7 @@ public void testGetTaskSuccess() {
         RestHandler handler = new RestHandler(CARD, requestHandler, internalExecutor);
         taskStore.save(MINIMAL_TASK);
 
-        RestHandler.HTTPRestResponse response = handler.getTask(MINIMAL_TASK.getId(),null,  callContext);
+        RestHandler.HTTPRestResponse response = handler.getTask(MINIMAL_TASK.getId(), 0, callContext);
 
         Assertions.assertEquals(200, response.getStatusCode());
         Assertions.assertEquals("application/json", response.getContentType());
@@ -43,7 +43,7 @@ public void testGetTaskSuccess() {
     public void testGetTaskNotFound() {
         RestHandler handler = new RestHandler(CARD, requestHandler, internalExecutor);
 
-        RestHandler.HTTPRestResponse response = handler.getTask("nonexistent", null, callContext);
+        RestHandler.HTTPRestResponse response = handler.getTask("nonexistent", 0, callContext);
 
         Assertions.assertEquals(404, response.getStatusCode());
         Assertions.assertEquals("application/json", response.getContentType());
@@ -315,7 +315,7 @@ public void testHttpStatusCodeMapping() {
         Assertions.assertEquals(400, response.getStatusCode());
 
         // Test 404 for not found
-        response = handler.getTask("nonexistent", null, callContext);
+        response = handler.getTask("nonexistent", 0, callContext);
         Assertions.assertEquals(404, response.getStatusCode());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,9 @@ public void getTask(RoutingContext rc) {`
`122`	`122`	`if (taskId == null \|\| taskId.isEmpty()) {`
`123`	`123`	`response = jsonRestHandler.createErrorResponse(new InvalidParamsError("bad task id"));`
`124`	`124`	`} else {`
`125`		`- Integer historyLength = null;`
	`125`	`+ int historyLength = 0;`
`126`	`126`	`if (rc.request().params().contains("history_length")) {`
`127`		`- historyLength = Integer.valueOf(rc.request().params().get("history_length"));`
	`127`	`+ historyLength = Integer.parseInt(rc.request().params().get("history_length"));`
`128`	`128`	`}`
`129`	`129`	`response = jsonRestHandler.getTask(taskId, historyLength, context);`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,20 +17,20 @@`
`17`	`17`
`18`	`18`	`@JsonInclude(JsonInclude.Include.NON_ABSENT)`
`19`	`19`	`@JsonIgnoreProperties(ignoreUnknown = true)`
`20`		`-public record TaskQueryParams(String id, @Nullable Integer historyLength, @Nullable Map<String, Object> metadata) {`
	`20`	`+public record TaskQueryParams(String id, int historyLength, @Nullable Map<String, Object> metadata) {`
`21`	`21`
`22`	`22`	`public TaskQueryParams {`
`23`	`23`	`Assert.checkNotNullParam("id", id);`
`24`		`- if (historyLength != null && historyLength < 0) {`
	`24`	`+ if (historyLength < 0) {`
`25`	`25`	`throw new IllegalArgumentException("Invalid history length");`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public TaskQueryParams(String id) {`
`30`		`- this(id, null, null);`
	`30`	`+ this(id, 0, null);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public TaskQueryParams(String id, @Nullable Integer historyLength) {`
	`33`	`+ public TaskQueryParams(String id, int historyLength) {`
`34`	`34`	`this(id, historyLength, null);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public HTTPRestResponse resubscribeTask(String taskId, ServerCallContext context`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`165`		`- public HTTPRestResponse getTask(String taskId, @Nullable Integer historyLength, ServerCallContext context) {`
	`165`	`+ public HTTPRestResponse getTask(String taskId, int historyLength, ServerCallContext context) {`
`166`	`166`	`try {`
`167`	`167`	`TaskQueryParams params = new TaskQueryParams(taskId, historyLength);`
`168`	`168`	`Task task = requestHandler.onGetTask(params, context);`