Skip to content

feat!: Trim io.a2a.apec package #556

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

Merged
ehsavoie merged 9 commits into from
Dec 19, 2025
Merged

feat!: Trim io.a2a.apec package #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c21baf8
Move JSONRPC stuff to new module
kabir Dec 18, 2025
3bad340
Rename internal module
kabir Dec 19, 2025
d0ccb61
Move classes to new packages to reflect new module name
kabir Dec 19, 2025
9d1911f
Organise imports since we moved a lot of things
kabir Dec 19, 2025
ccb34ad
Add package-info
kabir Dec 19, 2025
f408a68
Make A2AError extend RuntimeException instead of Error
kabir Dec 19, 2025
2956a15
refactor: centralize A2A method names in A2AMethods interface
ehsavoie Dec 19, 2025
994f5f8
Merge pull request #5 from ehsavoie/api-cleanup
kabir Dec 19, 2025
dd14744
Update methodname for Rest interceptors getAgentCards() to be GET_EXT…
kabir Dec 19, 2025
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
5 changes: 5 additions & 0 deletions boms/sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<artifactId>a2a-java-sdk-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-jsonrpc-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-http-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client/base/src/main/java/io/a2a/client/AbstractClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import java.util.function.Consumer;

import io.a2a.client.transport.spi.interceptors.ClientCallContext;
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
import io.a2a.spec.A2AClientException;
import io.a2a.spec.AgentCard;
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
import io.a2a.spec.GetTaskPushNotificationConfigParams;
import io.a2a.spec.ListTaskPushNotificationConfigParams;
import io.a2a.spec.ListTaskPushNotificationConfigResult;
import io.a2a.spec.ListTasksParams;
import io.a2a.spec.ListTasksResult;
import io.a2a.spec.Message;
import io.a2a.spec.PushNotificationConfig;
import io.a2a.spec.Task;
Expand Down
9 changes: 4 additions & 5 deletions client/base/src/main/java/io/a2a/client/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package io.a2a.client;

import static io.a2a.util.Assert.checkNotNullParam;

import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;

import io.a2a.client.config.ClientConfig;
import io.a2a.client.transport.spi.interceptors.ClientCallContext;
import io.a2a.client.transport.spi.ClientTransport;
import io.a2a.client.transport.spi.interceptors.ClientCallContext;
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
import io.a2a.spec.A2AClientError;
import io.a2a.spec.A2AClientException;
import io.a2a.spec.A2AClientInvalidStateError;
Expand All @@ -18,7 +21,6 @@
import io.a2a.spec.ListTaskPushNotificationConfigParams;
import io.a2a.spec.ListTaskPushNotificationConfigResult;
import io.a2a.spec.ListTasksParams;
import io.a2a.spec.ListTasksResult;
import io.a2a.spec.Message;
import io.a2a.spec.MessageSendConfiguration;
import io.a2a.spec.MessageSendParams;
Expand All @@ -30,9 +32,6 @@
import io.a2a.spec.TaskPushNotificationConfig;
import io.a2a.spec.TaskQueryParams;
import io.a2a.spec.TaskStatusUpdateEvent;

import static io.a2a.util.Assert.checkNotNullParam;

import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;

Expand Down
18 changes: 9 additions & 9 deletions client/base/src/main/java/io/a2a/client/ClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
package io.a2a.client;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.function.BiConsumer;
import java.util.function.Consumer;

import io.a2a.client.config.ClientConfig;
import io.a2a.client.transport.spi.ClientTransport;
import io.a2a.client.transport.spi.ClientTransportConfig;
Expand All @@ -9,15 +18,6 @@
import io.a2a.spec.AgentCard;
import io.a2a.spec.AgentInterface;
import io.a2a.spec.TransportProtocol;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;

Expand Down
4 changes: 2 additions & 2 deletions client/base/src/main/java/io/a2a/client/config/ClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.a2a.client.config;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import io.a2a.spec.PushNotificationConfig;
import java.util.ArrayList;
import java.util.HashMap;
import org.jspecify.annotations.Nullable;

/**
Expand Down
14 changes: 7 additions & 7 deletions client/base/src/test/java/io/a2a/A2ATest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package io.a2a;

import io.a2a.spec.Message;
import io.a2a.spec.Part;
import io.a2a.spec.TextPart;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import io.a2a.spec.Message;
import io.a2a.spec.Part;
import io.a2a.spec.TextPart;
import org.junit.jupiter.api.Test;

public class A2ATest {

Expand Down
5 changes: 5 additions & 0 deletions client/transport/grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-spec</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-jsonrpc-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-spec-grpc</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/EventStreamObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.a2a.client.transport.grpc;


import io.a2a.grpc.StreamResponse;
import io.a2a.spec.StreamingEventKind;
import io.grpc.stub.StreamObserver;
import static io.a2a.grpc.utils.ProtoUtils.FromProto;

import java.util.function.Consumer;
import java.util.logging.Logger;

import static io.a2a.grpc.utils.ProtoUtils.FromProto;
import io.a2a.grpc.StreamResponse;
import io.a2a.spec.StreamingEventKind;
import io.grpc.stub.StreamObserver;

public class EventStreamObserver implements StreamObserver<StreamResponse> {

Expand Down
50 changes: 22 additions & 28 deletions client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
package io.a2a.client.transport.grpc;

import static io.a2a.spec.A2AMethods.CANCEL_TASK_METHOD;
import static io.a2a.spec.A2AMethods.DELETE_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
import static io.a2a.spec.A2AMethods.GET_TASK_METHOD;
import static io.a2a.spec.A2AMethods.GET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
import static io.a2a.spec.A2AMethods.LIST_TASK_METHOD;
import static io.a2a.spec.A2AMethods.LIST_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
import static io.a2a.spec.A2AMethods.SEND_MESSAGE_METHOD;
import static io.a2a.spec.A2AMethods.SEND_STREAMING_MESSAGE_METHOD;
import static io.a2a.spec.A2AMethods.SET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD;
import static io.a2a.spec.A2AMethods.SUBSCRIBE_TO_TASK_METHOD;
import static io.a2a.util.Assert.checkNotNullParam;

import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Collectors;

import io.a2a.client.transport.spi.interceptors.ClientCallContext;
import io.a2a.client.transport.spi.ClientTransport;
import io.a2a.client.transport.spi.interceptors.ClientCallContext;
import io.a2a.client.transport.spi.interceptors.ClientCallInterceptor;
import io.a2a.client.transport.spi.interceptors.PayloadAndHeaders;
import io.a2a.client.transport.spi.interceptors.auth.AuthInterceptor;
Expand All @@ -18,27 +28,17 @@
import io.a2a.grpc.A2AServiceGrpc.A2AServiceStub;
import io.a2a.grpc.utils.ProtoUtils.FromProto;
import io.a2a.grpc.utils.ProtoUtils.ToProto;
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
import io.a2a.spec.A2AClientException;
import io.a2a.spec.AgentCard;
import io.a2a.spec.CancelTaskRequest;
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
import io.a2a.spec.DeleteTaskPushNotificationConfigRequest;
import io.a2a.spec.EventKind;
import io.a2a.spec.GetTaskPushNotificationConfigParams;
import io.a2a.spec.GetTaskPushNotificationConfigRequest;
import io.a2a.spec.GetTaskRequest;
import io.a2a.spec.ListTaskPushNotificationConfigParams;
import io.a2a.spec.ListTaskPushNotificationConfigRequest;
import io.a2a.spec.ListTaskPushNotificationConfigResult;
import io.a2a.spec.ListTasksParams;
import io.a2a.spec.ListTasksRequest;
import io.a2a.spec.ListTasksResult;
import io.a2a.spec.MessageSendParams;
import io.a2a.spec.SendMessageRequest;
import io.a2a.spec.SendStreamingMessageRequest;
import io.a2a.spec.SetTaskPushNotificationConfigRequest;
import io.a2a.spec.StreamingEventKind;
import io.a2a.spec.SubscribeToTaskRequest;
import io.a2a.spec.Task;
import io.a2a.spec.TaskIdParams;
import io.a2a.spec.TaskPushNotificationConfig;
Expand Down Expand Up @@ -95,7 +95,7 @@ public EventKind sendMessage(MessageSendParams request, @Nullable ClientCallCont
MessageSendParams tenantRequest = createRequestWithTenant(request);

io.a2a.grpc.SendMessageRequest sendMessageRequest = createGrpcSendMessageRequest(tenantRequest, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendMessageRequest.METHOD, sendMessageRequest,
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SEND_MESSAGE_METHOD, sendMessageRequest,
agentCard, context);

try {
Expand All @@ -121,7 +121,7 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
MessageSendParams tenantRequest = createRequestWithTenant(request);

io.a2a.grpc.SendMessageRequest grpcRequest = createGrpcSendMessageRequest(tenantRequest, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendStreamingMessageRequest.METHOD,
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SEND_STREAMING_MESSAGE_METHOD,
grpcRequest, agentCard, context);
StreamObserver<io.a2a.grpc.StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);

Expand All @@ -143,7 +143,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
}
requestBuilder.setTenant(resolveTenant(request.tenant()));
io.a2a.grpc.GetTaskRequest getTaskRequest = requestBuilder.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskRequest.METHOD, getTaskRequest,
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GET_TASK_METHOD, getTaskRequest,
agentCard, context);

try {
Expand All @@ -162,8 +162,7 @@ public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context
.setName("tasks/" + request.id())
.setTenant(resolveTenant(request.tenant()))
.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CancelTaskRequest.METHOD, cancelTaskRequest,
agentCard, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CANCEL_TASK_METHOD, cancelTaskRequest, agentCard, context);

try {
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
Expand Down Expand Up @@ -201,8 +200,7 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
}
requestBuilder.setTenant(resolveTenant(request.tenant()));
io.a2a.grpc.ListTasksRequest listTasksRequest = requestBuilder.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTasksRequest.METHOD, listTasksRequest,
agentCard, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(LIST_TASK_METHOD, listTasksRequest, agentCard, context);

try {
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
Expand Down Expand Up @@ -233,8 +231,7 @@ public TaskPushNotificationConfig setTaskPushNotificationConfiguration(TaskPushN
.setConfigId(configId != null ? configId : request.taskId())
.setTenant(resolveTenant(request.tenant()))
.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SetTaskPushNotificationConfigRequest.METHOD,
grpcRequest, agentCard, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD, grpcRequest, agentCard, context);

try {
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
Expand All @@ -254,8 +251,7 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(
.setName(getTaskPushNotificationConfigName(request))
.setTenant(resolveTenant(request.tenant()))
.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskPushNotificationConfigRequest.METHOD,
grpcRequest, agentCard, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GET_TASK_PUSH_NOTIFICATION_CONFIG_METHOD, grpcRequest, agentCard, context);

try {
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
Expand All @@ -277,7 +273,7 @@ public ListTaskPushNotificationConfigResult listTaskPushNotificationConfiguratio
.setPageSize(request.pageSize())
.setPageToken(request.pageToken())
.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTaskPushNotificationConfigRequest.METHOD,
PayloadAndHeaders payloadAndHeaders = applyInterceptors(LIST_TASK_PUSH_NOTIFICATION_CONFIG_METHOD,
grpcRequest, agentCard, context);

try {
Expand All @@ -298,8 +294,7 @@ public void deleteTaskPushNotificationConfigurations(DeleteTaskPushNotificationC
.setName(getTaskPushNotificationConfigName(request.id(), request.pushNotificationConfigId()))
.setTenant(resolveTenant(request.tenant()))
.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(DeleteTaskPushNotificationConfigRequest.METHOD,
grpcRequest, agentCard, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(DELETE_TASK_PUSH_NOTIFICATION_CONFIG_METHOD, grpcRequest, agentCard, context);

try {
A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
Expand All @@ -319,8 +314,7 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
.setTenant(resolveTenant(request.tenant()))
.setName("tasks/" + request.id())
.build();
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SubscribeToTaskRequest.METHOD,
grpcRequest, agentCard, context);
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SUBSCRIBE_TO_TASK_METHOD, grpcRequest, agentCard, context);

StreamObserver<io.a2a.grpc.StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);

Expand Down
4 changes: 2 additions & 2 deletions client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransportConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.a2a.client.transport.grpc;

import java.util.function.Function;

import io.a2a.client.transport.spi.ClientTransportConfig;
import io.a2a.util.Assert;
import io.grpc.Channel;

import java.util.function.Function;

public class GrpcTransportConfig extends ClientTransportConfig<GrpcTransport> {

private final Function<String, Channel> channelFactory;
Expand Down
5 changes: 2 additions & 3 deletions ...transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransportConfigBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package io.a2a.client.transport.grpc;

import java.util.function.Function;

import io.a2a.client.transport.spi.ClientTransportConfigBuilder;
import io.a2a.util.Assert;
import io.grpc.Channel;

import java.util.function.Function;

import org.jspecify.annotations.Nullable;

public class GrpcTransportConfigBuilder extends ClientTransportConfigBuilder<GrpcTransportConfig, GrpcTransportConfigBuilder> {
Expand Down
5 changes: 5 additions & 0 deletions client/transport/jsonrpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-spec</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-jsonrpc-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-spec-grpc</artifactId>
Expand Down
Loading