Skip to content

Commit 2f1b212

Browse files
ehsavoieehsavoie
committed
Updating and renaming all JSON-RPC method names to the new standard.
Signed-off-by: Emmanuel Hugonnet <[email protected]>
1 parent 7247303 commit 2f1b212

File tree

13 files changed

+34
-34
lines changed

13 files changed

+34
-34
lines changed

‎client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JsonMessages.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public class JsonMessages {
165165
static final String SEND_MESSAGE_TEST_REQUEST = """
166166
{
167167
"jsonrpc":"2.0",
168-
"method":"message/send",
168+
"method":"SendMessage",
169169
"params":{
170170
"message":{
171171
"messageId":"message-1234",
@@ -214,7 +214,7 @@ public class JsonMessages {
214214
static final String SEND_MESSAGE_TEST_REQUEST_WITH_MESSAGE_RESPONSE = """
215215
{
216216
"jsonrpc":"2.0",
217-
"method":"message/send",
217+
"method":"SendMessage",
218218
"params":{
219219
"message":{
220220
"messageId":"message-1234",
@@ -263,7 +263,7 @@ public class JsonMessages {
263263
static final String SEND_MESSAGE_WITH_ERROR_TEST_REQUEST = """
264264
{
265265
"jsonrpc":"2.0",
266-
"method":"message/send",
266+
"method":"SendMessage",
267267
"params":{
268268
"message":{
269269
"messageId":"message-1234",
@@ -303,7 +303,7 @@ public class JsonMessages {
303303
static final String GET_TASK_TEST_REQUEST = """
304304
{
305305
"jsonrpc":"2.0",
306-
"method":"tasks/get",
306+
"method":"GetTask",
307307
"params":{
308308
"name":"tasks/de38c76d-d54c-436c-8b9f-4c2703648d64",
309309
"historyLength":10
@@ -363,7 +363,7 @@ public class JsonMessages {
363363
static final String CANCEL_TASK_TEST_REQUEST = """
364364
{
365365
"jsonrpc":"2.0",
366-
"method":"tasks/cancel",
366+
"method":"CancelTask",
367367
"params":{
368368
"name":"tasks/de38c76d-d54c-436c-8b9f-4c2703648d64"
369369
}
@@ -389,7 +389,7 @@ public class JsonMessages {
389389
static final String GET_TASK_PUSH_NOTIFICATION_CONFIG_TEST_REQUEST = """
390390
{
391391
"jsonrpc":"2.0",
392-
"method":"tasks/pushNotificationConfig/get",
392+
"method":"GetTaskPushNotificationConfig",
393393
"params":{
394394
"name":"tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs"
395395
}
@@ -413,7 +413,7 @@ public class JsonMessages {
413413
static final String SET_TASK_PUSH_NOTIFICATION_CONFIG_TEST_REQUEST = """
414414
{
415415
"jsonrpc":"2.0",
416-
"method":"tasks/pushNotificationConfig/set",
416+
"method":"SetTaskPushNotificationConfig",
417417
"params":{
418418
"name":"tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs",
419419
"pushNotificationConfig":{
@@ -445,7 +445,7 @@ public class JsonMessages {
445445
static final String SEND_MESSAGE_WITH_FILE_PART_TEST_REQUEST = """
446446
{
447447
"jsonrpc":"2.0",
448-
"method":"message/send",
448+
"method":"SendMessage",
449449
"params":{
450450
"message":{
451451
"messageId":"message-1234-with-file",
@@ -509,7 +509,7 @@ public class JsonMessages {
509509
static final String SEND_MESSAGE_WITH_DATA_PART_TEST_REQUEST = """
510510
{
511511
"jsonrpc":"2.0",
512-
"method":"message/send",
512+
"method":"SendMessage",
513513
"params":{
514514
"message":{
515515
"messageId":"message-1234-with-data",
@@ -577,7 +577,7 @@ public class JsonMessages {
577577
static final String SEND_MESSAGE_WITH_MIXED_PARTS_TEST_REQUEST = """
578578
{
579579
"jsonrpc":"2.0",
580-
"method":"message/send",
580+
"method":"SendMessage",
581581
"params":{
582582
"message":{
583583
"messageId":"message-1234-with-mixed",
@@ -651,7 +651,7 @@ public class JsonMessages {
651651
static final String GET_AUTHENTICATED_EXTENDED_AGENT_CARD_REQUEST = """
652652
{
653653
"jsonrpc": "2.0",
654-
"method": "agent/getAuthenticatedExtendedCard"
654+
"method": "GetExtendedAgentCard"
655655
}
656656
""";
657657

‎client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JsonStreamingMessages.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class JsonStreamingMessages {
108108
public static final String SEND_MESSAGE_STREAMING_TEST_REQUEST = """
109109
{
110110
"jsonrpc":"2.0",
111-
"method":"message/stream",
111+
"method":"SendStreamingMessage",
112112
"params":{
113113
"message":{
114114
"messageId":"message-1234",

‎client/transport/spi/src/test/java/io/a2a/client/transport/spi/interceptors/auth/AuthInterceptorTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private void testSecurityScheme(AuthTestCase authTestCase) {
138138
ClientCallContext context = new ClientCallContext(Map.of("sessionId", authTestCase.sessionId), Map.of());
139139

140140
PayloadAndHeaders result = authInterceptor.intercept(
141-
"message/send",
141+
"SendMessage",
142142
requestPayload,
143143
headers,
144144
agentCard,
@@ -155,7 +155,7 @@ void testAuthInterceptorWithoutAgentCard() {
155155
Map<String, String> headers = Map.of("foo", "bar");
156156

157157
PayloadAndHeaders result = authInterceptor.intercept(
158-
"message/send",
158+
"SendMessage",
159159
requestPayload,
160160
headers,
161161
null, // no agent card
@@ -207,7 +207,7 @@ void testCustomInterceptor() {
207207
Map<String, String> headers = Map.of();
208208

209209
PayloadAndHeaders result = interceptor.intercept(
210-
"message/send",
210+
"SendMessage",
211211
payload,
212212
headers,
213213
null,
@@ -245,7 +245,7 @@ void testAvailableSecuritySchemeNotInAgentCardSecuritySchemes() {
245245
ClientCallContext context = new ClientCallContext(Map.of("sessionId", sessionId), Map.of());
246246

247247
PayloadAndHeaders result = authInterceptor.intercept(
248-
"message/send",
248+
"SendMessage",
249249
requestPayload,
250250
headers,
251251
agentCard,
@@ -267,7 +267,7 @@ void testNoCredentialAvailable() {
267267
ClientCallContext context = new ClientCallContext(Map.of("sessionId", "session-id"), Map.of());
268268

269269
PayloadAndHeaders result = authInterceptor.intercept(
270-
"message/send",
270+
"SendMessage",
271271
requestPayload,
272272
headers,
273273
agentCard,
@@ -298,7 +298,7 @@ void testNoAgentCardSecuritySpecified() {
298298
ClientCallContext context = new ClientCallContext(Map.of("sessionId", "session-id"), Map.of());
299299

300300
PayloadAndHeaders result = authInterceptor.intercept(
301-
"message/send",
301+
"SendMessage",
302302
requestPayload,
303303
headers,
304304
agentCard,

‎spec/src/main/java/io/a2a/spec/CancelTaskRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@JsonIgnoreProperties(ignoreUnknown = true)
3333
public final class CancelTaskRequest extends NonStreamingJSONRPCRequest<TaskIdParams> {
3434

35-
public static final String METHOD = "tasks/cancel";
35+
public static final String METHOD = "CancelTask";
3636

3737
@JsonCreator
3838
public CancelTaskRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,

‎spec/src/main/java/io/a2a/spec/DeleteTaskPushNotificationConfigRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@JsonIgnoreProperties(ignoreUnknown = true)
2828
public final class DeleteTaskPushNotificationConfigRequest extends NonStreamingJSONRPCRequest<DeleteTaskPushNotificationConfigParams> {
2929

30-
public static final String METHOD = "tasks/pushNotificationConfig/delete";
30+
public static final String METHOD = "DeleteTaskPushNotificationConfig";
3131

3232
@JsonCreator
3333
public DeleteTaskPushNotificationConfigRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,

‎spec/src/main/java/io/a2a/spec/GetAuthenticatedExtendedCardRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
@JsonIgnoreProperties(ignoreUnknown = true)
3939
public final class GetAuthenticatedExtendedCardRequest extends NonStreamingJSONRPCRequest<Void> {
4040

41-
public static final String METHOD = "agent/getAuthenticatedExtendedCard";
41+
public static final String METHOD = "GetExtendedAgentCard";
4242

4343
@JsonCreator
4444
public GetAuthenticatedExtendedCardRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,

‎spec/src/main/java/io/a2a/spec/GetTaskPushNotificationConfigRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@JsonIgnoreProperties(ignoreUnknown = true)
2727
public final class GetTaskPushNotificationConfigRequest extends NonStreamingJSONRPCRequest<GetTaskPushNotificationConfigParams> {
2828

29-
public static final String METHOD = "tasks/pushNotificationConfig/get";
29+
public static final String METHOD = "GetTaskPushNotificationConfig";
3030

3131
@JsonCreator
3232
public GetTaskPushNotificationConfigRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,

‎spec/src/main/java/io/a2a/spec/GetTaskRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@JsonIgnoreProperties(ignoreUnknown = true)
3030
public final class GetTaskRequest extends NonStreamingJSONRPCRequest<TaskQueryParams> {
3131

32-
public static final String METHOD = "tasks/get";
32+
public static final String METHOD = "GetTask";
3333

3434
@JsonCreator
3535
public GetTaskRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,
@@ -57,7 +57,7 @@ public GetTaskRequest(Object id, TaskQueryParams params) {
5757
public static class Builder {
5858
private String jsonrpc;
5959
private Object id;
60-
private String method = "tasks/get";
60+
private String method = "GetTask";
6161
private TaskQueryParams params;
6262

6363
public GetTaskRequest.Builder jsonrpc(String jsonrpc) {

‎spec/src/main/java/io/a2a/spec/ListTaskPushNotificationConfigRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@JsonIgnoreProperties(ignoreUnknown = true)
2828
public final class ListTaskPushNotificationConfigRequest extends NonStreamingJSONRPCRequest<ListTaskPushNotificationConfigParams> {
2929

30-
public static final String METHOD = "tasks/pushNotificationConfig/list";
30+
public static final String METHOD = "ListTaskPushNotificationConfig";
3131

3232
@JsonCreator
3333
public ListTaskPushNotificationConfigRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,

‎spec/src/main/java/io/a2a/spec/ListTasksRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@JsonIgnoreProperties(ignoreUnknown = true)
1919
public final class ListTasksRequest extends NonStreamingJSONRPCRequest<ListTasksParams> {
2020

21-
public static final String METHOD = "tasks/list";
21+
public static final String METHOD = "ListTask";
2222

2323
@JsonCreator
2424
public ListTasksRequest(@JsonProperty("jsonrpc") String jsonrpc, @JsonProperty("id") Object id,

0 commit comments

Comments
 (0)