From 18336d0f8cf2c758d482adfe8c56731515afc6ec Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:06:12 +0100
Subject: [PATCH 01/55] Adds `@SuppressWarnings("NarrowingCompoundAssignment")`

---
 gson/src/main/java/com/google/gson/stream/JsonReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java
index 718a7c2a8c..3f853d8e25 100644
--- a/gson/src/main/java/com/google/gson/stream/JsonReader.java
+++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java
@@ -1590,7 +1590,7 @@ public String getPath() {
    * @throws NumberFormatException if any unicode escape sequences are
    *     malformed.
    */
-  @SuppressWarnings("fallthrough")
+  @SuppressWarnings({"fallthrough", "NarrowingCompoundAssignment"})
   private char readEscapeCharacter() throws IOException {
     if (pos == limit && !fillBuffer(1)) {
       throw syntaxError("Unterminated escape sequence");

From 0c2f8c304ea840e7f40e69c4940b3a546644c901 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:06:21 +0100
Subject: [PATCH 02/55] Adds
 `@SuppressWarnings("TypeParameterUnusedInFormals")`

---
 gson/src/main/java/com/google/gson/Gson.java              | 8 ++++----
 .../java/com/google/gson/JsonDeserializationContext.java  | 1 +
 .../com/google/gson/internal/bind/TreeTypeAdapter.java    | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
index 054b1f92ed..45336a87e9 100644
--- a/gson/src/main/java/com/google/gson/Gson.java
+++ b/gson/src/main/java/com/google/gson/Gson.java
@@ -1011,7 +1011,7 @@ public <T> T fromJson(String json, Class<T> classOfT) throws JsonSyntaxException
    * @see #fromJson(String, Class)
    * @see #fromJson(String, TypeToken)
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
   public <T> T fromJson(String json, Type typeOfT) throws JsonSyntaxException {
     return (T) fromJson(json, TypeToken.get(typeOfT));
   }
@@ -1104,7 +1104,7 @@ public <T> T fromJson(Reader json, Class<T> classOfT) throws JsonSyntaxException
    * @see #fromJson(Reader, Class)
    * @see #fromJson(Reader, TypeToken)
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
   public <T> T fromJson(Reader json, Type typeOfT) throws JsonIOException, JsonSyntaxException {
     return (T) fromJson(json, TypeToken.get(typeOfT));
   }
@@ -1183,7 +1183,7 @@ private static void assertFullConsumption(Object obj, JsonReader reader) {
    * @see #fromJson(Reader, Type)
    * @see #fromJson(JsonReader, TypeToken)
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
   public <T> T fromJson(JsonReader reader, Type typeOfT) throws JsonIOException, JsonSyntaxException {
     return (T) fromJson(reader, TypeToken.get(typeOfT));
   }
@@ -1297,7 +1297,7 @@ public <T> T fromJson(JsonElement json, Class<T> classOfT) throws JsonSyntaxExce
    * @see #fromJson(JsonElement, Class)
    * @see #fromJson(JsonElement, TypeToken)
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
   public <T> T fromJson(JsonElement json, Type typeOfT) throws JsonSyntaxException {
     return (T) fromJson(json, TypeToken.get(typeOfT));
   }
diff --git a/gson/src/main/java/com/google/gson/JsonDeserializationContext.java b/gson/src/main/java/com/google/gson/JsonDeserializationContext.java
index 00c7505432..093653d90f 100644
--- a/gson/src/main/java/com/google/gson/JsonDeserializationContext.java
+++ b/gson/src/main/java/com/google/gson/JsonDeserializationContext.java
@@ -40,5 +40,6 @@ public interface JsonDeserializationContext {
    * @return An object of type typeOfT.
    * @throws JsonParseException if the parse tree does not contain expected data.
    */
+  @SuppressWarnings("TypeParameterUnusedInFormals")
   public <T> T deserialize(JsonElement json, Type typeOfT) throws JsonParseException;
 }
\ No newline at end of file
diff --git a/gson/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
index 47ca8fc03a..a1a5f760d4 100644
--- a/gson/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
@@ -174,8 +174,9 @@ private final class GsonContextImpl implements JsonSerializationContext, JsonDes
     @Override public JsonElement serialize(Object src, Type typeOfSrc) {
       return gson.toJsonTree(src, typeOfSrc);
     }
-    @SuppressWarnings("unchecked")
-    @Override public <R> R deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
+    @Override
+    @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
+    public <R> R deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
       return gson.fromJson(json, typeOfT);
     }
   }

From 7f64bf33fb10568e264900b4ff614117aed8e864 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:09:15 +0100
Subject: [PATCH 03/55] Adds `@SuppressWarnings("JavaUtilDate")`

---
 .../java/com/google/gson/internal/sql/SqlDateTypeAdapter.java    | 1 +
 .../java/com/google/gson/internal/sql/SqlTimeTypeAdapter.java    | 1 +
 .../com/google/gson/internal/sql/SqlTimestampTypeAdapter.java    | 1 +
 .../main/java/com/google/gson/internal/sql/SqlTypesSupport.java  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/gson/src/main/java/com/google/gson/internal/sql/SqlDateTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/sql/SqlDateTypeAdapter.java
index 6ae4c3ef50..271f23c21c 100644
--- a/gson/src/main/java/com/google/gson/internal/sql/SqlDateTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/sql/SqlDateTypeAdapter.java
@@ -36,6 +36,7 @@
  * this class state. DateFormat isn't thread safe either, so this class has
  * to synchronize its read and write methods.
  */
+@SuppressWarnings("JavaUtilDate")
 final class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
   static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {
     @SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
diff --git a/gson/src/main/java/com/google/gson/internal/sql/SqlTimeTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/sql/SqlTimeTypeAdapter.java
index c2a37073f0..ac327ff16f 100644
--- a/gson/src/main/java/com/google/gson/internal/sql/SqlTimeTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/sql/SqlTimeTypeAdapter.java
@@ -37,6 +37,7 @@
  * this class state. DateFormat isn't thread safe either, so this class has
  * to synchronize its read and write methods.
  */
+@SuppressWarnings("JavaUtilDate")
 final class SqlTimeTypeAdapter extends TypeAdapter<Time> {
   static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {
     @SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
diff --git a/gson/src/main/java/com/google/gson/internal/sql/SqlTimestampTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/sql/SqlTimestampTypeAdapter.java
index 5c77f8397c..0ca44c1ba4 100644
--- a/gson/src/main/java/com/google/gson/internal/sql/SqlTimestampTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/sql/SqlTimestampTypeAdapter.java
@@ -27,6 +27,7 @@
 import java.sql.Timestamp;
 import java.util.Date;
 
+@SuppressWarnings("JavaUtilDate")
 class SqlTimestampTypeAdapter extends TypeAdapter<Timestamp> {
   static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {
     @SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
diff --git a/gson/src/main/java/com/google/gson/internal/sql/SqlTypesSupport.java b/gson/src/main/java/com/google/gson/internal/sql/SqlTypesSupport.java
index b82ace74c0..e5f7bb1d94 100644
--- a/gson/src/main/java/com/google/gson/internal/sql/SqlTypesSupport.java
+++ b/gson/src/main/java/com/google/gson/internal/sql/SqlTypesSupport.java
@@ -33,6 +33,7 @@
  * it is {@code false} all other constants will be {@code null} and
  * there will be no support for {@code java.sql} types.
  */
+@SuppressWarnings("JavaUtilDate")
 public final class SqlTypesSupport {
   /**
    * {@code true} if {@code java.sql} types are supported,

From f34c35debe11e1e2ca1a8b695a2b4d939ec88a44 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:19:54 +0100
Subject: [PATCH 04/55] Adds a limit to `String.split()`

---
 gson/src/main/java/com/google/gson/internal/JavaVersion.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gson/src/main/java/com/google/gson/internal/JavaVersion.java b/gson/src/main/java/com/google/gson/internal/JavaVersion.java
index df8e9a49e1..13775bda7b 100644
--- a/gson/src/main/java/com/google/gson/internal/JavaVersion.java
+++ b/gson/src/main/java/com/google/gson/internal/JavaVersion.java
@@ -16,6 +16,8 @@
 
 package com.google.gson.internal;
 
+import java.util.Arrays;
+
 /**
  * Utility to check the major Java version of the current JVM.
  */
@@ -45,7 +47,7 @@ static int getMajorJavaVersion(String javaVersion) {
   // Parses both legacy 1.8 style and newer 9.0.4 style 
   private static int parseDotted(String javaVersion) {
     try {
-      String[] parts = javaVersion.split("[._]");
+      String[] parts = javaVersion.split("[._]", 3);
       int firstVer = Integer.parseInt(parts[0]);
       if (firstVer == 1 && parts.length > 1) {
         return Integer.parseInt(parts[1]);

From 5e6a279338ed41dba87fa18dec722042340b7dba Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:28:32 +0100
Subject: [PATCH 05/55] Add `error_prone_annotations` to the `pom.xml`

---
 gson/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gson/pom.xml b/gson/pom.xml
index deed98dddf..742e33383b 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -55,6 +55,11 @@
       <version>31.1-jre</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+      <version>2.18.0</version>
+    </dependency>
   </dependencies>
 
   <build>

From 682b3699839cbbde065cc443b8d1b24ced311206 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:29:08 +0100
Subject: [PATCH 06/55] Adds `@InlineMe(...)` to deprecated methods

---
 gson/src/main/java/com/google/gson/JsonParser.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gson/src/main/java/com/google/gson/JsonParser.java b/gson/src/main/java/com/google/gson/JsonParser.java
index 5b80042039..20d3750cea 100644
--- a/gson/src/main/java/com/google/gson/JsonParser.java
+++ b/gson/src/main/java/com/google/gson/JsonParser.java
@@ -15,6 +15,7 @@
  */
 package com.google.gson;
 
+import com.google.errorprone.annotations.InlineMe;
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
@@ -111,18 +112,21 @@ public static JsonElement parseReader(JsonReader reader)
 
   /** @deprecated Use {@link JsonParser#parseString} */
   @Deprecated
+  @InlineMe(replacement = "JsonParser.parseString(json)", imports = "com.google.gson.JsonParser")
   public JsonElement parse(String json) throws JsonSyntaxException {
     return parseString(json);
   }
 
   /** @deprecated Use {@link JsonParser#parseReader(Reader)} */
   @Deprecated
+  @InlineMe(replacement = "JsonParser.parseReader(json)", imports = "com.google.gson.JsonParser")
   public JsonElement parse(Reader json) throws JsonIOException, JsonSyntaxException {
     return parseReader(json);
   }
 
   /** @deprecated Use {@link JsonParser#parseReader(JsonReader)} */
   @Deprecated
+  @InlineMe(replacement = "JsonParser.parseReader(json)", imports = "com.google.gson.JsonParser")
   public JsonElement parse(JsonReader json) throws JsonIOException, JsonSyntaxException {
     return parseReader(json);
   }

From 41e0c28187c2f2c5f5a54f6e62cf4c9f050a2d24 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:33:16 +0100
Subject: [PATCH 07/55] Adds `@SuppressWarnings("ImmutableEnumChecker")`

---
 .../src/main/java/com/google/gson/metrics/ParseBenchmark.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java b/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
index 3705ceb00c..c27f7c6089 100644
--- a/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
+++ b/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Param;
+import com.google.errorprone.annotations.Immutable;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParser;
@@ -64,7 +65,9 @@ private enum Document {
     READER_SHORT(new TypeToken<Feed>() {}, new TypeReference<Feed>() {}),
     READER_LONG(new TypeToken<Feed>() {}, new TypeReference<Feed>() {});
 
+    @SuppressWarnings("ImmutableEnumChecker")
     private final TypeToken<?> gsonType;
+    @SuppressWarnings("ImmutableEnumChecker")
     private final TypeReference<?> jacksonType;
 
     private Document(TypeToken<?> typeToken, TypeReference<?> typeReference) {

From b6965d1ea91326b7fcd4a8d75f64f26969184654 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:40:00 +0100
Subject: [PATCH 08/55] Adds `@SuppressWarnings("ModifiedButNotUsed")`

---
 .../gson/metrics/CollectionsDeserializationBenchmark.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java b/metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java
index 738b5ae4bf..c10202db8d 100644
--- a/metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java
+++ b/metrics/src/main/java/com/google/gson/metrics/CollectionsDeserializationBenchmark.java
@@ -64,6 +64,7 @@ public void timeCollectionsDefault(int reps) {
   /**
    * Benchmark to measure deserializing objects by hand
    */
+  @SuppressWarnings("ModifiedButNotUsed")
   public void timeCollectionsStreaming(int reps) throws IOException {
     for (int i=0; i<reps; ++i) {
       StringReader reader = new StringReader(json);
@@ -102,6 +103,7 @@ public void timeCollectionsStreaming(int reps) throws IOException {
    * setting object values by reflection. We should strive to reduce the discrepancy between this
    * and {@link #timeCollectionsDefault(int)} .
    */
+  @SuppressWarnings("ModifiedButNotUsed")
   public void timeCollectionsReflectionStreaming(int reps) throws Exception {
     for (int i=0; i<reps; ++i) {
       StringReader reader = new StringReader(json);

From 04feff68ef00fdc56150c7059b3fff1794af6dc0 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 14:48:50 +0100
Subject: [PATCH 09/55] Adds `@SuppressWarnings("MixedMutabilityReturnType")`

---
 .../google/gson/internal/bind/ReflectiveTypeAdapterFactory.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 4db9bd72f1..25cccc156e 100644
--- a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -81,6 +81,7 @@ private boolean includeField(Field f, boolean serialize) {
   }
 
   /** first element holds the default name */
+  @SuppressWarnings("MixedMutabilityReturnType")
   private List<String> getFieldNames(Field f) {
     SerializedName annotation = f.getAnnotation(SerializedName.class);
     if (annotation == null) {

From 5bd180d14e83e69c51c1a1b33713ebb8f765c170 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sat, 18 Feb 2023 15:00:25 +0100
Subject: [PATCH 10/55] Removes an unused import

---
 gson/src/main/java/com/google/gson/internal/JavaVersion.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/internal/JavaVersion.java b/gson/src/main/java/com/google/gson/internal/JavaVersion.java
index 13775bda7b..21130ff9d0 100644
--- a/gson/src/main/java/com/google/gson/internal/JavaVersion.java
+++ b/gson/src/main/java/com/google/gson/internal/JavaVersion.java
@@ -16,8 +16,6 @@
 
 package com.google.gson.internal;
 
-import java.util.Arrays;
-
 /**
  * Utility to check the major Java version of the current JVM.
  */

From 373525d11cdacf7f0301205b9719236f46261359 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:01:45 +0100
Subject: [PATCH 11/55] Adds `requires` to `module-info.java`

---
 gson/src/main/java/module-info.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gson/src/main/java/module-info.java b/gson/src/main/java/module-info.java
index 410569bc2c..372e5ad1c4 100644
--- a/gson/src/main/java/module-info.java
+++ b/gson/src/main/java/module-info.java
@@ -24,6 +24,9 @@
   exports com.google.gson.reflect;
   exports com.google.gson.stream;
 
+  // Dependency on Error Prone Annotations
+  requires com.google.errorprone.annotations;
+
   // Optional dependency on java.sql
   requires static java.sql;
 

From bd60abfff7e86375038f0a28659b9921cde35d10 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:06:46 +0100
Subject: [PATCH 12/55] Adds ErrorProne `link` into `pom.xml`

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 65b12bd545..2d6bea9d90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
             <detectJavaApiLink>false</detectJavaApiLink>
             <links>
               <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
+              <link>https://errorprone.info/api/latest/</link>
             </links>
             <!-- Disable detection of offline links between Maven modules: 
               (1) Only `gson` module is published, so for other modules Javadoc links don't 

From 5e1e970dc93ba6726c095dac512c0d12db87792a Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:08:07 +0100
Subject: [PATCH 13/55] Remove unused imports

Removed from:
- ParseBenchmark
---
 .../src/main/java/com/google/gson/metrics/ParseBenchmark.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java b/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
index c27f7c6089..63522af2e7 100644
--- a/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
+++ b/metrics/src/main/java/com/google/gson/metrics/ParseBenchmark.java
@@ -27,7 +27,6 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Param;
-import com.google.errorprone.annotations.Immutable;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParser;
@@ -39,7 +38,6 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringWriter;
-import java.lang.reflect.Type;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;

From f3c47636f068588952031680c136879e5897a809 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:29:16 +0100
Subject: [PATCH 14/55] Adds `@SuppressWarnings("EqualsGetClass")`

---
 .../src/main/java/com/google/gson/metrics/BagOfPrimitives.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
index a073974d4f..96c1f2e489 100644
--- a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
+++ b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
@@ -63,6 +63,7 @@ public int hashCode() {
   }
 
   @Override
+  @SuppressWarnings("EqualsGetClass")
   public boolean equals(Object obj) {
     if (this == obj) return true;
     if (obj == null) return false;

From 71a75b8459968f95c7da894f59f7de12e59c5f91 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:38:15 +0100
Subject: [PATCH 15/55] Excludes from `proto` just the generated code.

Replaces `.*proto.*` with `.*/generated-test-sources/protobuf/.*` in such way will be excluded just the generated code and not the whole `proto` directory
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d6bea9d90..cb5c236c64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
             <compilerArgs>
               <!-- Args related to Error Prone, see: https://errorprone.info/docs/installation#maven -->
               <arg>-XDcompilePolicy=simple</arg>
-              <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*gson/src/test.*|.*extras/src/test.*|.*proto.*</arg>
+              <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*gson/src/test.*|.*extras/src/test.*|.*/generated-test-sources/protobuf/.*</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>

From a1beaf282d27ae4f9311297c4dce01df38b239f9 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:45:51 +0100
Subject: [PATCH 16/55] Removes an unused variable

Removes the `descriptor` variable because is unused.
---
 .../gson/protobuf/functional/ProtosWithPrimitiveTypesTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithPrimitiveTypesTest.java b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithPrimitiveTypesTest.java
index 0666a6dd00..53f65fe959 100644
--- a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithPrimitiveTypesTest.java
+++ b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithPrimitiveTypesTest.java
@@ -57,7 +57,6 @@ public void testDeserializeEmptyProto() {
 
   @Test
   public void testSerializeProto() {
-    Descriptor descriptor = SimpleProto.getDescriptor();
     SimpleProto proto = SimpleProto.newBuilder()
       .setCount(3)
       .setMsg("foo")

From 9c5073fca2d59a57294ba44f6c3105289ba39c43 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:49:09 +0100
Subject: [PATCH 17/55] Fixes the `BadImport` warn into
 `ProtosWithAnnotationsTest`

---
 .../gson/protobuf/functional/ProtosWithAnnotationsTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
index 7fb92e89b4..51e53a9b87 100644
--- a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
+++ b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
@@ -111,7 +111,7 @@ public void testProtoWithAnnotations_deserialize() {
     assertThat(proto.hasInnerMessage1()).isFalse();
     assertThat(proto.getInnerMessage2()).isEqualTo(InnerMessage.newBuilder()
         .setNIdCt(98798465)
-        .setContent(Type.TEXT)
+        .setContent(InnerMessage.Type.TEXT)
         .addData(Data.newBuilder()
             .setData("OFIN8e9fhwoeh8((⁹8efywoih")
             .setHeight(665))

From 2aad0bcca240a842ddfdf5d1f7b2974aef1345ce Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:53:19 +0100
Subject: [PATCH 18/55] Fixes the `BadImport` warns into
 `ProtosWithAnnotationsTest`

---
 .../protobuf/functional/ProtosWithAnnotationsTest.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
index 51e53a9b87..30908d0f51 100644
--- a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
+++ b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
@@ -29,7 +29,6 @@
 import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations;
 import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations.InnerMessage;
 import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations.InnerMessage.Data;
-import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations.InnerMessage.Type;
 import com.google.protobuf.GeneratedMessageV3;
 import org.junit.Before;
 import org.junit.Test;
@@ -149,7 +148,7 @@ public void testProtoWithAnnotations_deserializeUnknownEnumValue() {
         + "   \"content\":\"UNKNOWN\"%n"
         + "}");
     InnerMessage proto = gson.fromJson(json, InnerMessage.class);
-    assertThat(proto.getContent()).isEqualTo(Type.UNKNOWN);
+    assertThat(proto.getContent()).isEqualTo(InnerMessage.Type.UNKNOWN);
   }
 
   @Test
@@ -171,7 +170,7 @@ public void testProtoWithAnnotations_deserializeWithEnumNumbers() {
         + "   \"content\":\"0\"%n"
         + "}");
     InnerMessage proto = gsonWithEnumNumbers.fromJson(json, InnerMessage.class);
-    assertThat(proto.getContent()).isEqualTo(Type.UNKNOWN);
+    assertThat(proto.getContent()).isEqualTo(InnerMessage.Type.UNKNOWN);
     String rebuilt = gsonWithEnumNumbers.toJson(proto);
     assertThat(rebuilt).isEqualTo("{\"content\":0}");
 
@@ -179,7 +178,7 @@ public void testProtoWithAnnotations_deserializeWithEnumNumbers() {
         + "   \"content\":\"2\"%n"
         + "}");
     proto = gsonWithEnumNumbers.fromJson(json, InnerMessage.class);
-    assertThat(proto.getContent()).isEqualTo(Type.IMAGE);
+    assertThat(proto.getContent()).isEqualTo(InnerMessage.Type.IMAGE);
     rebuilt = gsonWithEnumNumbers.toJson(proto);
     assertThat(rebuilt).isEqualTo("{\"content\":2}");
   }
@@ -194,7 +193,7 @@ public void testProtoWithAnnotations_serialize() {
             .setLongTimestamp(468406876880768L))
         .setInnerMessage1(InnerMessage.newBuilder()
             .setNIdCt(12)
-            .setContent(Type.IMAGE)
+            .setContent(InnerMessage.Type.IMAGE)
             .addData(Data.newBuilder()
                 .setData("data$$")
                 .setWidth(200))

From ba27715da9f235f3c1ea5b52370c752d7a05b0b1 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 15:57:01 +0100
Subject: [PATCH 19/55] Enables ErrorProne in `gson/src/test.*`

Removes the `gson/src/test.*` path from the `-XepExcludedPaths` parameter of the ErrorProne plugin
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cb5c236c64..3e5c7bf75a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
             <compilerArgs>
               <!-- Args related to Error Prone, see: https://errorprone.info/docs/installation#maven -->
               <arg>-XDcompilePolicy=simple</arg>
-              <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*gson/src/test.*|.*extras/src/test.*|.*/generated-test-sources/protobuf/.*</arg>
+              <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*extras/src/test.*|.*/generated-test-sources/protobuf/.*</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>

From e3d65bc02aa97d3ed5c636afb14ac9dc8507d690 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 16:20:34 +0100
Subject: [PATCH 20/55] Fixes `UnusedVariable` warns

This commit fix all `UnusedVariable` warns given by ErrorProne in the `gson/src/test.*` path.

Some field is annotated with `@Keep` that means is used by reflection.
In some other case the record is annotated with `@SuppressWarnings("unused")`
---
 .../gson/VersionExclusionStrategyTest.java    |  4 ++++
 .../functional/DelegateTypeAdapterTest.java   |  4 ++--
 .../gson/functional/ExposeFieldsTest.java     | 12 ++++++++---
 .../gson/functional/Java17RecordTest.java     |  4 ++++
 ...JsonAdapterSerializerDeserializerTest.java | 21 ++++++++++++++-----
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java b/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java
index 9ae8c65618..2c64496479 100644
--- a/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java
+++ b/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.errorprone.annotations.Keep;
 import com.google.gson.annotations.Since;
 import com.google.gson.annotations.Until;
 import com.google.gson.internal.Excluder;
@@ -75,6 +76,7 @@ public void testOlderVersion() throws Exception {
   private static class MockClassSince {
 
     @Since(VERSION)
+    @Keep
     public final int someField = 0;
   }
 
@@ -82,6 +84,7 @@ private static class MockClassSince {
   private static class MockClassUntil {
 
     @Until(VERSION)
+    @Keep
     public final int someField = 0;
   }
 
@@ -91,6 +94,7 @@ private static class MockClassBoth {
 
     @Since(VERSION)
     @Until(VERSION + 2)
+    @Keep
     public final int someField = 0;
   }
 }
diff --git a/gson/src/test/java/com/google/gson/functional/DelegateTypeAdapterTest.java b/gson/src/test/java/com/google/gson/functional/DelegateTypeAdapterTest.java
index 32cf86807f..bdfa44c54c 100644
--- a/gson/src/test/java/com/google/gson/functional/DelegateTypeAdapterTest.java
+++ b/gson/src/test/java/com/google/gson/functional/DelegateTypeAdapterTest.java
@@ -56,7 +56,7 @@ public void testDelegateInvoked() {
       bags.add(new BagOfPrimitives(i, i, i % 2 == 0, String.valueOf(i)));
     }
     String json = gson.toJson(bags);
-    bags = gson.fromJson(json, new TypeToken<List<BagOfPrimitives>>(){}.getType());
+    gson.fromJson(json, new TypeToken<List<BagOfPrimitives>>(){}.getType());
     // 11: 1 list object, and 10 entries. stats invoked on all 5 fields
     assertThat(stats.numReads).isEqualTo(51);
     assertThat(stats.numWrites).isEqualTo(51);
@@ -66,7 +66,7 @@ public void testDelegateInvoked() {
   public void testDelegateInvokedOnStrings() {
     String[] bags = {"1", "2", "3", "4"};
     String json = gson.toJson(bags);
-    bags = gson.fromJson(json, String[].class);
+    gson.fromJson(json, String[].class);
     // 1 array object with 4 elements.
     assertThat(stats.numReads).isEqualTo(5);
     assertThat(stats.numWrites).isEqualTo(5);
diff --git a/gson/src/test/java/com/google/gson/functional/ExposeFieldsTest.java b/gson/src/test/java/com/google/gson/functional/ExposeFieldsTest.java
index 3215efdfff..3b1119b6ff 100644
--- a/gson/src/test/java/com/google/gson/functional/ExposeFieldsTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ExposeFieldsTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.errorprone.annotations.Keep;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.InstanceCreator;
@@ -121,9 +122,14 @@ public void testExposedInterfaceFieldDeserialization() {
   private static class ClassWithExposedFields {
     @Expose private final Integer a;
     private final Integer b;
-    @Expose(serialize = false) final long c;
-    @Expose(deserialize = false) final double d;
-    @Expose(serialize = false, deserialize = false) final char e;
+    @Expose(serialize = false)
+    @Keep
+    final long c;
+    @Expose(deserialize = false)
+    final double d;
+    @Expose(serialize = false, deserialize = false)
+    @Keep
+    final char e;
 
     public ClassWithExposedFields(Integer a, Integer b) {
       this(a, b, 1L, 2.0, 'a');
diff --git a/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java b/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
index 93a2224cc0..cbda656cfb 100644
--- a/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
+++ b/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
@@ -72,6 +72,7 @@ public void testMultipleNamesInTheSameString() {
         .isEqualTo("v3");
   }
 
+  @SuppressWarnings("unused")
   private record RecordWithCustomNames(
       @SerializedName("name") String a,
       @SerializedName(value = "name1", alternate = {"name2", "name3"}) String b) {}
@@ -253,6 +254,7 @@ public void testPrimitiveAdapterNullValue() {
         .isEqualTo("null is not allowed as value for record component 'aByte' of primitive type; at path $.aByte");
   }
 
+  @SuppressWarnings("unused")
   private record RecordWithPrimitives(
       String aString, byte aByte, short aShort, int anInt, long aLong, float aFloat, double aDouble, char aChar, boolean aBoolean) {}
 
@@ -406,7 +408,9 @@ public void testReflectionFilterBlockInaccessible() {
     assertThat(gson.fromJson("{\"i\":2}", PublicRecord.class)).isEqualTo(new PublicRecord(2));
   }
 
+  @SuppressWarnings("unused")
   private record PrivateRecord(int i) {}
+  @SuppressWarnings("unused")
   public record PublicRecord(int i) {}
 
   /**
diff --git a/gson/src/test/java/com/google/gson/functional/JsonAdapterSerializerDeserializerTest.java b/gson/src/test/java/com/google/gson/functional/JsonAdapterSerializerDeserializerTest.java
index 1c06a3baaf..20081f68cf 100644
--- a/gson/src/test/java/com/google/gson/functional/JsonAdapterSerializerDeserializerTest.java
+++ b/gson/src/test/java/com/google/gson/functional/JsonAdapterSerializerDeserializerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.errorprone.annotations.Keep;
 import com.google.gson.Gson;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -47,9 +48,15 @@ public void testJsonSerializerDeserializerBasedJsonAdapterOnFields() {
   }
 
   private static final class Computer {
-    @JsonAdapter(UserSerializer.class) final User user1;
-    @JsonAdapter(UserDeserializer.class) final User user2;
-    @JsonAdapter(UserSerializerDeserializer.class) final User user3;
+    @JsonAdapter(UserSerializer.class)
+    @Keep
+    final User user1;
+    @JsonAdapter(UserDeserializer.class)
+    @Keep
+    final User user2;
+    @JsonAdapter(UserSerializerDeserializer.class)
+    @Keep
+    final User user3;
     Computer(User user1, User user2, User user3) {
       this.user1 = user1;
       this.user2 = user2;
@@ -137,8 +144,12 @@ public void testDifferentJsonAdaptersForGenericFieldsOfSameRawType() {
   }
 
   private static final class Container {
-    @JsonAdapter(BaseStringAdapter.class) Base<String> a;
-    @JsonAdapter(BaseIntegerAdapter.class) Base<Integer> b;
+    @JsonAdapter(BaseStringAdapter.class)
+    @Keep
+    Base<String> a;
+    @JsonAdapter(BaseIntegerAdapter.class)
+    @Keep
+    Base<Integer> b;
     Container(String a, int b) {
       this.a = new Base<>(a);
       this.b = new Base<>(b);

From d1c0554afb03aa28008a86facbe5e595c6c27e38 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 16:28:17 +0100
Subject: [PATCH 21/55] Fixes `JavaUtilDate` warns

This commit fix all `JavaUtilDate` warns given by ErrorProne in the `gson/src/test.*` path.

Classes/Methods are annotated with `@SuppressWarnings("JavaUtilDate")` because it's not possible use differente Date API.
---
 .../java/com/google/gson/functional/CustomTypeAdaptersTest.java | 2 ++
 .../com/google/gson/functional/DefaultTypeAdaptersTest.java     | 1 +
 gson/src/test/java/com/google/gson/functional/ObjectTest.java   | 1 +
 .../google/gson/internal/bind/DefaultDateTypeAdapterTest.java   | 1 +
 .../com/google/gson/internal/bind/util/ISO8601UtilsTest.java    | 2 ++
 5 files changed, 7 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
index 3c59cb8115..8b07ce098c 100644
--- a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
@@ -425,6 +425,7 @@ public void testEnsureCustomDeserializerNotInvokedForNullValues() {
 
   // Test created from Issue 352
   @Test
+  @SuppressWarnings("JavaUtilDate")
   public void testRegisterHierarchyAdapterForDate() {
     Gson gson = new GsonBuilder()
         .registerTypeHierarchyAdapter(Date.class, new DateTypeAdapter())
@@ -473,6 +474,7 @@ public DataHolder deserialize(JsonElement json, Type typeOfT, JsonDeserializatio
     }
   }
 
+  @SuppressWarnings("JavaUtilDate")
   private static class DateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
     @Override
     public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
index ee15bfc450..0a81dc6686 100644
--- a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
@@ -68,6 +68,7 @@
  * @author Inderjeet Singh
  * @author Joel Leitch
  */
+@SuppressWarnings("JavaUtilDate")
 public class DefaultTypeAdaptersTest {
   private Gson gson;
   private TimeZone oldTimeZone;
diff --git a/gson/src/test/java/com/google/gson/functional/ObjectTest.java b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
index 23a1ef203b..49a9c15100 100644
--- a/gson/src/test/java/com/google/gson/functional/ObjectTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
@@ -562,6 +562,7 @@ static final class Product {
 
   // http://code.google.com/p/google-gson/issues/detail?id=270
   @Test
+  @SuppressWarnings("JavaUtilDate")
   public void testDateAsMapObjectField() {
     HasObjectMap a = new HasObjectMap();
     a.map.put("date", new Date(0));
diff --git a/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java b/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
index 99d69e03ad..66d906d84f 100644
--- a/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
+++ b/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
@@ -39,6 +39,7 @@
  *
  * @author Joel Leitch
  */
+@SuppressWarnings("JavaUtilDate")
 public class DefaultDateTypeAdapterTest {
 
   @Test
diff --git a/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java b/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
index c96ae643e4..690f289d14 100644
--- a/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
+++ b/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
@@ -57,6 +57,7 @@ public void testDateFormatString() {
     }
 
   @Test
+  @SuppressWarnings("JavaUtilDate")
   public void testDateFormatWithMilliseconds() {
         long time = 1530209176870L;
         Date date = new Date(time);
@@ -66,6 +67,7 @@ public void testDateFormatWithMilliseconds() {
     }
 
   @Test
+  @SuppressWarnings("JavaUtilDate")
   public void testDateFormatWithTimezone() {
         long time = 1530209176870L;
         Date date = new Date(time);

From 7769c75395a3ca32a958c96daff2b883130950a1 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 16:48:24 +0100
Subject: [PATCH 22/55] Fixes `EqualsGetClass` warns

This commit fix all `EqualsGetClass` warns given by ErrorProne in the `gson/src/test.*` path.

I have rewrite the `equals()` methods to use `instanceof`
---
 .../gson/ParameterizedTypeFixtures.java       | 17 ++----
 .../com/google/gson/common/TestTypes.java     | 30 ++++-------
 .../functional/ParameterizedTypesTest.java    | 53 ++++---------------
 .../google/gson/metrics/BagOfPrimitives.java  | 26 ++++-----
 4 files changed, 36 insertions(+), 90 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index 3aca9fb717..f7b6965128 100644
--- a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -16,6 +16,7 @@
 
 package com.google.gson;
 
+import com.google.common.base.Objects;
 import com.google.gson.internal.$Gson$Types;
 
 import com.google.gson.internal.Primitives;
@@ -80,27 +81,15 @@ public int hashCode() {
       return value == null ? 0 : value.hashCode();
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public boolean equals(Object obj) {
       if (this == obj) {
         return true;
       }
-      if (obj == null) {
-        return false;
-      }
-      if (getClass() != obj.getClass()) {
-        return false;
-      }
-      MyParameterizedType<T> other = (MyParameterizedType<T>) obj;
-      if (value == null) {
-        if (other.value != null) {
-          return false;
-        }
-      } else if (!value.equals(other.value)) {
+      if (!(obj instanceof MyParameterizedType<?> that)) {
         return false;
       }
-      return true;
+      return Objects.equal(getValue(), that.getValue());
     }
   }
 
diff --git a/gson/src/test/java/com/google/gson/common/TestTypes.java b/gson/src/test/java/com/google/gson/common/TestTypes.java
index 9df4a73d59..e9cf38a051 100644
--- a/gson/src/test/java/com/google/gson/common/TestTypes.java
+++ b/gson/src/test/java/com/google/gson/common/TestTypes.java
@@ -16,6 +16,7 @@
 
 package com.google.gson.common;
 
+import com.google.common.base.Objects;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -146,26 +147,17 @@ public int hashCode() {
     }
 
     @Override
-    public boolean equals(Object obj) {
-      if (this == obj)
+    public boolean equals(Object o) {
+      if (this == o) {
         return true;
-      if (obj == null)
-        return false;
-      if (getClass() != obj.getClass())
-        return false;
-      BagOfPrimitives other = (BagOfPrimitives) obj;
-      if (booleanValue != other.booleanValue)
-        return false;
-      if (intValue != other.intValue)
-        return false;
-      if (longValue != other.longValue)
-        return false;
-      if (stringValue == null) {
-        if (other.stringValue != null)
-          return false;
-      } else if (!stringValue.equals(other.stringValue))
+      }
+      if (!(o instanceof BagOfPrimitives that)) {
         return false;
-      return true;
+      }
+      return longValue == that.longValue
+          && getIntValue() == that.getIntValue()
+          && booleanValue == that.booleanValue
+          && Objects.equal(stringValue, that.stringValue);
     }
 
     @Override
@@ -233,7 +225,7 @@ public static class ClassWithNoFields {
     // Nothing here..
     @Override
     public boolean equals(Object other) {
-      return other.getClass() == ClassWithNoFields.class;
+      return other instanceof ClassWithNoFields;
     }
   }
 
diff --git a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
index 53bb6f7709..3342d0f21f 100644
--- a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.common.base.Objects;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
@@ -429,54 +430,18 @@ public int hashCode() {
       return result;
     }
     @Override
-    @SuppressWarnings("unchecked")
-    public boolean equals(Object obj) {
-      if (this == obj) {
+    public boolean equals(Object o) {
+      if (this == o) {
         return true;
       }
-      if (obj == null) {
-        return false;
-      }
-      if (getClass() != obj.getClass()) {
-        return false;
-      }
-      MultiParameters<A, B, C, D, E> other = (MultiParameters<A, B, C, D, E>) obj;
-      if (a == null) {
-        if (other.a != null) {
-          return false;
-        }
-      } else if (!a.equals(other.a)) {
-        return false;
-      }
-      if (b == null) {
-        if (other.b != null) {
-          return false;
-        }
-      } else if (!b.equals(other.b)) {
-        return false;
-      }
-      if (c == null) {
-        if (other.c != null) {
-          return false;
-        }
-      } else if (!c.equals(other.c)) {
-        return false;
-      }
-      if (d == null) {
-        if (other.d != null) {
-          return false;
-        }
-      } else if (!d.equals(other.d)) {
-        return false;
-      }
-      if (e == null) {
-        if (other.e != null) {
-          return false;
-        }
-      } else if (!e.equals(other.e)) {
+      if (!(o instanceof MultiParameters<?, ?, ?, ?, ?> that)) {
         return false;
       }
-      return true;
+      return Objects.equal(a, that.a)
+          && Objects.equal(b, that.b)
+          && Objects.equal(c, that.c)
+          && Objects.equal(d, that.d)
+          && Objects.equal(e, that.e);
     }
   }
 
diff --git a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
index 96c1f2e489..658bf0cf1c 100644
--- a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
+++ b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
@@ -15,6 +15,8 @@
  */
 package com.google.gson.metrics;
 
+import com.google.common.base.Objects;
+
 /**
  * Class with a bunch of primitive fields
  *
@@ -63,20 +65,18 @@ public int hashCode() {
   }
 
   @Override
-  @SuppressWarnings("EqualsGetClass")
-  public boolean equals(Object obj) {
-    if (this == obj) return true;
-    if (obj == null) return false;
-    if (getClass() != obj.getClass()) return false;
-    BagOfPrimitives other = (BagOfPrimitives) obj;
-    if (booleanValue != other.booleanValue) return false;
-    if (intValue != other.intValue) return false;
-    if (longValue != other.longValue) return false;
-    if (stringValue == null) {
-      return other.stringValue == null;
-    } else {
-      return stringValue.equals(other.stringValue);
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof BagOfPrimitives)) {
+      return false;
     }
+    BagOfPrimitives that = (BagOfPrimitives) o;
+    return longValue == that.longValue
+        && getIntValue() == that.getIntValue()
+        && booleanValue == that.booleanValue
+        && Objects.equal(stringValue, that.stringValue);
   }
 
   @Override

From a8cff336fa52c2f2bfbea4e93423cf5947238094 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Sun, 19 Feb 2023 16:53:21 +0100
Subject: [PATCH 23/55] Replaces pattern matching for instanceof with casts

---
 .../test/java/com/google/gson/ParameterizedTypeFixtures.java   | 3 ++-
 gson/src/test/java/com/google/gson/common/TestTypes.java       | 3 ++-
 .../com/google/gson/functional/ParameterizedTypesTest.java     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index f7b6965128..af4053e115 100644
--- a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -86,9 +86,10 @@ public boolean equals(Object obj) {
       if (this == obj) {
         return true;
       }
-      if (!(obj instanceof MyParameterizedType<?> that)) {
+      if (!(obj instanceof MyParameterizedType<?>)) {
         return false;
       }
+      MyParameterizedType<?> that = (MyParameterizedType<?>) obj;
       return Objects.equal(getValue(), that.getValue());
     }
   }
diff --git a/gson/src/test/java/com/google/gson/common/TestTypes.java b/gson/src/test/java/com/google/gson/common/TestTypes.java
index e9cf38a051..303d62816c 100644
--- a/gson/src/test/java/com/google/gson/common/TestTypes.java
+++ b/gson/src/test/java/com/google/gson/common/TestTypes.java
@@ -151,9 +151,10 @@ public boolean equals(Object o) {
       if (this == o) {
         return true;
       }
-      if (!(o instanceof BagOfPrimitives that)) {
+      if (!(o instanceof BagOfPrimitives)) {
         return false;
       }
+      BagOfPrimitives that = (BagOfPrimitives) o;
       return longValue == that.longValue
           && getIntValue() == that.getIntValue()
           && booleanValue == that.booleanValue
diff --git a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
index 3342d0f21f..233ec53a7c 100644
--- a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
@@ -434,9 +434,10 @@ public boolean equals(Object o) {
       if (this == o) {
         return true;
       }
-      if (!(o instanceof MultiParameters<?, ?, ?, ?, ?> that)) {
+      if (!(o instanceof MultiParameters<?, ?, ?, ?, ?>)) {
         return false;
       }
+      MultiParameters<?, ?, ?, ?, ?> that = (MultiParameters<?, ?, ?, ?, ?>) o;
       return Objects.equal(a, that.a)
           && Objects.equal(b, that.b)
           && Objects.equal(c, that.c)

From eb05e0d0ac8d95cced7f2316116fef87b218444c Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:22:37 +0100
Subject: [PATCH 24/55] Fixes `JdkObsolete` warns

This commit fix all `JdkObsolete` warns given by ErrorProne in the `gson/src/test.*` path.

In some cases I have replaced the obsolete JDK classes with the newest alternatives.  In other cases, I have added the `@SuppressWarnings("JdkObsolete")`
---
 .../test/java/com/google/gson/functional/CollectionTest.java   | 2 ++
 .../com/google/gson/functional/DefaultTypeAdaptersTest.java    | 2 +-
 .../test/java/com/google/gson/functional/InheritanceTest.java  | 1 +
 .../java/com/google/gson/functional/PrettyPrintingTest.java    | 3 ++-
 .../google/gson/functional/ToNumberPolicyFunctionalTest.java   | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 3507c94dba..570f79cc73 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -93,6 +93,7 @@ public void testTopLevelListOfIntegerCollectionsDeserialization() {
   }
 
   @Test
+  @SuppressWarnings("JdkObsolete")
   public void testLinkedListSerialization() {
     List<String> list = new LinkedList<>();
     list.add("a1");
@@ -113,6 +114,7 @@ public void testLinkedListDeserialization() {
   }
 
   @Test
+  @SuppressWarnings("JdkObsolete")
   public void testQueueSerialization() {
     Queue<String> queue = new LinkedList<>();
     queue.add("a1");
diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
index 0a81dc6686..a1b0e15a88 100644
--- a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
@@ -702,7 +702,7 @@ public void testStringBuilderDeserialization() {
 
   @Test
   public void testStringBufferSerialization() {
-    StringBuffer sb = new StringBuffer("abc");
+    StringBuilder sb = new StringBuilder("abc");
     String json = gson.toJson(sb);
     assertThat(json).isEqualTo("\"abc\"");
   }
diff --git a/gson/src/test/java/com/google/gson/functional/InheritanceTest.java b/gson/src/test/java/com/google/gson/functional/InheritanceTest.java
index a4f8c87305..ec7cdde8b3 100644
--- a/gson/src/test/java/com/google/gson/functional/InheritanceTest.java
+++ b/gson/src/test/java/com/google/gson/functional/InheritanceTest.java
@@ -162,6 +162,7 @@ public void appendFields(StringBuilder sb) {
   }
 
   @Test
+  @SuppressWarnings("JdkObsolete")
   public void testSubInterfacesOfCollectionSerialization() {
     List<Integer> list = new LinkedList<>();
     list.add(0);
diff --git a/gson/src/test/java/com/google/gson/functional/PrettyPrintingTest.java b/gson/src/test/java/com/google/gson/functional/PrettyPrintingTest.java
index 52b94490dd..5496065119 100644
--- a/gson/src/test/java/com/google/gson/functional/PrettyPrintingTest.java
+++ b/gson/src/test/java/com/google/gson/functional/PrettyPrintingTest.java
@@ -23,6 +23,7 @@
 import com.google.gson.common.TestTypes.BagOfPrimitives;
 import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -51,7 +52,7 @@ public void setUp() throws Exception {
   @Test
   public void testPrettyPrintList() {
     BagOfPrimitives b = new BagOfPrimitives();
-    List<BagOfPrimitives> listOfB = new LinkedList<>();
+    List<BagOfPrimitives> listOfB = new ArrayList<>();
     for (int i = 0; i < 15; ++i) {
       listOfB.add(b);
     }
diff --git a/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java b/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
index d500546fca..d3b153d586 100644
--- a/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
@@ -28,6 +28,7 @@
 import com.google.gson.stream.JsonReader;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -103,7 +104,7 @@ public void testAsListOfLongsOrDoubles() {
         .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
         .setNumberToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
         .create();
-    List<Object> expected = new LinkedList<>();
+    List<Object> expected = new ArrayList<>();
     expected.add(null);
     expected.add(10L);
     expected.add(10.0);

From ef27eb45b104d07c2e65403f9c76184ce6a6b988 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:28:55 +0100
Subject: [PATCH 25/55] Fixes `ClassCanBeStatic` warns

This commit fix all `ClassCanBeStatic` warns given by ErrorProne in the `gson/src/test.*` path.

I have added the `static` keyword, or I have added `@SuppressWarnings("ClassCanBeStatic")`
---
 .../java/com/google/gson/InnerClassExclusionStrategyTest.java | 1 +
 gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java | 2 +-
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 .../java/com/google/gson/functional/FieldExclusionTest.java   | 2 ++
 gson/src/test/java/com/google/gson/functional/ObjectTest.java | 2 ++
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/InnerClassExclusionStrategyTest.java b/gson/src/test/java/com/google/gson/InnerClassExclusionStrategyTest.java
index 67ad9b2926..1059f779b6 100644
--- a/gson/src/test/java/com/google/gson/InnerClassExclusionStrategyTest.java
+++ b/gson/src/test/java/com/google/gson/InnerClassExclusionStrategyTest.java
@@ -56,6 +56,7 @@ public void testIncludeStaticNestedClassField() throws Exception {
     assertThat(excluder.excludeField(f, true)).isFalse();
   }
 
+  @SuppressWarnings("ClassCanBeStatic")
   class InnerClass {
   }
 
diff --git a/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java b/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java
index cdfdb01340..1f5b4d5e17 100644
--- a/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java
+++ b/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java
@@ -112,7 +112,7 @@ public void testDeserializeDeeplyNestedObjects() throws IOException {
   }
 
   @SuppressWarnings("unused")
-  private class RuntimeType {
+  private static class RuntimeType {
     Object a = 5;
     Object b = Arrays.asList(1, 2, null);
   }
diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 570f79cc73..4861167725 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -418,9 +418,9 @@ public void testSetDeserialization() {
     }
   }
 
-  private class BigClass { private Map<String, ? extends List<SmallClass>> inBig; }
+  private static class BigClass { private Map<String, ? extends List<SmallClass>> inBig; }
 
-  private class SmallClass { private String inSmall; }
+  private static class SmallClass { private String inSmall; }
 
   @Test
   public void testIssue1107() {
diff --git a/gson/src/test/java/com/google/gson/functional/FieldExclusionTest.java b/gson/src/test/java/com/google/gson/functional/FieldExclusionTest.java
index a1f3e94922..7904776e70 100644
--- a/gson/src/test/java/com/google/gson/functional/FieldExclusionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/FieldExclusionTest.java
@@ -75,6 +75,8 @@ public void testDefaultNestedStaticClassIncluded() {
   }
 
   private static class Outer {
+
+    @SuppressWarnings("ClassCanBeStatic")
     private class Inner extends NestedClass {
       public Inner(String value) {
         super(value);
diff --git a/gson/src/test/java/com/google/gson/functional/ObjectTest.java b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
index 49a9c15100..94f4645235 100644
--- a/gson/src/test/java/com/google/gson/functional/ObjectTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
@@ -414,6 +414,8 @@ public void testInnerClassDeserialization() {
   private static class Parent {
     @SuppressWarnings("unused")
     int value1 = 1;
+
+    @SuppressWarnings("ClassCanBeStatic")
     private class Child {
       int value2 = 2;
     }

From 69b34beb573777f57739532343b642bc2b3549b1 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:35:17 +0100
Subject: [PATCH 26/55] Fixes `UndefinedEquals` warns

This commit fix all `UndefinedEquals` warns given by ErrorProne in the `gson/src/test.*` path.

I have added `@SuppressWarnings("UndefinedEquals")` or fixed the asserts

Note: In this commit I have also renamed a test from `testRawCollectionDeserializationNotAlllowed` to `testRawCollectionDeserializationNotAllowed`
---
 .../test/java/com/google/gson/functional/CollectionTest.java  | 4 ++--
 .../com/google/gson/functional/CustomTypeAdaptersTest.java    | 2 +-
 .../google/gson/functional/ToNumberPolicyFunctionalTest.java  | 4 ++--
 .../google/gson/internal/bind/DefaultDateTypeAdapterTest.java | 1 +
 .../com/google/gson/internal/bind/util/ISO8601UtilsTest.java  | 3 +++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index 4861167725..c7cfed82b0 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -268,11 +268,11 @@ public void testObjectCollectionSerialization() {
   }
 
   @Test
-  public void testRawCollectionDeserializationNotAlllowed() {
+  public void testRawCollectionDeserializationNotAllowed() {
     String json = "[0,1,2,3,4,5,6,7,8,9]";
     Collection<?> integers = gson.fromJson(json, Collection.class);
     // JsonReader converts numbers to double by default so we need a floating point comparison
-    assertThat(integers).isEqualTo(Arrays.asList(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0));
+    assertThat(integers).containsExactly(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
 
     json = "[\"Hello\", \"World\"]";
     Collection<?> strings = gson.fromJson(json, Collection.class);
diff --git a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
index 8b07ce098c..6c03c5b528 100644
--- a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
@@ -425,7 +425,7 @@ public void testEnsureCustomDeserializerNotInvokedForNullValues() {
 
   // Test created from Issue 352
   @Test
-  @SuppressWarnings("JavaUtilDate")
+  @SuppressWarnings({"JavaUtilDate", "UndefinedEquals"})
   public void testRegisterHierarchyAdapterForDate() {
     Gson gson = new GsonBuilder()
         .registerTypeHierarchyAdapter(Date.class, new DateTypeAdapter())
diff --git a/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java b/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
index d3b153d586..adebcb8226 100644
--- a/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
@@ -110,10 +110,10 @@ public void testAsListOfLongsOrDoubles() {
     expected.add(10.0);
     Type objectCollectionType = new TypeToken<Collection<Object>>() { }.getType();
     Collection<Object> objects = gson.fromJson("[null,10,10.0]", objectCollectionType);
-    assertThat(objects).isEqualTo(expected);
+    assertThat(objects).containsExactlyElementsIn(expected);
     Type numberCollectionType = new TypeToken<Collection<Number>>() { }.getType();
     Collection<Object> numbers = gson.fromJson("[null,10,10.0]", numberCollectionType);
-    assertThat(numbers).isEqualTo(expected);
+    assertThat(numbers).containsExactlyElementsIn(expected);
   }
 
   @Test
diff --git a/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java b/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
index 66d906d84f..2034e38fc6 100644
--- a/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
+++ b/gson/src/test/java/com/google/gson/internal/bind/DefaultDateTypeAdapterTest.java
@@ -227,6 +227,7 @@ private static void assertFormatted(String formatted, TypeAdapterFactory adapter
     assertThat(adapter.toJson(new Date(0))).isEqualTo(toLiteral(formatted));
   }
 
+  @SuppressWarnings("UndefinedEquals")
   private static void assertParsed(String date, TypeAdapterFactory adapterFactory) throws IOException {
     TypeAdapter<Date> adapter = dateAdapter(adapterFactory);
     assertWithMessage(date).that(adapter.fromJson(toLiteral(date))).isEqualTo(new Date(0));
diff --git a/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java b/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
index 690f289d14..4a16ee9f8a 100644
--- a/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
+++ b/gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
@@ -77,6 +77,7 @@ public void testDateFormatWithTimezone() {
     }
 
   @Test
+  @SuppressWarnings("UndefinedEquals")
   public void testDateParseWithDefaultTimezone() throws ParseException {
         String dateStr = "2018-06-25";
         Date date = ISO8601Utils.parse(dateStr, new ParsePosition(0));
@@ -105,6 +106,7 @@ public void testDateParseInvalidMonth() {
     }
 
   @Test
+  @SuppressWarnings("UndefinedEquals")
   public void testDateParseWithTimezone() throws ParseException {
         String dateStr = "2018-06-25T00:00:00-03:00";
         Date date = ISO8601Utils.parse(dateStr, new ParsePosition(0));
@@ -115,6 +117,7 @@ public void testDateParseWithTimezone() throws ParseException {
     }
 
   @Test
+  @SuppressWarnings("UndefinedEquals")
   public void testDateParseSpecialTimezone() throws ParseException {
         String dateStr = "2018-06-25T00:02:00-02:58";
         Date date = ISO8601Utils.parse(dateStr, new ParsePosition(0));

From 7a203854311deb80f965e01219a7803a16e3b540 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:37:29 +0100
Subject: [PATCH 27/55] Fixes `GetClassOnEnum` warns

This commit fix all `GetClassOnEnum` warns given by ErrorProne in the `gson/src/test.*` path.

I have replaced the `.getClass()` with `.getDeclaringClass()`
---
 gson/src/test/java/com/google/gson/functional/EnumTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/EnumTest.java b/gson/src/test/java/com/google/gson/functional/EnumTest.java
index 0a9d0cde6c..3cf4396eb3 100644
--- a/gson/src/test/java/com/google/gson/functional/EnumTest.java
+++ b/gson/src/test/java/com/google/gson/functional/EnumTest.java
@@ -121,7 +121,7 @@ public String getExpectedJson() {
    */
   @Test
   public void testEnumSubclass() {
-    assertThat(Roshambo.ROCK.getClass()).isAssignableTo(Roshambo.class);
+    assertThat(Roshambo.ROCK.getDeclaringClass()).isAssignableTo(Roshambo.class);
     assertThat(gson.toJson(Roshambo.ROCK)).isEqualTo("\"ROCK\"");
     assertThat(gson.toJson(EnumSet.allOf(Roshambo.class))).isEqualTo("[\"ROCK\",\"PAPER\",\"SCISSORS\"]");
     assertThat(gson.fromJson("\"ROCK\"", Roshambo.class)).isEqualTo(Roshambo.ROCK);
@@ -135,7 +135,7 @@ public void testEnumSubclassWithRegisteredTypeAdapter() {
     gson = new GsonBuilder()
         .registerTypeHierarchyAdapter(Roshambo.class, new MyEnumTypeAdapter())
         .create();
-    assertThat(Roshambo.ROCK.getClass()).isAssignableTo(Roshambo.class);
+    assertThat(Roshambo.ROCK.getDeclaringClass()).isAssignableTo(Roshambo.class);
     assertThat(gson.toJson(Roshambo.ROCK)).isEqualTo("\"123ROCK\"");
     assertThat(gson.toJson(EnumSet.allOf(Roshambo.class))).isEqualTo("[\"123ROCK\",\"123PAPER\",\"123SCISSORS\"]");
     assertThat(gson.fromJson("\"123ROCK\"", Roshambo.class)).isEqualTo(Roshambo.ROCK);

From 462730789b97bc2fecfaa65075b03dfba1ca7b82 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:42:14 +0100
Subject: [PATCH 28/55] Fixes `ImmutableEnumChecker` warns

This commit fix all `ImmutableEnumChecker` warns given by ErrorProne in the `gson/src/test.*` path.

I have added the `final` keyword, or I have added the `@SuppressWarnings("ImmutableEnumChecker")` annotation
---
 .../com/google/gson/functional/CustomDeserializerTest.java    | 2 ++
 gson/src/test/java/com/google/gson/functional/EnumTest.java   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java b/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java
index 0ee5d8605d..02a4a18490 100644
--- a/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.errorprone.annotations.Immutable;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
@@ -130,6 +131,7 @@ private static class MyBase {
     static final String TYPE_ACCESS = "__type__";
   }
 
+  @SuppressWarnings("ImmutableEnumChecker")
   private enum SubTypes {
     SUB_TYPE1(SubType1.class),
     SUB_TYPE2(SubType2.class);
diff --git a/gson/src/test/java/com/google/gson/functional/EnumTest.java b/gson/src/test/java/com/google/gson/functional/EnumTest.java
index 3cf4396eb3..b000cd1a78 100644
--- a/gson/src/test/java/com/google/gson/functional/EnumTest.java
+++ b/gson/src/test/java/com/google/gson/functional/EnumTest.java
@@ -239,8 +239,8 @@ public void testEnumClassWithFields() {
 
   private enum Color {
     RED("red", 1), BLUE("blue", 2), GREEN("green", 3);
-    String value;
-    int index;
+    final String value;
+    final int index;
     private Color(String value, int index) {
       this.value = value;
       this.index = index;

From 13de98d187e5b669ebc0d9eb32dc26773c5c620c Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:44:59 +0100
Subject: [PATCH 29/55] Fixes `StaticAssignmentOfThrowable` warns

This commit fix all `StaticAssignmentOfThrowable` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../test/java/com/google/gson/functional/Java17RecordTest.java  | 2 ++
 gson/src/test/java/com/google/gson/functional/ObjectTest.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java b/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
index cbda656cfb..0b9a6c078c 100644
--- a/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
+++ b/gson/src/test/java/com/google/gson/functional/Java17RecordTest.java
@@ -136,6 +136,7 @@ record LocalRecord(String s) {
 
   /** Tests behavior when the canonical constructor throws an exception */
   @Test
+  @SuppressWarnings("StaticAssignmentOfThrowable")
   public void testThrowingConstructor() {
     record LocalRecord(String s) {
       static final RuntimeException thrownException = new RuntimeException("Custom exception");
@@ -172,6 +173,7 @@ public String s() {
 
   /** Tests behavior when a record accessor method throws an exception */
   @Test
+  @SuppressWarnings("StaticAssignmentOfThrowable")
   public void testThrowingAccessor() {
     record LocalRecord(String s) {
       static final RuntimeException thrownException = new RuntimeException("Custom exception");
diff --git a/gson/src/test/java/com/google/gson/functional/ObjectTest.java b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
index 94f4645235..3eb2070244 100644
--- a/gson/src/test/java/com/google/gson/functional/ObjectTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
@@ -657,6 +657,7 @@ public void testThrowingDefaultConstructor() {
     }
   }
 
+  @SuppressWarnings("StaticAssignmentOfThrowable")
   static class ClassWithThrowingConstructor {
     static final RuntimeException thrownException = new RuntimeException("Custom exception");
 

From 3ae4face37126d104bfdd6fcf9737d3566516b54 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:49:20 +0100
Subject: [PATCH 30/55] Fixes `AssertionFailureIgnored` warns

This commit fix all `AssertionFailureIgnored` warns given by ErrorProne in the `gson/src/test.*` path.

I have added the `@SuppressWarnings("AssertionFailureIgnored")` annotation
---
 .../com/google/gson/functional/GsonVersionDiagnosticsTest.java | 2 ++
 .../google/gson/internal/UnsafeAllocatorInstantiationTest.java | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java b/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
index df73d72939..937a9065bf 100644
--- a/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
+++ b/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
@@ -59,6 +59,7 @@ public void testVersionPattern() {
   }
 
   @Test
+  @SuppressWarnings("AssertionFailureIgnored")
   public void testAssertionErrorInSerializationPrintsVersion() {
     try {
       gson.toJson(new TestType());
@@ -69,6 +70,7 @@ public void testAssertionErrorInSerializationPrintsVersion() {
   }
 
   @Test
+  @SuppressWarnings("AssertionFailureIgnored")
   public void testAssertionErrorInDeserializationPrintsVersion() {
     try {
       gson.fromJson("{'a':'abc'}", TestType.class);
diff --git a/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java b/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java
index a80a4c3d61..016deb6478 100644
--- a/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java
+++ b/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java
@@ -16,6 +16,7 @@
 package com.google.gson.internal;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
@@ -40,6 +41,7 @@ public static class ConcreteClass {
    * to instantiate an interface
    */
   @Test
+  @SuppressWarnings("AssertionFailureIgnored")
   public void testInterfaceInstantiation() throws Exception {
     try {
       UnsafeAllocator.INSTANCE.newInstance(Interface.class);
@@ -54,6 +56,7 @@ public void testInterfaceInstantiation() throws Exception {
    * to instantiate an abstract class
    */
   @Test
+  @SuppressWarnings("AssertionFailureIgnored")
   public void testAbstractClassInstantiation() throws Exception {
     try {
       UnsafeAllocator.INSTANCE.newInstance(AbstractClass.class);

From 661eae84a1b890c2a49d5de25fcb5e0f85d65780 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:50:36 +0100
Subject: [PATCH 31/55] Fixes `ModifiedButNotUsed` warns

This commit fix all `ModifiedButNotUsed` warns given by ErrorProne in the `gson/src/test.*` path.

I have added the `@SuppressWarnings("ModifiedButNotUsed")` annotation
---
 .../test/java/com/google/gson/internal/LinkedTreeMapTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java b/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
index c811e31b12..9d63166d89 100644
--- a/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
+++ b/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
@@ -61,6 +61,7 @@ public void testRemoveRootDoesNotDoubleUnlink() {
   }
 
   @Test
+  @SuppressWarnings("ModifiedButNotUsed")
   public void testPutNullKeyFails() {
     LinkedTreeMap<String, String> map = new LinkedTreeMap<>();
     try {
@@ -71,6 +72,7 @@ public void testPutNullKeyFails() {
   }
 
   @Test
+  @SuppressWarnings("ModifiedButNotUsed")
   public void testPutNonComparableKeyFails() {
     LinkedTreeMap<Object, String> map = new LinkedTreeMap<>();
     try {

From 274288153e6811546b8cbae567007b72675e84cb Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:55:23 +0100
Subject: [PATCH 32/55] Fixes `MissingSummary` warns

This commit fix all `MissingSummary` warns given by ErrorProne in the `gson/src/test.*` path.

I have remove the Javadoc `@author`
---
 gson/src/test/java/com/google/gson/CommentsTest.java          | 4 +---
 gson/src/test/java/com/google/gson/JsonArrayTest.java         | 4 +---
 gson/src/test/java/com/google/gson/JsonNullTest.java          | 4 +---
 .../java/com/google/gson/OverrideCoreTypeAdaptersTest.java    | 4 +---
 gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/CommentsTest.java b/gson/src/test/java/com/google/gson/CommentsTest.java
index f1bcd94868..f4a2103ab7 100644
--- a/gson/src/test/java/com/google/gson/CommentsTest.java
+++ b/gson/src/test/java/com/google/gson/CommentsTest.java
@@ -22,9 +22,7 @@
 import java.util.List;
 import org.junit.Test;
 
-/**
- * @author Jesse Wilson
- */
+
 public final class CommentsTest {
 
   /**
diff --git a/gson/src/test/java/com/google/gson/JsonArrayTest.java b/gson/src/test/java/com/google/gson/JsonArrayTest.java
index bd0f7a175f..a81b83d767 100644
--- a/gson/src/test/java/com/google/gson/JsonArrayTest.java
+++ b/gson/src/test/java/com/google/gson/JsonArrayTest.java
@@ -25,9 +25,7 @@
 import java.math.BigInteger;
 import org.junit.Test;
 
-/**
- * @author Jesse Wilson
- */
+
 public final class JsonArrayTest {
 
   @Test
diff --git a/gson/src/test/java/com/google/gson/JsonNullTest.java b/gson/src/test/java/com/google/gson/JsonNullTest.java
index caaf0ad854..29897bd426 100644
--- a/gson/src/test/java/com/google/gson/JsonNullTest.java
+++ b/gson/src/test/java/com/google/gson/JsonNullTest.java
@@ -21,9 +21,7 @@
 import com.google.gson.common.MoreAsserts;
 import org.junit.Test;
 
-/**
- * @author Jesse Wilson
- */
+
 public final class JsonNullTest {
 
   @SuppressWarnings("deprecation")
diff --git a/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java
index fab0d96b88..12d2406378 100644
--- a/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java
@@ -24,9 +24,7 @@
 import java.util.Locale;
 import org.junit.Test;
 
-/**
- * @author Jesse Wilson
- */
+
 public class OverrideCoreTypeAdaptersTest {
   private static final TypeAdapter<Boolean> booleanAsIntAdapter = new TypeAdapter<Boolean>() {
     @Override public void write(JsonWriter out, Boolean value) throws IOException {
diff --git a/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java b/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
index 52b2988d9d..0843047685 100644
--- a/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
+++ b/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
@@ -28,9 +28,7 @@
 import java.util.Set;
 import org.junit.Test;
 
-/**
- * @author Jesse Wilson
- */
+
 public final class TypeTokenTest {
   // These fields are accessed using reflection by the tests below
   List<Integer> listOfInteger = null;

From 7d688ed84de792dbc5a21d73f6135dabbd114c62 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 09:57:41 +0100
Subject: [PATCH 33/55] Fixes `FloatingPointLiteralPrecision` warns

This commit fix all `FloatingPointLiteralPrecision` warns given by ErrorProne in the `gson/src/test.*` path.

I have added the `@SuppressWarnings("FloatingPointLiteralPrecision")` annotation
---
 gson/src/test/java/com/google/gson/stream/JsonReaderTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
index 09c07470df..c5a37fa164 100644
--- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
+++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
@@ -740,6 +740,7 @@ public void disabled_testPeekLargerThanLongMaxValue() throws IOException {
    */
   @Test
   @Ignore
+  @SuppressWarnings("FloatingPointLiteralPrecision")
   public void disabled_testPeekLargerThanLongMinValue() throws IOException {
     JsonReader reader = new JsonReader(reader("[-9223372036854775809]"));
     reader.setLenient(true);
@@ -768,6 +769,7 @@ public void disabled_testHighPrecisionLong() throws IOException {
   }
 
   @Test
+  @SuppressWarnings("FloatingPointLiteralPrecision")
   public void testPeekMuchLargerThanLongMinValue() throws IOException {
     JsonReader reader = new JsonReader(reader("[-92233720368547758080]"));
     reader.setLenient(true);

From 67a8edf5d47da81cf52bb55c08df8108a822af29 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:05:27 +0100
Subject: [PATCH 34/55] Fixes `StringSplitter` warns

This commit fix all `StringSplitter` warns given by ErrorProne in the `gson/src/test.*` path.

I have replaced the `String.split(...)` with `Splitter`
---
 .../google/gson/functional/CustomTypeAdaptersTest.java    | 8 +++++---
 .../functional/JsonAdapterAnnotationOnClassesTest.java    | 6 ++++--
 .../google/gson/functional/StreamingTypeAdaptersTest.java | 5 +++--
 .../test/java/com/google/gson/regression/OSGiTest.java    | 3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
index 6c03c5b528..d398e93677 100644
--- a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java
@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.common.base.Splitter;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.InstanceCreator;
@@ -35,6 +36,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.junit.Before;
@@ -291,9 +293,9 @@ private static final class StringHolder {
     String part2;
 
     public StringHolder(String string) {
-      String[] parts = string.split(":");
-      part1 = parts[0];
-      part2 = parts[1];
+      List<String> parts = Splitter.on(':').splitToList(string);
+      part1 = parts.get(0);
+      part2 = parts.get(1);
     }
     public StringHolder(String part1, String part2) {
       this.part1 = part1;
diff --git a/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnClassesTest.java b/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnClassesTest.java
index 4731f0df35..3edd8d79d4 100644
--- a/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnClassesTest.java
+++ b/gson/src/test/java/com/google/gson/functional/JsonAdapterAnnotationOnClassesTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import com.google.common.base.Splitter;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
@@ -36,6 +37,7 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Locale;
 import org.junit.Test;
 
@@ -226,9 +228,9 @@ private static class UserJsonAdapter extends TypeAdapter<User> {
       // implement read: split name into firstName and lastName
       in.beginObject();
       in.nextName();
-      String[] nameParts = in.nextString().split(" ");
+      List<String> nameParts = Splitter.on(" ").splitToList(in.nextString());
       in.endObject();
-      return new User(nameParts[0], nameParts[1]);
+      return new User(nameParts.get(0), nameParts.get(1));
     }
   }
 
diff --git a/gson/src/test/java/com/google/gson/functional/StreamingTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/StreamingTypeAdaptersTest.java
index 6e13624f22..fecc828f47 100644
--- a/gson/src/test/java/com/google/gson/functional/StreamingTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/StreamingTypeAdaptersTest.java
@@ -20,6 +20,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 
+import com.google.common.base.Splitter;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
@@ -172,8 +173,8 @@ public void testDeserialize2dArray() throws IOException {
   public void testNullSafe() {
     TypeAdapter<Person> typeAdapter = new TypeAdapter<Person>() {
       @Override public Person read(JsonReader in) throws IOException {
-        String[] values = in.nextString().split(",");
-        return new Person(values[0], Integer.parseInt(values[1]));
+        List<String> values = Splitter.on(',').splitToList(in.nextString());
+        return new Person(values.get(0), Integer.parseInt(values.get(1)));
       }
       @Override public void write(JsonWriter out, Person person) throws IOException {
         out.value(person.name + "," + person.age);
diff --git a/gson/src/test/java/com/google/gson/regression/OSGiTest.java b/gson/src/test/java/com/google/gson/regression/OSGiTest.java
index 000a6731ce..21b981aec9 100644
--- a/gson/src/test/java/com/google/gson/regression/OSGiTest.java
+++ b/gson/src/test/java/com/google/gson/regression/OSGiTest.java
@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
 
+import com.google.common.base.Splitter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -41,7 +42,7 @@ public void testSunMiscImportPackage() throws Exception {
         Manifest mf = findManifest("com.google.gson");
         String importPkg = mf.getMainAttributes().getValue("Import-Package");
     assertWithMessage("Import-Package statement is there").that(importPkg).isNotNull();
-        for (String dep : importPkg.split(",")) {
+        for (String dep : Splitter.on(',').split(importPkg)) {
             if (dep.contains("sun.misc")) {
                 assertSubstring("sun.misc import is optional", dep, "resolution:=optional");
                 return;

From b92cb966f4bb210adba9f7c44d867ef3dfd7f691 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:11:49 +0100
Subject: [PATCH 35/55] Fixes `EmptyCatch` warns

This commit fix all `EmptyCatch` warns given by ErrorProne in the `gson/src/test.*` path.
---
 gson/src/test/java/com/google/gson/stream/JsonReaderTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
index c5a37fa164..43a478afaa 100644
--- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
+++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
@@ -642,6 +642,7 @@ private void assertNotANumber(String s) throws IOException {
       strictReader.nextDouble();
       fail("Should have failed reading " + s + " as double");
     } catch (MalformedJsonException e) {
+      // OK:  Should fail because `s` can't be read as double
     }
   }
 
@@ -2007,6 +2008,7 @@ private void assertDocument(String document, Object... expectations) throws IOEx
           reader.peek();
           fail();
         } catch (IOException expected) {
+          // OK: Should fail
         }
       } else {
         throw new AssertionError();

From dcb277e44ea60a03f19351d6812bcc66eab4cd47 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:13:28 +0100
Subject: [PATCH 36/55] Fixes `UnicodeEscape` warns

This commit fix all `UnicodeEscape` warns given by ErrorProne in the `gson/src/test.*` path.
---
 gson/src/test/java/com/google/gson/functional/StringTest.java | 1 +
 gson/src/test/java/com/google/gson/stream/JsonReaderTest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gson/src/test/java/com/google/gson/functional/StringTest.java b/gson/src/test/java/com/google/gson/functional/StringTest.java
index e92b2da9a9..a3d18701e8 100644
--- a/gson/src/test/java/com/google/gson/functional/StringTest.java
+++ b/gson/src/test/java/com/google/gson/functional/StringTest.java
@@ -149,6 +149,7 @@ public void testAssignmentCharSerialization() {
    * Created in response to http://groups.google.com/group/google-gson/browse_thread/thread/2431d4a3d0d6cb23
    */
   @Test
+  @SuppressWarnings("UnicodeEscape")
   public void testAssignmentCharDeserialization() {
     String json = "\"abc=\"";
     String value = gson.fromJson(json, String.class);
diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
index 43a478afaa..16b8fe1e06 100644
--- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
+++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
@@ -785,6 +785,7 @@ public void testPeekMuchLargerThanLongMinValue() throws IOException {
   }
 
   @Test
+  @SuppressWarnings("UnicodeEscape")
   public void testQuotedNumberWithEscape() throws IOException {
     JsonReader reader = new JsonReader(reader("[\"12\u00334\"]"));
     reader.setLenient(true);

From 6dee3980d5e7176ccad54e7f09a555c433e5c83a Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:18:12 +0100
Subject: [PATCH 37/55] Fixes `EmptyBlockTag` warns

This commit fix all `EmptyBlockTag` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../test/java/com/google/gson/ParameterizedTypeFixtures.java    | 2 +-
 gson/src/test/java/com/google/gson/stream/JsonReaderTest.java   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index af4053e115..0e18429208 100644
--- a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -103,7 +103,7 @@ public static class MyParameterizedTypeInstanceCreator<T>
      * This is usually fine in tests since there we deserialize just once, but quite
      * dangerous in practice.
      *
-     * @param instanceOfT
+     * @param instanceOfT Instance of Type
      */
     public MyParameterizedTypeInstanceCreator(T instanceOfT) {
       this.instanceOfT = instanceOfT;
diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
index 16b8fe1e06..be37de14d0 100644
--- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
+++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
@@ -706,7 +706,6 @@ public void testLongLargerThanMinLongThatWrapsAround() throws IOException {
 
   /**
    * Issue 1053, negative zero.
-   * @throws Exception
    */
   @Test
   public void testNegativeZero() throws Exception {

From 682d5dfda32e12382c640a3d5a2aab8143706460 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:19:52 +0100
Subject: [PATCH 38/55] Fixes `LongFloatConversion` warns

This commit fix all `LongFloatConversion` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../src/test/java/com/google/gson/functional/PrimitiveTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java b/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
index bfb319155e..0eb1af9cc7 100644
--- a/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
+++ b/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
@@ -192,7 +192,7 @@ public void testFloatSerialization() {
     // Should perform widening conversion
     assertThat(gson.toJson((byte) 1, Float.class)).isEqualTo("1.0");
     // (This widening conversion is actually lossy)
-    assertThat(gson.toJson(Long.MAX_VALUE - 10L, Float.class)).isEqualTo(Float.toString(Long.MAX_VALUE - 10L));
+    assertThat(gson.toJson(Long.MAX_VALUE - 10L, Float.class)).isEqualTo(Float.toString((float) Long.MAX_VALUE - 10L));
     // Should perform narrowing conversion
     gson = new GsonBuilder().serializeSpecialFloatingPointValues().create();
     assertThat(gson.toJson(Double.MAX_VALUE, Float.class)).isEqualTo("Infinity");

From c1681bf6c72fbc6f3c59e147e86ea9e457d5eeb2 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:20:26 +0100
Subject: [PATCH 39/55] Fixes `LongDoubleConversion` warns

This commit fix all `LongDoubleConversion` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../src/test/java/com/google/gson/functional/PrimitiveTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java b/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
index 0eb1af9cc7..28d8312f0f 100644
--- a/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
+++ b/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
@@ -207,7 +207,7 @@ public void testDoubleSerialization() {
     // Should perform widening conversion
     assertThat(gson.toJson((byte) 1, Double.class)).isEqualTo("1.0");
     // (This widening conversion is actually lossy)
-    assertThat(gson.toJson(Long.MAX_VALUE - 10L, Double.class)).isEqualTo(Double.toString(Long.MAX_VALUE - 10L));
+    assertThat(gson.toJson(Long.MAX_VALUE - 10L, Double.class)).isEqualTo(Double.toString((double) (Long.MAX_VALUE - 10L)));
   }
 
   @Test

From 69dcd03f89ec5f7a0fde96eade1731ffd41a7c47 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:21:51 +0100
Subject: [PATCH 40/55] Fixes `TruthAssertExpected` warns

This commit fix all `TruthAssertExpected` warns given by ErrorProne in the `gson/src/test.*` path.
---
 gson/src/test/java/com/google/gson/functional/EscapingTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/EscapingTest.java b/gson/src/test/java/com/google/gson/functional/EscapingTest.java
index deaca904bf..952e3582a4 100644
--- a/gson/src/test/java/com/google/gson/functional/EscapingTest.java
+++ b/gson/src/test/java/com/google/gson/functional/EscapingTest.java
@@ -70,7 +70,7 @@ public void testEscapingObjectFields() {
     assertThat(jsonRepresentation).contains("\\\"");
 
     BagOfPrimitives expectedObject = gson.fromJson(jsonRepresentation, BagOfPrimitives.class);
-    assertThat(expectedObject.getExpectedJson()).isEqualTo(objWithPrimitives.getExpectedJson());
+    assertThat(objWithPrimitives.getExpectedJson()).isEqualTo(expectedObject.getExpectedJson());
   }
   
   @Test

From 03e86d6e4e386acdc0f056e2c0e57d9ad1ba811f Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:23:11 +0100
Subject: [PATCH 41/55] Fixes `UnusedMethod` warns

This commit fix all `UnusedMethod` warns given by ErrorProne in the `gson/src/test.*` path.
---
 gson/src/test/java/com/google/gson/functional/EnumTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gson/src/test/java/com/google/gson/functional/EnumTest.java b/gson/src/test/java/com/google/gson/functional/EnumTest.java
index b000cd1a78..cf0b14e868 100644
--- a/gson/src/test/java/com/google/gson/functional/EnumTest.java
+++ b/gson/src/test/java/com/google/gson/functional/EnumTest.java
@@ -207,6 +207,7 @@ private enum Roshambo {
       }
     };
 
+    @SuppressWarnings("unused")
     abstract Roshambo defeats();
   }
 

From 1feefb4039836663e1edb8f897e4bfc29e56063e Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:27:10 +0100
Subject: [PATCH 42/55] Fixes `UnusedTypeParameter` warns

This commit fix all `UnusedTypeParameter` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../java/com/google/gson/functional/TreeTypeAdaptersTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gson/src/test/java/com/google/gson/functional/TreeTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/TreeTypeAdaptersTest.java
index 9e0382d010..34280e5d65 100644
--- a/gson/src/test/java/com/google/gson/functional/TreeTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/TreeTypeAdaptersTest.java
@@ -79,6 +79,7 @@ public void testDeserializeId() {
     assertThat(target.getId().getValue()).isEqualTo("1");
   }
 
+  @SuppressWarnings("UnusedTypeParameter")
   private static final class Id<R> {
     final String value;
     @SuppressWarnings("unused")

From 7ac446515afa011da021f327c1a278721314850f Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:28:25 +0100
Subject: [PATCH 43/55] Fixes `CatchFail` warns

This commit fix all `CatchFail` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../java/com/google/gson/functional/ReflectionAccessTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java b/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
index f552a5fc19..f41876c94a 100644
--- a/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
@@ -119,6 +119,7 @@ public Object read(JsonReader in) throws IOException {
    * <p>See https://github.com/google/gson/issues/1875
    */
   @Test
+  @SuppressWarnings("CatchFail")
   public void testSerializeInternalImplementationObject() {
     Gson gson = new Gson();
     String json = gson.toJson(Collections.emptyList());

From 92972bfa8699a5a99fc38df5f08bb329418ba7e7 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:30:52 +0100
Subject: [PATCH 44/55] Fixes `MathAbsoluteNegative` warns

This commit fix all `MathAbsoluteNegative` warns given by ErrorProne in the `gson/src/test.*` path.
---
 .../test/java/com/google/gson/internal/LinkedTreeMapTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java b/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
index 9d63166d89..f902d2ee4f 100644
--- a/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
+++ b/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
@@ -176,12 +176,12 @@ public void testEmptyStringValues() {
   }
 
   @Test
-  public void testLargeSetOfRandomKeys() throws Exception {
+  public void testLargeSetOfRandomKeys() {
     Random random = new Random(1367593214724L);
     LinkedTreeMap<String, String> map = new LinkedTreeMap<>();
     String[] keys = new String[1000];
     for (int i = 0; i < keys.length; i++) {
-      keys[i] = Integer.toString(Math.abs(random.nextInt()), 36) + "-" + i;
+      keys[i] = Integer.toString(Math.abs(random.nextInt(Integer.MAX_VALUE)), 36) + "-" + i;
       map.put(keys[i], "" + i);
     }
 

From 2167d4c4616a396a63b0efe2206de0a621a2d893 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:32:25 +0100
Subject: [PATCH 45/55] Fixes `LoopOverCharArray` warns

This commit fix all `LoopOverCharArray` warns given by ErrorProne in the `gson/src/test.*` path.

`toCharArray` allocates a new array, using `charAt` is more efficient
---
 .../java/com/google/gson/functional/PrintFormattingTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java b/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java
index d31a43d005..5435d82b91 100644
--- a/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java
+++ b/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java
@@ -79,7 +79,8 @@ public void testJsonObjectWithNullValuesSerialized() {
   }
 
   private static void assertContainsNoWhiteSpace(String str) {
-    for (char c : str.toCharArray()) {
+    for (int i = 0; i < str.length(); i++) {
+      char c = str.charAt(i);
       assertThat(Character.isWhitespace(c)).isFalse();
     }
   }

From 126b1b5c3a0ffae7de3ac01fceaff103d8369914 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:33:18 +0100
Subject: [PATCH 46/55] Fixes `HidingField` warns

This commit fix all `HidingField` warns given by ErrorProne in the `gson/src/test.*` path.
---
 gson/src/test/java/com/google/gson/functional/ObjectTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/functional/ObjectTest.java b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
index 3eb2070244..47eaf9df3f 100644
--- a/gson/src/test/java/com/google/gson/functional/ObjectTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ObjectTest.java
@@ -161,7 +161,7 @@ public void testClassWithNoFieldsDeserialization() {
   private static class Subclass extends Superclass1 {
   }
   private static class Superclass1 extends Superclass2 {
-    @SuppressWarnings("unused")
+    @SuppressWarnings({"unused", "HidingField"})
     String s;
   }
   private static class Superclass2 {

From 4aaefea2492f83f516aee8d57a150dcf260c3e8f Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:39:11 +0100
Subject: [PATCH 47/55] Implements code review feedback

---
 gson/pom.xml                                                | 1 +
 gson/src/main/java/com/google/gson/stream/JsonReader.java   | 6 +++---
 gson/src/main/java/module-info.java                         | 2 +-
 .../java/com/google/gson/ParameterizedTypeFixtures.java     | 2 +-
 .../com/google/gson/functional/ParameterizedTypesTest.java  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gson/pom.xml b/gson/pom.xml
index 742e33383b..d80226c0a4 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -59,6 +59,7 @@
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
       <version>2.18.0</version>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 
diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java
index 3f853d8e25..559ab2db81 100644
--- a/gson/src/main/java/com/google/gson/stream/JsonReader.java
+++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java
@@ -1590,7 +1590,7 @@ public String getPath() {
    * @throws NumberFormatException if any unicode escape sequences are
    *     malformed.
    */
-  @SuppressWarnings({"fallthrough", "NarrowingCompoundAssignment"})
+  @SuppressWarnings("fallthrough")
   private char readEscapeCharacter() throws IOException {
     if (pos == limit && !fillBuffer(1)) {
       throw syntaxError("Unterminated escape sequence");
@@ -1603,7 +1603,7 @@ private char readEscapeCharacter() throws IOException {
         throw syntaxError("Unterminated escape sequence");
       }
       // Equivalent to Integer.parseInt(stringPool.get(buffer, pos, 4), 16);
-      char result = 0;
+      int result = 0;
       for (int i = pos, end = i + 4; i < end; i++) {
         char c = buffer[i];
         result <<= 4;
@@ -1618,7 +1618,7 @@ private char readEscapeCharacter() throws IOException {
         }
       }
       pos += 4;
-      return result;
+      return (char) result;
 
     case 't':
       return '\t';
diff --git a/gson/src/main/java/module-info.java b/gson/src/main/java/module-info.java
index 372e5ad1c4..a7b6afbb00 100644
--- a/gson/src/main/java/module-info.java
+++ b/gson/src/main/java/module-info.java
@@ -25,7 +25,7 @@
   exports com.google.gson.stream;
 
   // Dependency on Error Prone Annotations
-  requires com.google.errorprone.annotations;
+  requires static com.google.errorprone.annotations;
 
   // Optional dependency on java.sql
   requires static java.sql;
diff --git a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index 0e18429208..fc49f6a45a 100644
--- a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -36,7 +36,7 @@
  */
 public class ParameterizedTypeFixtures {
 
-  public static class MyParameterizedType<T> {
+  public static final class MyParameterizedType<T> {
     public final T value;
     public MyParameterizedType(T value) {
       this.value = value;
diff --git a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
index 233ec53a7c..daf049dc70 100644
--- a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java
@@ -400,7 +400,7 @@ public String toString(T obj) {
     }
   }
 
-  private static class MultiParameters<A, B, C, D, E> {
+  private static final class MultiParameters<A, B, C, D, E> {
     A a;
     B b;
     C c;

From f1c55913dee6ea4b445ae3aa86b9e7b64a7509d8 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:43:43 +0100
Subject: [PATCH 48/55] Implements code review feedback

This commit implements some other code review feedback
---
 .../java/com/google/gson/metrics/BagOfPrimitives.java    | 2 +-
 .../protobuf/functional/ProtosWithAnnotationsTest.java   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
index 658bf0cf1c..1cdc37eaf1 100644
--- a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
+++ b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
     }
     BagOfPrimitives that = (BagOfPrimitives) o;
     return longValue == that.longValue
-        && getIntValue() == that.getIntValue()
+        && intValue == that.intValue
         && booleanValue == that.booleanValue
         && Objects.equal(stringValue, that.stringValue);
   }
diff --git a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
index 30908d0f51..b909434448 100644
--- a/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
+++ b/proto/src/test/java/com/google/gson/protobuf/functional/ProtosWithAnnotationsTest.java
@@ -28,7 +28,6 @@
 import com.google.gson.protobuf.generated.Bag.OuterMessage;
 import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations;
 import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations.InnerMessage;
-import com.google.gson.protobuf.generated.Bag.ProtoWithAnnotations.InnerMessage.Data;
 import com.google.protobuf.GeneratedMessageV3;
 import org.junit.Before;
 import org.junit.Test;
@@ -111,10 +110,10 @@ public void testProtoWithAnnotations_deserialize() {
     assertThat(proto.getInnerMessage2()).isEqualTo(InnerMessage.newBuilder()
         .setNIdCt(98798465)
         .setContent(InnerMessage.Type.TEXT)
-        .addData(Data.newBuilder()
+        .addData(InnerMessage.Data.newBuilder()
             .setData("OFIN8e9fhwoeh8((⁹8efywoih")
             .setHeight(665))
-        .addData(Data.newBuilder()
+        .addData(InnerMessage.Data.newBuilder()
             .setData("65")
             .setWidth(-56684))
         .build());
@@ -194,10 +193,10 @@ public void testProtoWithAnnotations_serialize() {
         .setInnerMessage1(InnerMessage.newBuilder()
             .setNIdCt(12)
             .setContent(InnerMessage.Type.IMAGE)
-            .addData(Data.newBuilder()
+            .addData(InnerMessage.Data.newBuilder()
                 .setData("data$$")
                 .setWidth(200))
-            .addData(Data.newBuilder()
+            .addData(InnerMessage.Data.newBuilder()
                 .setHeight(56)))
         .build();
 

From 7590168817e5eda9f74e7d112ea8acb3af71c24a Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 10:58:25 +0100
Subject: [PATCH 49/55] Enable ErrorProne in `extra`

Thi commit removes the `.*extras/src/test.*` path from the `-XepExcludedPaths` parameter of ErrorProne.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3e5c7bf75a..06722801ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
             <compilerArgs>
               <!-- Args related to Error Prone, see: https://errorprone.info/docs/installation#maven -->
               <arg>-XDcompilePolicy=simple</arg>
-              <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*extras/src/test.*|.*/generated-test-sources/protobuf/.*</arg>
+              <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-test-sources/protobuf/.*</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>

From 1bb54c4c63bdcdb29ecd387c0d4d686754ea58f1 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Wed, 22 Feb 2023 11:00:04 +0100
Subject: [PATCH 50/55] Fix the `JavaUtilDate` warns

This commit fix all `JavaUtilDate` warns given by ErrorProne in the `extras/src/test.*` path.
---
 .../com/google/gson/typeadapters/UtcDateTypeAdapterTest.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/src/test/java/com/google/gson/typeadapters/UtcDateTypeAdapterTest.java b/extras/src/test/java/com/google/gson/typeadapters/UtcDateTypeAdapterTest.java
index b520183528..3d3262a336 100644
--- a/extras/src/test/java/com/google/gson/typeadapters/UtcDateTypeAdapterTest.java
+++ b/extras/src/test/java/com/google/gson/typeadapters/UtcDateTypeAdapterTest.java
@@ -29,6 +29,7 @@
 import java.util.TimeZone;
 import org.junit.Test;
 
+@SuppressWarnings("JavaUtilDate")
 public final class UtcDateTypeAdapterTest {
   private final Gson gson = new GsonBuilder()
     .registerTypeAdapter(Date.class, new UtcDateTypeAdapter())

From a50751248f2b36d45029c064f094ff55cd87cd2a Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Thu, 23 Feb 2023 11:27:03 +0100
Subject: [PATCH 51/55] Implements code review feedback

---
 gson/src/test/java/com/google/gson/CommentsTest.java   |  5 +++++
 gson/src/test/java/com/google/gson/JsonArrayTest.java  |  6 +++++-
 gson/src/test/java/com/google/gson/JsonNullTest.java   |  6 +++++-
 .../java/com/google/gson/ObjectTypeAdapterTest.java    |  4 ++--
 .../com/google/gson/OverrideCoreTypeAdaptersTest.java  |  6 +++++-
 .../com/google/gson/functional/CollectionTest.java     |  2 +-
 .../gson/functional/DefaultTypeAdaptersTest.java       |  3 ++-
 .../java/com/google/gson/functional/PrimitiveTest.java |  2 +-
 .../google/gson/functional/PrintFormattingTest.java    |  4 ++--
 .../com/google/gson/internal/LinkedTreeMapTest.java    |  2 +-
 .../java/com/google/gson/reflect/TypeTokenTest.java    |  6 +++++-
 .../java/com/google/gson/stream/JsonReaderTest.java    | 10 ++++++----
 12 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/CommentsTest.java b/gson/src/test/java/com/google/gson/CommentsTest.java
index f4a2103ab7..acda4243a2 100644
--- a/gson/src/test/java/com/google/gson/CommentsTest.java
+++ b/gson/src/test/java/com/google/gson/CommentsTest.java
@@ -23,6 +23,11 @@
 import org.junit.Test;
 
 
+/**
+ * Tests that by default Gson accepts several forms of comments.
+ *
+ * @author Jesse Wilson
+ */
 public final class CommentsTest {
 
   /**
diff --git a/gson/src/test/java/com/google/gson/JsonArrayTest.java b/gson/src/test/java/com/google/gson/JsonArrayTest.java
index a81b83d767..c3c0184fd6 100644
--- a/gson/src/test/java/com/google/gson/JsonArrayTest.java
+++ b/gson/src/test/java/com/google/gson/JsonArrayTest.java
@@ -25,7 +25,11 @@
 import java.math.BigInteger;
 import org.junit.Test;
 
-
+/**
+ * Tests handling of JSON arrays.
+ *
+ * @author Jesse Wilson
+ */
 public final class JsonArrayTest {
 
   @Test
diff --git a/gson/src/test/java/com/google/gson/JsonNullTest.java b/gson/src/test/java/com/google/gson/JsonNullTest.java
index 29897bd426..ca995b925b 100644
--- a/gson/src/test/java/com/google/gson/JsonNullTest.java
+++ b/gson/src/test/java/com/google/gson/JsonNullTest.java
@@ -21,7 +21,11 @@
 import com.google.gson.common.MoreAsserts;
 import org.junit.Test;
 
-
+/**
+ * Tests handling of JSON nulls.
+ *
+ * @author Jesse Wilson
+ */
 public final class JsonNullTest {
 
   @SuppressWarnings("deprecation")
diff --git a/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java b/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java
index 1f5b4d5e17..274de8fad5 100644
--- a/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java
+++ b/gson/src/test/java/com/google/gson/ObjectTypeAdapterTest.java
@@ -111,8 +111,8 @@ public void testDeserializeDeeplyNestedObjects() throws IOException {
     assertThat(actualTimes).isEqualTo(times);
   }
 
-  @SuppressWarnings("unused")
-  private static class RuntimeType {
+  @SuppressWarnings({"unused", "ClassCanBeStatic"})
+  private class RuntimeType {
     Object a = 5;
     Object b = Arrays.asList(1, 2, null);
   }
diff --git a/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java
index 12d2406378..781989f418 100644
--- a/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/OverrideCoreTypeAdaptersTest.java
@@ -24,7 +24,11 @@
 import java.util.Locale;
 import org.junit.Test;
 
-
+/**
+ * Tests handling of Core Type Adapters
+ *
+ * @author Jesse Wilson
+ */
 public class OverrideCoreTypeAdaptersTest {
   private static final TypeAdapter<Boolean> booleanAsIntAdapter = new TypeAdapter<Boolean>() {
     @Override public void write(JsonWriter out, Boolean value) throws IOException {
diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
index c7cfed82b0..afa6e099ea 100644
--- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java
@@ -272,7 +272,7 @@ public void testRawCollectionDeserializationNotAllowed() {
     String json = "[0,1,2,3,4,5,6,7,8,9]";
     Collection<?> integers = gson.fromJson(json, Collection.class);
     // JsonReader converts numbers to double by default so we need a floating point comparison
-    assertThat(integers).containsExactly(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
+    assertThat(integers).containsExactly(0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0).inOrder();
 
     json = "[\"Hello\", \"World\"]";
     Collection<?> strings = gson.fromJson(json, Collection.class);
diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
index a1b0e15a88..978b0eb8bd 100644
--- a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
@@ -701,8 +701,9 @@ public void testStringBuilderDeserialization() {
   }
 
   @Test
+  @SuppressWarnings("JdkObsolete")
   public void testStringBufferSerialization() {
-    StringBuilder sb = new StringBuilder("abc");
+    StringBuffer sb = new StringBuffer("abc");
     String json = gson.toJson(sb);
     assertThat(json).isEqualTo("\"abc\"");
   }
diff --git a/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java b/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
index 28d8312f0f..f7bccb46e3 100644
--- a/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
+++ b/gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
@@ -192,7 +192,7 @@ public void testFloatSerialization() {
     // Should perform widening conversion
     assertThat(gson.toJson((byte) 1, Float.class)).isEqualTo("1.0");
     // (This widening conversion is actually lossy)
-    assertThat(gson.toJson(Long.MAX_VALUE - 10L, Float.class)).isEqualTo(Float.toString((float) Long.MAX_VALUE - 10L));
+    assertThat(gson.toJson(Long.MAX_VALUE - 10L, Float.class)).isEqualTo(Float.toString((float) (Long.MAX_VALUE - 10L)));
     // Should perform narrowing conversion
     gson = new GsonBuilder().serializeSpecialFloatingPointValues().create();
     assertThat(gson.toJson(Double.MAX_VALUE, Float.class)).isEqualTo("Infinity");
diff --git a/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java b/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java
index 5435d82b91..bd53944fa3 100644
--- a/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java
+++ b/gson/src/test/java/com/google/gson/functional/PrintFormattingTest.java
@@ -78,9 +78,9 @@ public void testJsonObjectWithNullValuesSerialized() {
     assertThat(json).contains("field2");
   }
 
+  @SuppressWarnings("LoopOverCharArray")
   private static void assertContainsNoWhiteSpace(String str) {
-    for (int i = 0; i < str.length(); i++) {
-      char c = str.charAt(i);
+    for (char c : str.toCharArray()) {
       assertThat(Character.isWhitespace(c)).isFalse();
     }
   }
diff --git a/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java b/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
index f902d2ee4f..f79c76b7cc 100644
--- a/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
+++ b/gson/src/test/java/com/google/gson/internal/LinkedTreeMapTest.java
@@ -181,7 +181,7 @@ public void testLargeSetOfRandomKeys() {
     LinkedTreeMap<String, String> map = new LinkedTreeMap<>();
     String[] keys = new String[1000];
     for (int i = 0; i < keys.length; i++) {
-      keys[i] = Integer.toString(Math.abs(random.nextInt(Integer.MAX_VALUE)), 36) + "-" + i;
+      keys[i] = Integer.toString(random.nextInt(), 36) + "-" + i;
       map.put(keys[i], "" + i);
     }
 
diff --git a/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java b/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
index 0843047685..5df759f00b 100644
--- a/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
+++ b/gson/src/test/java/com/google/gson/reflect/TypeTokenTest.java
@@ -28,7 +28,11 @@
 import java.util.Set;
 import org.junit.Test;
 
-
+/**
+ * Tests for {@link TypeToken}.
+ *
+ * @author Jesse Wilson
+ */
 public final class TypeTokenTest {
   // These fields are accessed using reflection by the tests below
   List<Integer> listOfInteger = null;
diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
index be37de14d0..9fdb514a1e 100644
--- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
+++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
@@ -740,8 +740,9 @@ public void disabled_testPeekLargerThanLongMaxValue() throws IOException {
    */
   @Test
   @Ignore
-  @SuppressWarnings("FloatingPointLiteralPrecision")
   public void disabled_testPeekLargerThanLongMinValue() throws IOException {
+    @SuppressWarnings("FloatingPointLiteralPrecision")
+    double d = -9223372036854775809d;
     JsonReader reader = new JsonReader(reader("[-9223372036854775809]"));
     reader.setLenient(true);
     reader.beginArray();
@@ -751,7 +752,7 @@ public void disabled_testPeekLargerThanLongMinValue() throws IOException {
       fail();
     } catch (NumberFormatException expected) {
     }
-    assertThat(reader.nextDouble()).isEqualTo(-9223372036854775809d);
+    assertThat(reader.nextDouble()).isEqualTo(d);
   }
 
   /**
@@ -769,8 +770,9 @@ public void disabled_testHighPrecisionLong() throws IOException {
   }
 
   @Test
-  @SuppressWarnings("FloatingPointLiteralPrecision")
   public void testPeekMuchLargerThanLongMinValue() throws IOException {
+    @SuppressWarnings("FloatingPointLiteralPrecision")
+    double d = -92233720368547758080d;
     JsonReader reader = new JsonReader(reader("[-92233720368547758080]"));
     reader.setLenient(true);
     reader.beginArray();
@@ -780,7 +782,7 @@ public void testPeekMuchLargerThanLongMinValue() throws IOException {
       fail();
     } catch (NumberFormatException expected) {
     }
-    assertThat(reader.nextDouble()).isEqualTo(-92233720368547758080d);
+    assertThat(reader.nextDouble()).isEqualTo(d);
   }
 
   @Test

From bd2916ef417cac69b12a3d3f5eb5426517314c10 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Thu, 23 Feb 2023 11:30:48 +0100
Subject: [PATCH 52/55] Removes redundant new-line

---
 gson/src/test/java/com/google/gson/CommentsTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gson/src/test/java/com/google/gson/CommentsTest.java b/gson/src/test/java/com/google/gson/CommentsTest.java
index acda4243a2..a83520db00 100644
--- a/gson/src/test/java/com/google/gson/CommentsTest.java
+++ b/gson/src/test/java/com/google/gson/CommentsTest.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import org.junit.Test;
 
-
 /**
  * Tests that by default Gson accepts several forms of comments.
  *

From 13ab165fa70d7ebc7566a072c92a48914494e7b5 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Fri, 24 Feb 2023 09:18:26 +0100
Subject: [PATCH 53/55] Implements code review feedback

---
 .../gson/ParameterizedTypeFixtures.java       |  2 --
 .../functional/CustomDeserializerTest.java    |  1 -
 .../com/google/gson/functional/EnumTest.java  |  6 +++--
 .../GsonVersionDiagnosticsTest.java           | 25 ++++++-----------
 .../gson/functional/ReflectionAccessTest.java |  3 +--
 .../google/gson/functional/StringTest.java    |  3 +--
 .../ToNumberPolicyFunctionalTest.java         | 10 ++-----
 .../UnsafeAllocatorInstantiationTest.java     | 27 +++++++------------
 .../google/gson/stream/JsonReaderTest.java    |  5 ++--
 9 files changed, 28 insertions(+), 54 deletions(-)

diff --git a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
index fc49f6a45a..b3fce37c59 100644
--- a/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
+++ b/gson/src/test/java/com/google/gson/ParameterizedTypeFixtures.java
@@ -102,8 +102,6 @@ public static class MyParameterizedTypeInstanceCreator<T>
      * This means that the fields of the same objects will be overwritten by Gson.
      * This is usually fine in tests since there we deserialize just once, but quite
      * dangerous in practice.
-     *
-     * @param instanceOfT Instance of Type
      */
     public MyParameterizedTypeInstanceCreator(T instanceOfT) {
       this.instanceOfT = instanceOfT;
diff --git a/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java b/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java
index 02a4a18490..2813032b60 100644
--- a/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java
+++ b/gson/src/test/java/com/google/gson/functional/CustomDeserializerTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.errorprone.annotations.Immutable;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializationContext;
diff --git a/gson/src/test/java/com/google/gson/functional/EnumTest.java b/gson/src/test/java/com/google/gson/functional/EnumTest.java
index cf0b14e868..0ca4acdf28 100644
--- a/gson/src/test/java/com/google/gson/functional/EnumTest.java
+++ b/gson/src/test/java/com/google/gson/functional/EnumTest.java
@@ -120,8 +120,9 @@ public String getExpectedJson() {
    * Test for issue 226.
    */
   @Test
+  @SuppressWarnings("GetClassOnEnum")
   public void testEnumSubclass() {
-    assertThat(Roshambo.ROCK.getDeclaringClass()).isAssignableTo(Roshambo.class);
+    assertThat(Roshambo.ROCK.getClass()).isNotEqualTo(Roshambo.class);
     assertThat(gson.toJson(Roshambo.ROCK)).isEqualTo("\"ROCK\"");
     assertThat(gson.toJson(EnumSet.allOf(Roshambo.class))).isEqualTo("[\"ROCK\",\"PAPER\",\"SCISSORS\"]");
     assertThat(gson.fromJson("\"ROCK\"", Roshambo.class)).isEqualTo(Roshambo.ROCK);
@@ -131,11 +132,12 @@ public void testEnumSubclass() {
   }
 
   @Test
+  @SuppressWarnings("GetClassOnEnum")
   public void testEnumSubclassWithRegisteredTypeAdapter() {
     gson = new GsonBuilder()
         .registerTypeHierarchyAdapter(Roshambo.class, new MyEnumTypeAdapter())
         .create();
-    assertThat(Roshambo.ROCK.getDeclaringClass()).isAssignableTo(Roshambo.class);
+    assertThat(Roshambo.ROCK.getClass()).isNotEqualTo(Roshambo.class);
     assertThat(gson.toJson(Roshambo.ROCK)).isEqualTo("\"123ROCK\"");
     assertThat(gson.toJson(EnumSet.allOf(Roshambo.class))).isEqualTo("[\"123ROCK\",\"123PAPER\",\"123SCISSORS\"]");
     assertThat(gson.fromJson("\"123ROCK\"", Roshambo.class)).isEqualTo(Roshambo.ROCK);
diff --git a/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java b/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
index 937a9065bf..b7029487e8 100644
--- a/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
+++ b/gson/src/test/java/com/google/gson/functional/GsonVersionDiagnosticsTest.java
@@ -16,14 +16,13 @@
 package com.google.gson.functional;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
 import java.util.regex.Pattern;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +45,7 @@ public void setUp() {
       @Override public void write(JsonWriter out, TestType value) {
         throw new AssertionError("Expected during serialization");
       }
-      @Override public TestType read(JsonReader in) throws IOException {
+      @Override public TestType read(JsonReader in) {
         throw new AssertionError("Expected during deserialization");
       }
     }).create();
@@ -59,25 +58,17 @@ public void testVersionPattern() {
   }
 
   @Test
-  @SuppressWarnings("AssertionFailureIgnored")
   public void testAssertionErrorInSerializationPrintsVersion() {
-    try {
-      gson.toJson(new TestType());
-      fail();
-    } catch (AssertionError expected) {
-      ensureAssertionErrorPrintsGsonVersion(expected);
-    }
+    AssertionError e = assertThrows(AssertionError.class, () -> gson.toJson(new TestType()));
+    ensureAssertionErrorPrintsGsonVersion(e);
   }
 
   @Test
-  @SuppressWarnings("AssertionFailureIgnored")
   public void testAssertionErrorInDeserializationPrintsVersion() {
-    try {
-      gson.fromJson("{'a':'abc'}", TestType.class);
-      fail();
-    } catch (AssertionError expected) {
-      ensureAssertionErrorPrintsGsonVersion(expected);
-    }
+    AssertionError e = assertThrows(AssertionError.class,
+        () -> gson.fromJson("{'a':'abc'}", TestType.class));
+
+    ensureAssertionErrorPrintsGsonVersion(e);
   }
 
   private void ensureAssertionErrorPrintsGsonVersion(AssertionError expected) {
diff --git a/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java b/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
index f41876c94a..756603607b 100644
--- a/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ReflectionAccessTest.java
@@ -119,7 +119,6 @@ public Object read(JsonReader in) throws IOException {
    * <p>See https://github.com/google/gson/issues/1875
    */
   @Test
-  @SuppressWarnings("CatchFail")
   public void testSerializeInternalImplementationObject() {
     Gson gson = new Gson();
     String json = gson.toJson(Collections.emptyList());
@@ -131,7 +130,7 @@ public void testSerializeInternalImplementationObject() {
       gson.fromJson("[]", internalClass);
       fail("Missing exception; test has to be run with `--illegal-access=deny`");
     } catch (JsonSyntaxException e) {
-      fail("Unexpected exception; test has to be run with `--illegal-access=deny`");
+      throw new AssertionError("Unexpected exception; test has to be run with `--illegal-access=deny`", e);
     } catch (JsonIOException expected) {
       assertThat(expected).hasMessageThat().startsWith("Failed making constructor 'java.util.Collections$EmptyList()' accessible;"
           + " either increase its visibility or write a custom InstanceCreator or TypeAdapter for its declaring type: ");
diff --git a/gson/src/test/java/com/google/gson/functional/StringTest.java b/gson/src/test/java/com/google/gson/functional/StringTest.java
index a3d18701e8..b702ef5cfe 100644
--- a/gson/src/test/java/com/google/gson/functional/StringTest.java
+++ b/gson/src/test/java/com/google/gson/functional/StringTest.java
@@ -149,13 +149,12 @@ public void testAssignmentCharSerialization() {
    * Created in response to http://groups.google.com/group/google-gson/browse_thread/thread/2431d4a3d0d6cb23
    */
   @Test
-  @SuppressWarnings("UnicodeEscape")
   public void testAssignmentCharDeserialization() {
     String json = "\"abc=\"";
     String value = gson.fromJson(json, String.class);
     assertThat(value).isEqualTo("abc=");
 
-    json = "'abc\u003d'";
+    json = "'abc\\u003d'";
     value = gson.fromJson(json, String.class);
     assertThat(value).isEqualTo("abc=");
   }
diff --git a/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java b/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
index adebcb8226..aba9edd5e4 100644
--- a/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
+++ b/gson/src/test/java/com/google/gson/functional/ToNumberPolicyFunctionalTest.java
@@ -28,9 +28,7 @@
 import com.google.gson.stream.JsonReader;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import org.junit.Test;
 
@@ -104,16 +102,12 @@ public void testAsListOfLongsOrDoubles() {
         .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
         .setNumberToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
         .create();
-    List<Object> expected = new ArrayList<>();
-    expected.add(null);
-    expected.add(10L);
-    expected.add(10.0);
     Type objectCollectionType = new TypeToken<Collection<Object>>() { }.getType();
     Collection<Object> objects = gson.fromJson("[null,10,10.0]", objectCollectionType);
-    assertThat(objects).containsExactlyElementsIn(expected);
+    assertThat(objects).containsExactly(null, 10L, 10.0).inOrder();
     Type numberCollectionType = new TypeToken<Collection<Number>>() { }.getType();
     Collection<Object> numbers = gson.fromJson("[null,10,10.0]", numberCollectionType);
-    assertThat(numbers).containsExactlyElementsIn(expected);
+    assertThat(numbers).containsExactly(null, 10L, 10.0).inOrder();
   }
 
   @Test
diff --git a/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java b/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java
index 016deb6478..72f830c6ad 100644
--- a/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java
+++ b/gson/src/test/java/com/google/gson/internal/UnsafeAllocatorInstantiationTest.java
@@ -17,7 +17,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
@@ -41,14 +40,11 @@ public static class ConcreteClass {
    * to instantiate an interface
    */
   @Test
-  @SuppressWarnings("AssertionFailureIgnored")
-  public void testInterfaceInstantiation() throws Exception {
-    try {
-      UnsafeAllocator.INSTANCE.newInstance(Interface.class);
-      fail();
-    } catch (AssertionError e) {
-      assertThat(e).hasMessageThat().startsWith("UnsafeAllocator is used for non-instantiable type");
-    }
+  public void testInterfaceInstantiation() {
+    AssertionError e = assertThrows(AssertionError.class,
+        () -> UnsafeAllocator.INSTANCE.newInstance(Interface.class));
+
+    assertThat(e).hasMessageThat().startsWith("UnsafeAllocator is used for non-instantiable type");
   }
 
   /**
@@ -56,14 +52,11 @@ public void testInterfaceInstantiation() throws Exception {
    * to instantiate an abstract class
    */
   @Test
-  @SuppressWarnings("AssertionFailureIgnored")
-  public void testAbstractClassInstantiation() throws Exception {
-    try {
-      UnsafeAllocator.INSTANCE.newInstance(AbstractClass.class);
-      fail();
-    } catch (AssertionError e) {
-      assertThat(e).hasMessageThat().startsWith("UnsafeAllocator is used for non-instantiable type");
-    }
+  public void testAbstractClassInstantiation() {
+    AssertionError e = assertThrows(AssertionError.class,
+        () -> UnsafeAllocator.INSTANCE.newInstance(AbstractClass.class));
+
+    assertThat(e).hasMessageThat().startsWith("UnsafeAllocator is used for non-instantiable type");
   }
 
   /**
diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
index 9fdb514a1e..8ebe20b571 100644
--- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
+++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java
@@ -642,7 +642,7 @@ private void assertNotANumber(String s) throws IOException {
       strictReader.nextDouble();
       fail("Should have failed reading " + s + " as double");
     } catch (MalformedJsonException e) {
-      // OK:  Should fail because `s` can't be read as double
+      assertThat(e).hasMessageThat().startsWith("Use JsonReader.setLenient(true) to accept malformed JSON");
     }
   }
 
@@ -786,9 +786,8 @@ public void testPeekMuchLargerThanLongMinValue() throws IOException {
   }
 
   @Test
-  @SuppressWarnings("UnicodeEscape")
   public void testQuotedNumberWithEscape() throws IOException {
-    JsonReader reader = new JsonReader(reader("[\"12\u00334\"]"));
+    JsonReader reader = new JsonReader(reader("[\"12\\u00334\"]"));
     reader.setLenient(true);
     reader.beginArray();
     assertThat(reader.peek()).isEqualTo(STRING);

From a7cca386098ae847a10a31c09c3ab9b11eee5920 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Fri, 24 Feb 2023 19:29:11 +0100
Subject: [PATCH 54/55] Adds `JDK11` to run test with `--release 11`

---
 gson/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gson/pom.xml b/gson/pom.xml
index d80226c0a4..2d1d6cb915 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -283,5 +283,15 @@
         <excludeTestCompilation />
       </properties>
     </profile>
+    <profile>
+      <id>JDK11</id>
+      <activation>
+        <jdk>(,17)</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.testRelease>11</maven.compiler.testRelease>
+        <excludeTestCompilation />
+      </properties>
+    </profile>
   </profiles>
 </project>

From 5dbbbee9bfc1820ab5778036ae4216fc33cde5c5 Mon Sep 17 00:00:00 2001
From: maicolAntali <maicol.antali.ma@gmail.com>
Date: Fri, 24 Feb 2023 19:31:01 +0100
Subject: [PATCH 55/55] Revert "Adds `JDK11` to run test with `--release 11`"

This reverts commit a7cca386098ae847a10a31c09c3ab9b11eee5920.
---
 gson/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/gson/pom.xml b/gson/pom.xml
index 2d1d6cb915..d80226c0a4 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -283,15 +283,5 @@
         <excludeTestCompilation />
       </properties>
     </profile>
-    <profile>
-      <id>JDK11</id>
-      <activation>
-        <jdk>(,17)</jdk>
-      </activation>
-      <properties>
-        <maven.compiler.testRelease>11</maven.compiler.testRelease>
-        <excludeTestCompilation />
-      </properties>
-    </profile>
   </profiles>
 </project>