For consistency with the current format of the error reasons, logic is added to map them from UPPER_SNAKE_CASE to lower-kebab-case. Entries from the ERROR_CODES that can be computed this way are removed from the map. Extra tests are added for those 3 cases.

Author: JosRoseboom

src/main/java/com/google/firebase/messaging/TopicManagementResponse.java

@@ -37,11 +37,8 @@ public class TopicManagementResponse {
   // Server error codes as defined in https://developers.google.com/instance-id/reference/server
   // TODO: Should we handle other error codes here (e.g. PERMISSION_DENIED)?
   private static final Map<String, String> ERROR_CODES = ImmutableMap.<String, String>builder()
-      .put("INVALID_ARGUMENT", "invalid-argument")
       .put("NOT_FOUND", "registration-token-not-registered")
       .put("INTERNAL", "internal-error")
-      .put("TOO_MANY_TOPICS", "too-many-topics")
-      .put("RESOURCE_EXHAUSTED", "resource-exhausted")
       .build();
 
   private final int successCount;
@@ -105,7 +102,7 @@ private Error(int index, String reason) {
       if (reason == null || reason.trim().isEmpty()) {
         this.reason = UNKNOWN_ERROR;
       } else {
-        this.reason = ERROR_CODES.getOrDefault(reason, reason);
+        this.reason = ERROR_CODES.getOrDefault(reason, reason.toLowerCase().replace('_', '-'));
       }
     }
 

src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java

@@ -415,13 +415,13 @@ public void testTopicManagementResponseErrorToString() {
 
   @Test
   public void testTopicManagementResponseErrorNotInErrorCodes() {
-    String myError = "myError";
+    String myError = "MY_ERROR";
     GenericJson json = new GenericJson().set("error", myError);
     ImmutableList<GenericJson> jsonList = ImmutableList.of(json);
 
     TopicManagementResponse topicManagementResponse = new TopicManagementResponse(jsonList);
 
-    String expected = "[Error{index=0, reason=" + myError + "}]";
+    String expected = "[Error{index=0, reason=my-error}]";
     assertEquals(expected, topicManagementResponse.getErrors().toString());
   }
 
@@ -447,6 +447,18 @@ public void testTopicManagementResponseErrorResourceExhausted() {
     assertEquals(expected, topicManagementResponse.getErrors().toString());
   }
 
+  @Test
+  public void testTopicManagementResponseErrorTooManyTopics() {
+    GenericJson json = new GenericJson().set("error", "TOO_MANY_TOPICS");
+    ImmutableList<GenericJson> jsonList = ImmutableList.of(json);
+
+    TopicManagementResponse topicManagementResponse = new TopicManagementResponse(jsonList);
+
+    String expected = "[Error{index=0, reason=too-many-topics}]";
+    assertEquals(expected, topicManagementResponse.getErrors().toString());
+  }
+
+
   private static InstanceIdClientImpl initInstanceIdClient(
       final MockLowLevelHttpResponse mockResponse,
       final HttpResponseInterceptor interceptor) {
@@ -466,7 +478,7 @@ private void checkTopicManagementRequest(
     assertEquals(1, result.getFailureCount());
     assertEquals(1, result.getErrors().size());
     assertEquals(1, result.getErrors().get(0).getIndex());
-    assertEquals("error_reason", result.getErrors().get(0).getReason());
+    assertEquals("error-reason", result.getErrors().get(0).getReason());
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     request.getContent().writeTo(out);