From 9578583effe9c6acc1296e856eeb81bfd75581d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 24 Oct 2022 10:28:25 -0700
Subject: [PATCH] Small tweaks to fix Error Prone warnings. (#2227)

* Small tweaks to fix Error Prone warnings.

* Add another suppression.
---
 .../java/com/google/gson/internal/bind/JsonTreeReader.java    | 2 +-
 gson/src/test/java/com/google/gson/JsonArrayAsListTest.java   | 4 ++--
 gson/src/test/java/com/google/gson/JsonObjectAsMapTest.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java b/gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java
index e47c57c73c..81c3363cfa 100644
--- a/gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java
@@ -277,7 +277,7 @@ JsonElement nextJsonElement() throws IOException {
     JsonToken peeked = peek();
     switch (peeked) {
       case NAME:
-        nextName(true);
+        String unused = nextName(true);
         break;
       case END_ARRAY:
         endArray();
diff --git a/gson/src/test/java/com/google/gson/JsonArrayAsListTest.java b/gson/src/test/java/com/google/gson/JsonArrayAsListTest.java
index 36d671f9e1..a1786ce671 100644
--- a/gson/src/test/java/com/google/gson/JsonArrayAsListTest.java
+++ b/gson/src/test/java/com/google/gson/JsonArrayAsListTest.java
@@ -210,7 +210,7 @@ public void testContains() {
     assertFalse(list.contains(new JsonPrimitive(2)));
     assertFalse(list.contains(null));
 
-    @SuppressWarnings("unlikely-arg-type")
+    @SuppressWarnings({"unlikely-arg-type", "CollectionIncompatibleType"})
     boolean containsInt = list.contains(1); // should only contain JsonPrimitive(1)
     assertFalse(containsInt);
   }
@@ -227,7 +227,7 @@ public void testIndexOf() {
     assertEquals(-1, list.indexOf(new JsonPrimitive(2)));
     assertEquals(-1, list.indexOf(null));
 
-    @SuppressWarnings("unlikely-arg-type")
+    @SuppressWarnings({"unlikely-arg-type", "CollectionIncompatibleType"})
     int indexOfInt = list.indexOf(1); // should only contain JsonPrimitive(1)
     assertEquals(-1, indexOfInt);
 
diff --git a/gson/src/test/java/com/google/gson/JsonObjectAsMapTest.java b/gson/src/test/java/com/google/gson/JsonObjectAsMapTest.java
index 7f17538936..00a89a6f11 100644
--- a/gson/src/test/java/com/google/gson/JsonObjectAsMapTest.java
+++ b/gson/src/test/java/com/google/gson/JsonObjectAsMapTest.java
@@ -59,7 +59,7 @@ public void testContainsValue() {
     assertFalse(map.containsValue(new JsonPrimitive(2)));
     assertFalse(map.containsValue(null));
 
-    @SuppressWarnings("unlikely-arg-type")
+    @SuppressWarnings({"unlikely-arg-type", "CollectionIncompatibleType"})
     boolean containsInt = map.containsValue(1); // should only contain JsonPrimitive(1)
     assertFalse(containsInt);
   }