Merge branch 'main' into dependabot/maven/quarkus-0c0756794a

Author: ehsavoie

.github/workflows/create-github-release.yml

@@ -31,6 +31,7 @@ jobs:
         id: release_notes
         uses: actions/github-script@v9
         with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const version = '${{ steps.version.outputs.version }}';
 
@@ -88,6 +89,7 @@ jobs:
       - name: Create GitHub Release
         uses: actions/github-script@v9
         with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const version = '${{ steps.version.outputs.version }}';
             const tag = context.ref.replace('refs/tags/', '');

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

@@ -22,6 +22,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -36,6 +37,7 @@
 import org.a2aproject.sdk.client.transport.spi.interceptors.ClientCallContext;
 import org.a2aproject.sdk.client.transport.spi.interceptors.ClientCallInterceptor;
 import org.a2aproject.sdk.client.transport.spi.interceptors.PayloadAndHeaders;
+import org.a2aproject.sdk.grpc.utils.ProtoJsonUtils;
 import org.a2aproject.sdk.grpc.utils.ProtoUtils;
 import org.a2aproject.sdk.jsonrpc.common.json.JsonProcessingException;
 import org.a2aproject.sdk.jsonrpc.common.json.JsonUtil;
@@ -431,19 +433,24 @@ private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders)
         A2AHttpClient.PostBuilder builder = createPostBuilder(url, payloadAndHeaders);
         A2AHttpResponse response = builder.post();
         if (!response.success()) {
-            log.fine("Error on POST processing " + JsonFormat.printer().print((MessageOrBuilder) payloadAndHeaders.getPayload()));
+            if (log.isLoggable(Level.FINE)) {
+                log.fine("Error on POST processing " + ProtoJsonUtils.toJson(JsonFormat.printer(), (MessageOrBuilder) payloadAndHeaders.getPayload()));
+            }
             throw RestErrorMapper.mapRestError(response);
         }
         return response.body();
     }
 
     private A2AHttpClient.PostBuilder createPostBuilder(String url, PayloadAndHeaders payloadAndHeaders) throws JsonProcessingException, InvalidProtocolBufferException {
-        log.fine(JsonFormat.printer().print((MessageOrBuilder) payloadAndHeaders.getPayload()));
+        String body = ProtoJsonUtils.toJson(JsonFormat.printer(), (MessageOrBuilder) payloadAndHeaders.getPayload());
+        if (log.isLoggable(Level.FINE)) {
+            log.fine(body);
+        }
         A2AHttpClient.PostBuilder postBuilder = httpClient.createPost()
                 .url(url)
                 .addHeader("Content-Type", "application/json")
                 .addHeader(A2AHeaders.A2A_VERSION, AgentInterface.CURRENT_PROTOCOL_VERSION)
-                .body(JsonFormat.printer().print((MessageOrBuilder) payloadAndHeaders.getPayload()));
+                .body(body);
 
         if (payloadAndHeaders.getHeaders() != null) {
             for (Map.Entry<String, String> entry : payloadAndHeaders.getHeaders().entrySet()) {

common/pom.xml

@@ -21,6 +21,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

common/src/main/java/org/a2aproject/sdk/common/A2AErrorMessages.java

@@ -1,11 +1,13 @@
 package org.a2aproject.sdk.common;
 
+/** Standard error message constants for A2A authentication and authorization failures. */
 public final class A2AErrorMessages {
 
     private A2AErrorMessages() {
-        // Prevent instantiation
     }
 
+    /** Error message returned when client credentials are missing or invalid. */
     public static final String AUTHENTICATION_FAILED = "Authentication failed: Client credentials are missing or invalid";
+    /** Error message returned when the client lacks permission for the requested operation. */
     public static final String AUTHORIZATION_FAILED = "Authorization failed: Client does not have permission for the operation";
 }

common/src/main/java/org/a2aproject/sdk/common/MediaType.java

@@ -1,6 +1,8 @@
 package org.a2aproject.sdk.common;
 
+/** Common MIME type constants. */
 public interface MediaType {
 
+    /** MIME type for JSON content: {@code application/json}. */
     String APPLICATION_JSON = "application/json";
 }

common/src/main/java/org/a2aproject/sdk/common/package-info.java

@@ -1,3 +1,4 @@
+/** Common shared types and constants for the A2A SDK. */
 @NullMarked
 package org.a2aproject.sdk.common;
 

common/src/main/java/org/a2aproject/sdk/util/Assert.java

@@ -2,8 +2,12 @@
 
 import org.jspecify.annotations.Nullable;
 
+/** Parameter validation utilities. */
 public final class Assert {
 
+    private Assert() {
+    }
+
     /**
      * Check that the named parameter is not {@code null}.  Use a standard exception message if it is.
      *
@@ -27,6 +31,12 @@ private static <T> void checkNotNullParamChecked(final String name, final @Nulla
         }
     }
 
+    /**
+     * Validates that the given value is a legal JSON-RPC id ({@code null}, {@code String}, or {@code Number}).
+     *
+     * @param value the id value to validate
+     * @throws IllegalArgumentException if the value is not a valid JSON-RPC id type
+     */
     public static void isValidJsonRpcId(@Nullable Object value) {
         if (! (value == null || value instanceof String || value instanceof Number)) {
             throw new IllegalArgumentException("JSON-RPC id must be null, a String, or a Number");

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

@@ -0,0 +1,31 @@
+package org.a2aproject.sdk.util;
+
+/**
+ * Utilities for removing HTML escaping applied by Gson's {@code JsonWriter}
+ * when {@code htmlSafe} is enabled (the default).
+ */
+public final class HtmlEscapeUtils {
+
+    private HtmlEscapeUtils() {
+    }
+
+    /**
+     * Removes HTML escaping applied by Gson's {@code JsonWriter} when
+     * {@code htmlSafe} is enabled (the default). Restores literal
+     * {@code <}, {@code >}, {@code &}, {@code =}, and {@code '}.
+     * <p>
+     * Gson also escapes U+2028 (line separator) and U+2029 (paragraph separator) in HTML-safe
+     * mode, but those are left as-is because they are valid JSON encodings that preserve the
+     * original characters without data corruption.
+     *
+     * @param json the JSON string potentially containing HTML-escaped sequences
+     * @return the JSON string with literal characters restored
+     */
+    public static String removeHtmlEscaping(String json) {
+        return json.replace("\\u003c", "<")
+                .replace("\\u003e", ">")
+                .replace("\\u0026", "&")
+                .replace("\\u003d", "=")
+                .replace("\\u0027", "'");
+    }
+}

common/src/main/java/org/a2aproject/sdk/util/NotNull.java

@@ -9,5 +9,6 @@
 @Retention(RetentionPolicy.CLASS)
 @Target({ ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD, ElementType.PARAMETER })
 @Documented
+/** Marks an element as non-null for static analysis. */
 public @interface NotNull {
 }

common/src/main/java/org/a2aproject/sdk/util/package-info.java

@@ -1,3 +1,4 @@
+/** General-purpose utilities for the A2A SDK. */
 @NullMarked
 package org.a2aproject.sdk.util;