Skip to content

Commit 18b5d1d

Browse files
authored
fix: Add optional name to FilePart (a2aproject#1091)
fix: Add optional name to FilePart\ Despite the v0.3 proto in the spec not having this, the spec text mentions this field. So although it is a bit wooly whether we should support this or not, we have added this for leniency. Fixes a2aproject#1083
1 parent e795969 commit 18b5d1d

100 files changed

Lines changed: 1706 additions & 1024 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎compat-0.3/client/transport/rest/src/test/java/org/a2aproject/sdk/compat03/client/transport/rest/JsonRestMessages_v0_3.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,15 @@ public class JsonRestMessages_v0_3 {
8888
{
8989
"file": {
9090
"file_with_uri": "file:///path/to/file.txt",
91-
"mimeType": "text/plain"
91+
"mimeType": "text/plain",
92+
"name": "file.txt"
9293
}
9394
},
9495
{
9596
"file": {
9697
"file_with_bytes": "aGVsbG8=",
97-
"mimeType": "text/plain"
98+
"mimeType": "text/plain",
99+
"name": "greeting.txt"
98100
}
99101
}
100102
],

‎compat-0.3/client/transport/rest/src/test/java/org/a2aproject/sdk/compat03/client/transport/rest/RestTransport_v0_3_Test.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,12 @@ public void testGetTask() throws Exception {
221221
assertEquals(Kind.FILE, ((FilePart_v0_3) history.parts().get(1)).kind());
222222
FilePart_v0_3 part = (FilePart_v0_3) history.parts().get(1);
223223
assertEquals("text/plain", part.file().mimeType());
224+
assertEquals("file.txt", part.file().name());
224225
assertEquals("file:///path/to/file.txt", ((FileWithUri_v0_3) part.file()).uri());
225226
part = (FilePart_v0_3) history.parts().get(2);
226227
assertEquals(Kind.FILE, part.kind());
227228
assertEquals("text/plain", part.file().mimeType());
229+
assertEquals("greeting.txt", part.file().name());
228230
assertEquals("hello", ((FileWithBytes_v0_3) part.file()).bytes());
229231
assertNull(history.metadata());
230232
assertNull(history.referenceTaskIds());
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package org.a2aproject.sdk.compat03.conversion.mappers.domain;
2+
3+
import org.a2aproject.sdk.compat03.spec.FileWithBytes_v0_3;
4+
import org.a2aproject.sdk.compat03.spec.FileWithUri_v0_3;
5+
import org.a2aproject.sdk.spec.FileContent;
6+
import org.a2aproject.sdk.spec.FileWithBytes;
7+
import org.a2aproject.sdk.spec.FileWithUri;
8+
import org.junit.jupiter.api.Test;
9+
10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
12+
13+
class FileContentMapper_v0_3_Test {
14+
15+
@Test
16+
void fileWithBytesToV10PreservesName() {
17+
FileWithBytes_v0_3 v03 = new FileWithBytes_v0_3("image/png", "photo.png", "aGVsbG8=");
18+
FileContent v10 = FileContentMapper_v0_3.INSTANCE.toV10(v03);
19+
FileWithBytes result = assertInstanceOf(FileWithBytes.class, v10);
20+
assertEquals("image/png", result.mimeType());
21+
assertEquals("photo.png", result.name());
22+
assertEquals("aGVsbG8=", result.bytes());
23+
}
24+
25+
@Test
26+
void fileWithUriToV10PreservesName() {
27+
FileWithUri_v0_3 v03 = new FileWithUri_v0_3("text/plain", "readme.txt", "file:///path/to/readme.txt");
28+
FileContent v10 = FileContentMapper_v0_3.INSTANCE.toV10(v03);
29+
FileWithUri result = assertInstanceOf(FileWithUri.class, v10);
30+
assertEquals("text/plain", result.mimeType());
31+
assertEquals("readme.txt", result.name());
32+
assertEquals("file:///path/to/readme.txt", result.uri());
33+
}
34+
35+
@Test
36+
void fileWithBytesFromV10PreservesName() {
37+
FileWithBytes v10 = new FileWithBytes("image/png", "photo.png", "aGVsbG8=");
38+
FileWithBytes_v0_3 result = assertInstanceOf(FileWithBytes_v0_3.class, FileContentMapper_v0_3.INSTANCE.fromV10(v10));
39+
assertEquals("image/png", result.mimeType());
40+
assertEquals("photo.png", result.name());
41+
assertEquals("aGVsbG8=", result.bytes());
42+
}
43+
44+
@Test
45+
void fileWithUriFromV10PreservesName() {
46+
FileWithUri v10 = new FileWithUri("text/plain", "readme.txt", "file:///path/to/readme.txt");
47+
FileWithUri_v0_3 result = assertInstanceOf(FileWithUri_v0_3.class, FileContentMapper_v0_3.INSTANCE.fromV10(v10));
48+
assertEquals("text/plain", result.mimeType());
49+
assertEquals("readme.txt", result.name());
50+
assertEquals("file:///path/to/readme.txt", result.uri());
51+
}
52+
53+
@Test
54+
void nullNameInV03BecomesEmptyStringInV10() {
55+
FileWithBytes_v0_3 v03 = new FileWithBytes_v0_3("image/png", null, "aGVsbG8=");
56+
FileWithBytes result = assertInstanceOf(FileWithBytes.class, FileContentMapper_v0_3.INSTANCE.toV10(v03));
57+
assertEquals("", result.name());
58+
}
59+
}

‎compat-0.3/spec-grpc/src/main/java/org/a2aproject/sdk/compat03/grpc/A2A.java‎

Lines changed: 185 additions & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compat-0.3/spec-grpc/src/main/java/org/a2aproject/sdk/compat03/grpc/A2AServiceGrpc.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ private static abstract class A2AServiceBaseDescriptorSupplier
12651265

12661266
@java.lang.Override
12671267
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
1268-
return A2A.getDescriptor();
1268+
return org.a2aproject.sdk.compat03.grpc.A2A.getDescriptor();
12691269
}
12701270

12711271
@java.lang.Override

‎compat-0.3/spec-grpc/src/main/java/org/a2aproject/sdk/compat03/grpc/APIKeySecurityScheme.java‎

Lines changed: 24 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compat-0.3/spec-grpc/src/main/java/org/a2aproject/sdk/compat03/grpc/APIKeySecuritySchemeOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compat-0.3/spec-grpc/src/main/java/org/a2aproject/sdk/compat03/grpc/AgentCapabilities.java‎

Lines changed: 33 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compat-0.3/spec-grpc/src/main/java/org/a2aproject/sdk/compat03/grpc/AgentCapabilitiesOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)