impl(gax-httpjson): return empty ErrorDetails for all parsing problems and localize catches

Author: westarle

gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonErrorParser.java

@@ -35,6 +35,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.TypeRegistry;
 import com.google.protobuf.util.JsonFormat;
@@ -94,28 +95,37 @@ static ErrorDetails parseErrorDetails(String errorJson) {
       return ErrorDetails.builder().build();
     }
 
+    JsonElement jsonElement;
     try {
-      JsonObject root = JsonParser.parseString(errorJson).getAsJsonObject();
-      if (!root.has("error")) {
-        return ErrorDetails.builder().build();
-      }
+      jsonElement = JsonParser.parseString(errorJson);
+    } catch (JsonSyntaxException e) {
+      return ErrorDetails.builder().build();
+    }
 
-      JsonElement errorElement = root.get("error");
-      if (!errorElement.isJsonObject()) {
-        return ErrorDetails.builder().build();
-      }
+    if (!jsonElement.isJsonObject()) {
+      return ErrorDetails.builder().build();
+    }
+    JsonObject root = jsonElement.getAsJsonObject();
+    if (!root.has("error")) {
+      return ErrorDetails.builder().build();
+    }
 
-      Status.Builder statusBuilder = Status.newBuilder();
-      JSON_PARSER.merge(errorElement.toString(), statusBuilder);
-      Status status = statusBuilder.build();
+    JsonElement errorElement = root.get("error");
+    if (!errorElement.isJsonObject()) {
+      return ErrorDetails.builder().build();
+    }
 
-      ErrorDetails.Builder errorDetailsBuilder = ErrorDetails.builder();
-      errorDetailsBuilder.setRawErrorMessages(status.getDetailsList());
-      return errorDetailsBuilder.build();
+    Status.Builder statusBuilder = Status.newBuilder();
+    try {
+      JSON_PARSER.merge(errorElement.toString(), statusBuilder);
     } catch (InvalidProtocolBufferException e) {
-      throw new RuntimeException("Failed to parse Google Cloud error response", e);
-    } catch (Exception e) {
-      throw new RuntimeException("Unexpected error during Google Cloud error parsing", e);
+      // Return empty details on parsing failure
+      return ErrorDetails.builder().build();
     }
+
+    Status status = statusBuilder.build();
+    ErrorDetails.Builder errorDetailsBuilder = ErrorDetails.builder();
+    errorDetailsBuilder.setRawErrorMessages(status.getDetailsList());
+    return errorDetailsBuilder.build();
   }
 }

gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonErrorParserTest.java

@@ -92,8 +92,7 @@ void parseErrorDetails_emptyPayload() {
 
   @Test
   void parseErrorDetails_invalidJson() {
-    Assertions.assertThrows(
-        RuntimeException.class, () -> HttpJsonErrorParser.parseErrorDetails("{invalid"));
+    assertThat(HttpJsonErrorParser.parseErrorDetails("{invalid").getErrorInfo()).isNull();
   }
 
   @Test