Reactivating JSpecify

Signed-off-by: Emmanuel Hugonnet <[email protected]>

Author: ehsavoie

http-client/src/main/java/io/a2a/client/http/A2ACardResolver.java

@@ -135,7 +135,7 @@ public AgentCard getAgentCard() throws A2AClientError, A2AClientJSONError {
 
         try {
             io.a2a.grpc.AgentCard.Builder agentCardBuilder = io.a2a.grpc.AgentCard.newBuilder();
-            JSONRPCUtils.parseJsonString(body, agentCardBuilder, null);
+            JSONRPCUtils.parseJsonString(body, agentCardBuilder, "");
             return ProtoUtils.FromProto.agentCard(agentCardBuilder);
         } catch (A2AError | JsonProcessingException e) {
             throw new A2AClientJSONError("Could not unmarshal agent card response", e);

http-client/src/test/java/io/a2a/client/http/A2ACardResolverTest.java

@@ -82,7 +82,7 @@ public void testGetAgentCardSuccess() throws Exception {
 
     private AgentCard unmarshalFrom(String body) throws JsonProcessingException {
         io.a2a.grpc.AgentCard.Builder agentCardBuilder = io.a2a.grpc.AgentCard.newBuilder();
-        JSONRPCUtils.parseJsonString(body, agentCardBuilder, null);
+        JSONRPCUtils.parseJsonString(body, agentCardBuilder, "");
         return ProtoUtils.FromProto.agentCard(agentCardBuilder);
     }
 

internal/src/main/java/io/a2a/internal/json/IdJsonMappingException.java

@@ -8,7 +8,7 @@ public class IdJsonMappingException extends JsonMappingException {
     /**
      * The JSON-RPC request ID associated with this exception.
      */
-    Object id;
+    private Object id;
 
     /**
      * Constructs exception with message and ID.

pom.xml

@@ -68,11 +68,8 @@
         <logback.version>1.5.18</logback.version>
         <error-prone.version>2.45.0</error-prone.version>
         <nullaway.version>0.12.14</nullaway.version>
-<!--
-TODO Reenable this!!!!
         <error-prone.flag>-XDaddTypeAnnotationsToSymbol=true</error-prone.flag>
         <nullaway.args>-Xplugin:ErrorProne -XepDisableAllChecks -Xep:NullAway:ERROR -Xep:RequireExplicitNullMarking:WARN -XepOpt:NullAway:ExhaustiveOverride=true -XepOpt:NullAway:OnlyNullMarked=true -XepOpt:NullAway:JSpecifyMode=true -XepExcludedPaths:.*/src/test/.* -XepDisableWarningsInGeneratedCode</nullaway.args>
--->
 
         <!-- Redirect test output to file -->
         <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -354,8 +351,6 @@ TODO Reenable this!!!!
                             <arg>${nullaway.args}</arg>
                         </compilerArgs>
                         <annotationProcessorPaths>
-<!--
-TODO Reenable this!!!!!!
                             <path>
                                 <groupId>com.google.errorprone</groupId>
                                 <artifactId>error_prone_core</artifactId>
@@ -366,7 +361,6 @@ TODO Reenable this!!!!!!
                                 <artifactId>nullaway</artifactId>
                                 <version>${nullaway.version}</version>
                             </path>
--->
                             <path>
                                 <groupId>org.mapstruct</groupId>
                                 <artifactId>mapstruct-processor</artifactId>
@@ -567,10 +561,7 @@ TODO Reenable this!!!!!!
                 <error-prone.version>2.42.0</error-prone.version>
                 <nullaway.version>0.12.10</nullaway.version>
                 <error-prone.flag></error-prone.flag>
-<!--
-    TODO Reenable this!!!
                 <nullaway.args>-Xplugin:ErrorProne -XepDisableAllChecks -Xep:NullAway:ERROR -XepOpt:NullAway:OnlyNullMarked=true -XepOpt:NullAway:JSpecifyMode=true -XepExcludedPaths:.*/src/test/.* -XepDisableWarningsInGeneratedCode</nullaway.args>
--->
                 <quarkus.jvm.args></quarkus.jvm.args>
             </properties>
         </profile>

spec-grpc/src/main/java/io/a2a/grpc/utils/JSONRPCUtils.java

@@ -68,6 +68,7 @@
 import static io.a2a.spec.A2AErrorCodes.UNSUPPORTED_OPERATION_ERROR_CODE;
 
 import io.a2a.internal.json.JsonProcessingException;
+import io.a2a.util.Utils;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -176,11 +177,10 @@ public static A2ARequest<?> parseRequestBody(String body) throws JsonMappingExce
         Object id = getAndValidateId(jsonRpc);
         String method = jsonRpc.get("method").getAsString();
         JsonElement paramsNode = jsonRpc.get("params");
-
         try {
             return parseMethodRequest(version, id, method, paramsNode);
         } catch (InvalidParamsError e) {
-            throw new InvalidParamsJsonMappingException(e.getMessage(), id);
+            throw new InvalidParamsJsonMappingException(Utils.defaultIfNull(e.getMessage(), "Invalid parameters"), id);
         }
     }
 
@@ -390,7 +390,7 @@ protected static void parseRequestBody(JsonElement jsonRpc, com.google.protobuf.
         parseJsonString(jsonRpc.toString(), builder, id);
     }
 
-    public static void parseJsonString(String body, com.google.protobuf.Message.Builder builder, @Nullable Object id) throws JsonProcessingException {
+    public static void parseJsonString(String body, com.google.protobuf.Message.Builder builder, Object id) throws JsonProcessingException {
         try {
             JsonFormat.parser().merge(body, builder);
         } catch (InvalidProtocolBufferException e) {
@@ -424,7 +424,7 @@ public static void parseJsonString(String body, com.google.protobuf.Message.Buil
      * @param id the request ID if it could be extracted, null otherwise
      * @return an appropriate JsonProcessingException subtype based on the error and ID availability
      */
-    private static JsonProcessingException convertProtoBufExceptionToJsonProcessingException(InvalidProtocolBufferException e, @Nullable Object id) {
+    private static JsonProcessingException convertProtoBufExceptionToJsonProcessingException(InvalidProtocolBufferException e, Object id) {
         // Log the original exception for debugging purposes
         log.log(Level.FINE, "Converting protobuf parsing exception to JSON-RPC error. Request ID: {0}", id);
         log.log(Level.FINE, "Original proto exception details", e);
@@ -448,12 +448,12 @@ private static JsonProcessingException convertProtoBufExceptionToJsonProcessingE
         Matcher matcher = EXTRACT_WRONG_TYPE.matcher(message);
         if (matcher.matches() && matcher.group(1) != null) {
             // ID is null -> use empty string sentinel value (see javadoc above)
-            return new InvalidParamsJsonMappingException(ERROR_MESSAGE.formatted(matcher.group(1)), id == null ? "" : id);
+            return new InvalidParamsJsonMappingException(ERROR_MESSAGE.formatted(matcher.group(1)), Utils.defaultIfNull(id, ""));
         }
         matcher = EXTRACT_WRONG_VALUE.matcher(message);
         if (matcher.matches() && matcher.group(1) != null) {
             // ID is null -> use empty string sentinel value (see javadoc above)
-            return new InvalidParamsJsonMappingException(ERROR_MESSAGE.formatted(matcher.group(1)), id == null ? "" : id);
+            return new InvalidParamsJsonMappingException(ERROR_MESSAGE.formatted(matcher.group(1)), Utils.defaultIfNull(id, ""));
         }
 
         // Generic error - couldn't match specific patterns

spec/src/main/java/io/a2a/util/Utils.java

@@ -54,11 +54,8 @@ public class Utils {
      * @param defaultValue the default value to return if value is null
      * @return value if non-null, otherwise defaultValue
      */
-    public static <T> T defaultIfNull(T value, T defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        return value;
+    public static <T> T defaultIfNull(@Nullable T value, T defaultValue) {
+        return value == null ? defaultValue : value;
     }
 
     /**

spec/src/main/java/io/a2a/util/package-info.java

@@ -0,0 +1,5 @@
+@NullMarked
+package io.a2a.util;
+
+import org.jspecify.annotations.NullMarked;
+