fix: improve correctness and remove dead code across modules (#954) · a2aproject/a2a-java@12f5808 · GitHub
Skip to content

Commit 12f5808

Browse files
ehsavoieehsavoie
authored
fix: improve correctness and remove dead code across modules (#954)
- Fix null subject handling in server routes: use UnauthenticatedUser instead of AuthenticatedUser with empty string when subject is null - Handle uppercase hex digits in HtmlEscapeUtils unicode unescaping (< in addition to <), with tests - Extract buildPost() in REST transports to serialize the request body once instead of twice (once for logging, once for sending) - Add Message event handling in AuthorizationRequestHandlerDecorator to extract taskId from streaming messages - Remove deprecated A2AClientHTTPError constructors - Remove unused methods and fields: Utils_v0_3.unmarshalFrom(), Utils_v0_3.rethrow(), ServerCallContext.modelConfig, RequestContext.Builder getters, AsyncExecutorProducer.logPoolStats() Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
1 parent 4d746aa commit 12f5808

14 files changed

Lines changed: 59 additions & 96 deletions

File tree

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransport.java‎

Lines changed: 11 additions & 2 deletions

‎common/src/main/java/org/a2aproject/sdk/util/HtmlEscapeUtils.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ private HtmlEscapeUtils() {
1414
* {@code htmlSafe} is enabled (the default). Restores literal
1515
* {@code <}, {@code >}, {@code &}, {@code =}, and {@code '}.
1616
* <p>
17+
* Both lowercase ({@code <}) and uppercase ({@code <}) hex digits are handled,
18+
* as the JSON specification permits either case for unicode escapes.
19+
* <p>
1720
* Gson also escapes U+2028 (line separator) and U+2029 (paragraph separator) in HTML-safe
1821
* mode, but those are left as-is because they are valid JSON encodings that preserve the
1922
* original characters without data corruption.
@@ -22,10 +25,16 @@ private HtmlEscapeUtils() {
2225
* @return the JSON string with literal characters restored
2326
*/
2427
public static String removeHtmlEscaping(String json) {
25-
return json.replace("\\u003c", "<")
26-
.replace("\\u003e", ">")
28+
if (json == null || json.isEmpty()) {
29+
return json;
30+
}
31+
if (!json.contains("\\u00")) {
32+
return json;
33+
}
34+
return json.replace("\\u003c", "<").replace("\\u003C", "<")
35+
.replace("\\u003e", ">").replace("\\u003E", ">")
2736
.replace("\\u0026", "&")
28-
.replace("\\u003d", "=")
37+
.replace("\\u003d", "=").replace("\\u003D", "=")
2938
.replace("\\u0027", "'");
3039
}
3140
}

‎common/src/test/java/org/a2aproject/sdk/util/HtmlEscapeUtilsTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,19 @@ public void removeHtmlEscaping_handlesEmptyString() {
4343
assertEquals("", HtmlEscapeUtils.removeHtmlEscaping(""));
4444
}
4545

46+
@Test
47+
public void removeHtmlEscaping_restoresUppercaseAngleBrackets() {
48+
assertEquals("<event-topic>", HtmlEscapeUtils.removeHtmlEscaping("\\u003Cevent-topic\\u003E"));
49+
}
50+
51+
@Test
52+
public void removeHtmlEscaping_restoresUppercaseEquals() {
53+
assertEquals("a=b", HtmlEscapeUtils.removeHtmlEscaping("a\\u003Db"));
54+
}
55+
56+
@Test
57+
public void removeHtmlEscaping_handlesMixedCase() {
58+
assertEquals("<tag>=value", HtmlEscapeUtils.removeHtmlEscaping("\\u003ctag\\u003E\\u003Dvalue"));
59+
}
60+
4661
}

‎compat-0.3/client/transport/rest/src/main/java/org/a2aproject/sdk/compat03/client/transport/rest/RestTransport_v0_3.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import java.util.concurrent.CompletableFuture;
5757
import java.util.concurrent.atomic.AtomicReference;
5858
import java.util.function.Consumer;
59+
import org.a2aproject.sdk.grpc.utils.ProtoJsonUtils;
5960
import org.jspecify.annotations.Nullable;
6061

6162
public class RestTransport_v0_3 implements ClientTransport_v0_3 {
@@ -374,11 +375,16 @@ private PayloadAndHeaders_v0_3 applyInterceptors(String methodName, @Nullable Me
374375
}
375376

376377
private String sendPostRequest(String url, PayloadAndHeaders_v0_3 payloadAndHeaders) throws IOException, InterruptedException, JsonProcessingException_v0_3 {
377-
A2AHttpClient.PostBuilder builder = createPostBuilder(url, payloadAndHeaders);
378+
MessageOrBuilder payload = (MessageOrBuilder) payloadAndHeaders.getPayload();
379+
String body = payload != null ? ProtoJsonUtils.toJson(JsonFormat.printer(), payload) : "";
380+
if (log.isLoggable(Level.FINE)) {
381+
log.fine(body);
382+
}
383+
A2AHttpClient.PostBuilder builder = buildPost(url, payloadAndHeaders, body);
378384
A2AHttpResponse response = builder.post();
379385
if (!response.success()) {
380386
if (log.isLoggable(Level.FINE)) {
381-
log.fine("Error on POST processing " + ProtoJsonUtils_v0_3.toJson(JsonFormat.printer(), (MessageOrBuilder) payloadAndHeaders.getPayload()));
387+
log.fine("Error on POST processing " + body);
382388
}
383389
throw RestErrorMapper_v0_3.mapRestError(response);
384390
}
@@ -390,6 +396,10 @@ private A2AHttpClient.PostBuilder createPostBuilder(String url, PayloadAndHeader
390396
if (log.isLoggable(Level.FINE)) {
391397
log.fine(body);
392398
}
399+
return buildPost(url, payloadAndHeaders, body);
400+
}
401+
402+
private A2AHttpClient.PostBuilder buildPost(String url, PayloadAndHeaders_v0_3 payloadAndHeaders, String body) throws JsonProcessingException_v0_3 {
393403
A2AHttpClient.PostBuilder postBuilder = httpClient.createPost()
394404
.url(url)
395405
.addHeader("Content-Type", "application/json")

‎compat-0.3/reference/jsonrpc/src/main/java/org/a2aproject/sdk/compat03/server/apps/quarkus/A2AServerRoutes_v0_3.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private ServerCallContext createCallContext(RoutingContext rc) {
300300
user = UnauthenticatedUser.INSTANCE;
301301
} else {
302302
String subject = rc.user().subject();
303-
user = new AuthenticatedUser(subject != null ? subject : "");
303+
user = subject != null ? new AuthenticatedUser(subject) : UnauthenticatedUser.INSTANCE;
304304
}
305305
Map<String, Object> state = new HashMap<>();
306306

‎compat-0.3/reference/rest/src/main/java/org/a2aproject/sdk/compat03/server/rest/quarkus/A2AServerRoutes_v0_3.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ private ServerCallContext createCallContext(RoutingContext rc, String jsonRpcMet
408408
user = UnauthenticatedUser.INSTANCE;
409409
} else {
410410
String subject = rc.user().subject();
411-
user = new AuthenticatedUser(subject != null ? subject : "");
411+
user = subject != null ? new AuthenticatedUser(subject) : UnauthenticatedUser.INSTANCE;
412412
}
413413
Map<String, Object> state = new HashMap<>();
414414

‎compat-0.3/spec/src/main/java/org/a2aproject/sdk/compat03/util/Utils_v0_3.java‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import com.google.gson.Gson;
76
import org.a2aproject.sdk.compat03.json.JsonProcessingException_v0_3;
87
import org.a2aproject.sdk.compat03.json.JsonUtil_v0_3;
98

@@ -24,35 +23,18 @@
2423
* <p>
2524
* Key capabilities:
2625
* <ul>
27-
* <li>JSON processing with pre-configured {@link Gson}</li>
26+
* <li>JSON serialization via {@link #toJsonString(Object)}</li>
2827
* <li>Null-safe value defaults via {@link #defaultIfNull(Object, Object)}</li>
2928
* <li>Artifact streaming support via {@link #appendArtifactToTask(Task_v0_3, TaskArtifactUpdateEvent_v0_3, String)}</li>
30-
* <li>Type-safe exception rethrowing via {@link #rethrow(Throwable)}</li>
3129
* </ul>
3230
*
33-
* @see Gson for JSON processing
3431
* @see TaskArtifactUpdateEvent_v0_3 for streaming artifact updates
3532
*/
3633
public class Utils_v0_3 {
3734

3835

3936
private static final Logger log = Logger.getLogger(Utils_v0_3.class.getName());
4037

41-
/**
42-
* Deserializes JSON string into a typed object using Gson.
43-
* <p>
44-
* This method uses the pre-configured {@link JsonUtil_v0_3#OBJECT_MAPPER} to parse JSON.
45-
*
46-
* @param <T> the target type
47-
* @param data JSON string to deserialize
48-
* @param typeRef class reference specifying the target type
49-
* @return deserialized object of type T
50-
* @throws JsonProcessingException_v0_3 if JSON parsing fails
51-
*/
52-
public static <T> T unmarshalFrom(String data, Class<T> typeRef) throws JsonProcessingException_v0_3 {
53-
return JsonUtil_v0_3.fromJson(data, typeRef);
54-
}
55-
5638
public static String toJsonString(Object data) {
5739
try {
5840
return JsonUtil_v0_3.toJson(data);
@@ -68,10 +50,6 @@ public static <T> T defaultIfNull(T value, T defaultValue) {
6850
return value;
6951
}
7052

71-
public static <T extends Throwable> void rethrow(Throwable t) throws T {
72-
throw (T) t;
73-
}
74-
7553
/**
7654
* Appends or updates an artifact in a task based on a {@link TaskArtifactUpdateEvent_v0_3}.
7755
* <p>

‎reference/jsonrpc/src/main/java/org/a2aproject/sdk/server/apps/quarkus/A2AServerRoutes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ private ServerCallContext createCallContext(RoutingContext rc) {
559559
user = UnauthenticatedUser.INSTANCE;
560560
} else {
561561
String subject = rc.user().subject();
562-
user = new AuthenticatedUser(subject != null ? subject : "");
562+
user = subject != null ? new AuthenticatedUser(subject) : UnauthenticatedUser.INSTANCE;
563563
}
564564
Map<String, Object> state = new HashMap<>();
565565
// TODO Python's impl has

‎reference/rest/src/main/java/org/a2aproject/sdk/server/rest/quarkus/A2AServerRoutes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ private ServerCallContext createCallContext(RoutingContext rc, String jsonRpcMet
890890
user = UnauthenticatedUser.INSTANCE;
891891
} else {
892892
String subject = rc.user().subject();
893-
user = new AuthenticatedUser(subject != null ? subject : "");
893+
user = subject != null ? new AuthenticatedUser(subject) : UnauthenticatedUser.INSTANCE;
894894
}
895895
Map<String, Object> state = new HashMap<>();
896896

‎server-common/src/main/java/org/a2aproject/sdk/server/ServerCallContext.java‎

Lines changed: 0 additions & 2 deletions

0 commit comments

Comments
 (0)