From 6001e1ada3bad1b16e29e704fc107e80adbd16dd Mon Sep 17 00:00:00 2001
From: ShamBhand <sbhand@equalexperts.com>
Date: Sat, 8 Aug 2020 18:26:08 +0530
Subject: [PATCH 1/5] Added toString() in TopicManagementResponse for logging
 (#343)

---
 .../google/firebase/messaging/TopicManagementResponse.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java b/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java
index b8f92576e..abee91317 100644
--- a/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java
+++ b/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java
@@ -122,5 +122,10 @@ public int getIndex() {
     public String getReason() {
       return reason;
     }
+
+    @Override
+    public String toString() {
+      return "Error{" + "index=" + index + ", reason='" + reason + '\'' + '}';
+    }
   }
 }

From 8d22fe07dca1e3fe5e9d7ddd9a7bd6f8f923fd65 Mon Sep 17 00:00:00 2001
From: ShamBhand <sbhand@equalexperts.com>
Date: Mon, 10 Aug 2020 23:35:25 +0530
Subject: [PATCH 2/5] Used MoreObjects.toStringHelper()

---
 .DS_Store                                        | Bin 0 -> 6148 bytes
 .../messaging/TopicManagementResponse.java       |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6e6db802ce03c2399f1d77cc99c89b39355f86a4
GIT binary patch
literal 6148
zcmeHKyH3ME5S)V)k!ai?QQj9I@ds8Eiqw1nkbn><vZaLd?)Yq&eSk0yEd`pDcE`83
zb0<&X^#Ul1!^0KO0GQJa@n&Iawr@VMlgtz%oo75@hkLx@8U3XCc*3~ntnbKr9PvBc
zV#C~yJC}IDo@aKeZNFJ>`!!k3`^b(TudEc10#ZN<NC7GELjmi(wE0<}q7;w<Qs7Gg
z`#w~<VVgJv`lo}zM*!lCX*WLmEJ3W6AhwA^ATzWQRANv|ju<8A%-5`I6NkW{qxj7{
zCvPq}p%lNJ`Re5;ZJ?qQkOE@`PGi|v|G%dHGXIZBT1f#Z@UIjov*pcl!B@)OI(a$k
vwUvHH|1{QmIfJ)iqPJo$tQB8;tE=|R{Wft3bUO1+C+bJQbdgDczfj-<an~m+

literal 0
HcmV?d00001

diff --git a/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java b/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java
index abee91317..bbf4c944a 100644
--- a/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java
+++ b/src/main/java/com/google/firebase/messaging/TopicManagementResponse.java
@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.api.client.json.GenericJson;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.firebase.internal.NonNull;
@@ -125,7 +126,10 @@ public String getReason() {
 
     @Override
     public String toString() {
-      return "Error{" + "index=" + index + ", reason='" + reason + '\'' + '}';
+      return MoreObjects.toStringHelper(this)
+              .add("index", index)
+              .add("reason", reason)
+              .toString();
     }
   }
 }

From d6d97c536062a1bfa766e6f91fed612a0cef6a78 Mon Sep 17 00:00:00 2001
From: ShamBhand <sbhand@equalexperts.com>
Date: Mon, 10 Aug 2020 23:43:33 +0530
Subject: [PATCH 3/5] removed .DS_Store & added it to .gitignore

---
 .DS_Store  | Bin 6148 -> 0 bytes
 .gitignore |   1 +
 2 files changed, 1 insertion(+)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 6e6db802ce03c2399f1d77cc99c89b39355f86a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyH3ME5S)V)k!ai?QQj9I@ds8Eiqw1nkbn><vZaLd?)Yq&eSk0yEd`pDcE`83
zb0<&X^#Ul1!^0KO0GQJa@n&Iawr@VMlgtz%oo75@hkLx@8U3XCc*3~ntnbKr9PvBc
zV#C~yJC}IDo@aKeZNFJ>`!!k3`^b(TudEc10#ZN<NC7GELjmi(wE0<}q7;w<Qs7Gg
z`#w~<VVgJv`lo}zM*!lCX*WLmEJ3W6AhwA^ATzWQRANv|ju<8A%-5`I6NkW{qxj7{
zCvPq}p%lNJ`Re5;ZJ?qQkOE@`PGi|v|G%dHGXIZBT1f#Z@UIjov*pcl!B@)OI(a$k
vwUvHH|1{QmIfJ)iqPJo$tQB8;tE=|R{Wft3bUO1+C+bJQbdgDczfj-<an~m+

diff --git a/.gitignore b/.gitignore
index a869aa65d..6e7d29cfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ target/
 release.properties
 integration_cert.json
 integration_apikey.txt
+.DS_Store

From 6074e606fc53b1865b9a65689297c1d3324fce2e Mon Sep 17 00:00:00 2001
From: ShamBhand <sbhand@equalexperts.com>
Date: Tue, 11 Aug 2020 00:57:29 +0530
Subject: [PATCH 4/5] unit test case for TopicManagementResponse toString()
 functionality added for logging

---
 .../firebase/messaging/InstanceIdClientImplTest.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java b/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
index f939c8382..3d2876010 100644
--- a/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
+++ b/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
@@ -340,6 +340,13 @@ public void testTopicManagementResponseWithEmptyList() {
     new TopicManagementResponse(ImmutableList.<GenericJson>of());
   }
 
+  @Test
+  public void testTopicManagementResponseErrorToString() {
+    ImmutableList<GenericJson> jsonList = ImmutableList.of(new GenericJson().set("error", "test error"));
+    TopicManagementResponse topicManagementResponse = new TopicManagementResponse(jsonList);
+    assertEquals("[Error{index=0, reason=unknown-error}]", topicManagementResponse.getErrors().toString());
+  }
+
   private static InstanceIdClientImpl initInstanceIdClient(
       final MockLowLevelHttpResponse mockResponse,
       final HttpResponseInterceptor interceptor) {

From b950e4cb40653e856020fac9cce319839c0ea830 Mon Sep 17 00:00:00 2001
From: ShamBhand <sbhand@equalexperts.com>
Date: Tue, 11 Aug 2020 01:17:11 +0530
Subject: [PATCH 5/5] fixed checkStyle issue of line should not greater than
 100 char

---
 .../firebase/messaging/InstanceIdClientImplTest.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java b/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
index 3d2876010..c7e1cc24a 100644
--- a/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
+++ b/src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
@@ -342,9 +342,13 @@ public void testTopicManagementResponseWithEmptyList() {
 
   @Test
   public void testTopicManagementResponseErrorToString() {
-    ImmutableList<GenericJson> jsonList = ImmutableList.of(new GenericJson().set("error", "test error"));
+    GenericJson json = new GenericJson().set("error", "test error");
+    ImmutableList<GenericJson> jsonList = ImmutableList.of(json);
+
     TopicManagementResponse topicManagementResponse = new TopicManagementResponse(jsonList);
-    assertEquals("[Error{index=0, reason=unknown-error}]", topicManagementResponse.getErrors().toString());
+
+    String expected = "[Error{index=0, reason=unknown-error}]";
+    assertEquals(expected, topicManagementResponse.getErrors().toString());
   }
 
   private static InstanceIdClientImpl initInstanceIdClient(