Merge branch 'main' into marcono1234/additional-error-prone-checks

google · Jan 9, 2024 · 785ae68 · 785ae68
2 parents 9f6813f + 2bcaaed
commit 785ae68
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 91 deletions.
diff --git a/gson/pom.xml b/gson/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.23.0</version>
+      <version>2.24.1</version>
     </dependency>
 
     <dependency>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>32.1.3-jre</version>
+      <version>33.0.0-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
@@ -16,7 +16,7 @@
 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;
@@ -90,34 +90,31 @@ public void tearDown() {
 
   @Test
   public void testClassSerialization() {
-    try {
-      gson.toJson(String.class);
-      fail();
-    } catch (UnsupportedOperationException expected) {
-      assertThat(expected)
-          .hasMessageThat()
-          .isEqualTo(
-              "Attempted to serialize java.lang.Class: java.lang.String. Forgot to register a type"
-                  + " adapter?\n"
-                  + "See https://github.com/google/gson/blob/main/Troubleshooting.md#java-lang-class-unsupported");
-    }
+    var exception =
+        assertThrows(UnsupportedOperationException.class, () -> gson.toJson(String.class));
+    assertThat(exception)
+        .hasMessageThat()
+        .isEqualTo(
+            "Attempted to serialize java.lang.Class: java.lang.String. Forgot to register a type"
+                + " adapter?\n"
+                + "See https://github.com/google/gson/blob/main/Troubleshooting.md#java-lang-class-unsupported");
+
     // Override with a custom type adapter for class.
     gson = new GsonBuilder().registerTypeAdapter(Class.class, new MyClassTypeAdapter()).create();
     assertThat(gson.toJson(String.class)).isEqualTo("\"java.lang.String\"");
   }
 
   @Test
   public void testClassDeserialization() {
-    try {
-      gson.fromJson("String.class", Class.class);
-      fail();
-    } catch (UnsupportedOperationException expected) {
-      assertThat(expected)
-          .hasMessageThat()
-          .isEqualTo(
-              "Attempted to deserialize a java.lang.Class. Forgot to register a type adapter?\n"
-                  + "See https://github.com/google/gson/blob/main/Troubleshooting.md#java-lang-class-unsupported");
-    }
+    var exception =
+        assertThrows(
+            UnsupportedOperationException.class, () -> gson.fromJson("String.class", Class.class));
+    assertThat(exception)
+        .hasMessageThat()
+        .isEqualTo(
+            "Attempted to deserialize a java.lang.Class. Forgot to register a type adapter?\n"
+                + "See https://github.com/google/gson/blob/main/Troubleshooting.md#java-lang-class-unsupported");
+
     // Override with a custom type adapter for class.
     gson = new GsonBuilder().registerTypeAdapter(Class.class, new MyClassTypeAdapter()).create();
     assertThat(gson.fromJson("java.lang.String", Class.class)).isAssignableTo(String.class);
@@ -289,11 +286,10 @@ public void testBigDecimalFieldDeserialization() {
 
   @Test
   public void testBadValueForBigDecimalDeserialization() {
-    try {
-      gson.fromJson("{\"value\"=1.5e-1.0031}", ClassWithBigDecimal.class);
-      fail("Exponent of a BigDecimal must be an integer value.");
-    } catch (JsonParseException expected) {
-    }
+    // Exponent of a BigDecimal must be an integer value
+    assertThrows(
+        JsonParseException.class,
+        () -> gson.fromJson("{\"value\": 1.5e-1.0031}", ClassWithBigDecimal.class));
   }
 
   @Test
@@ -374,23 +370,17 @@ public void testBitSetDeserialization() {
     json = "[true,false,true,true,true,true,false,false,true,false,false]";
     assertThat(gson.fromJson(json, BitSet.class)).isEqualTo(expected);
 
-    try {
-      gson.fromJson("[1, []]", BitSet.class);
-      fail();
-    } catch (JsonSyntaxException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid bitset value type: BEGIN_ARRAY; at path $[1]");
-    }
+    var exception =
+        assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[1, []]", BitSet.class));
+    assertThat(exception)
+        .hasMessageThat()
+        .isEqualTo("Invalid bitset value type: BEGIN_ARRAY; at path $[1]");
 
-    try {
-      gson.fromJson("[1, 2]", BitSet.class);
-      fail();
-    } catch (JsonSyntaxException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid bitset value 2, expected 0 or 1; at path $[1]");
-    }
+    exception =
+        assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[1, 2]", BitSet.class));
+    assertThat(exception)
+        .hasMessageThat()
+        .isEqualTo("Invalid bitset value 2, expected 0 or 1; at path $[1]");
   }
 
   @Test
@@ -468,28 +458,47 @@ public void testDefaultCalendarDeserialization() {
 
   @Test
   public void testDefaultGregorianCalendarSerialization() {
+    GregorianCalendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"), Locale.US);
+    // Calendar was created with current time, must clear it
+    cal.clear();
+    cal.set(2018, Calendar.JUNE, 25, 10, 20, 30);
+
     Gson gson = new GsonBuilder().create();
-    GregorianCalendar cal = new GregorianCalendar();
     String json = gson.toJson(cal);
-    assertThat(json).contains("year");
-    assertThat(json).contains("month");
-    assertThat(json).contains("dayOfMonth");
-    assertThat(json).contains("hourOfDay");
-    assertThat(json).contains("minute");
-    assertThat(json).contains("second");
+    assertThat(json)
+        .isEqualTo(
+            "{\"year\":2018,\"month\":5,\"dayOfMonth\":25,\"hourOfDay\":10,\"minute\":20,\"second\":30}");
   }
 
   @Test
   public void testDefaultGregorianCalendarDeserialization() {
-    Gson gson = new GsonBuilder().create();
-    String json = "{year:2009,month:2,dayOfMonth:11,hourOfDay:14,minute:29,second:23}";
-    GregorianCalendar cal = gson.fromJson(json, GregorianCalendar.class);
-    assertThat(cal.get(Calendar.YEAR)).isEqualTo(2009);
-    assertThat(cal.get(Calendar.MONTH)).isEqualTo(2);
-    assertThat(cal.get(Calendar.DAY_OF_MONTH)).isEqualTo(11);
-    assertThat(cal.get(Calendar.HOUR_OF_DAY)).isEqualTo(14);
-    assertThat(cal.get(Calendar.MINUTE)).isEqualTo(29);
-    assertThat(cal.get(Calendar.SECOND)).isEqualTo(23);
+    TimeZone defaultTimeZone = TimeZone.getDefault();
+    Locale defaultLocale = Locale.getDefault();
+
+    try {
+      // Calendar deserialization uses default TimeZone and Locale; set them here to make the test
+      // deterministic
+      TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+      Locale.setDefault(Locale.US);
+
+      Gson gson = new GsonBuilder().create();
+      String json =
+          "{\"year\":2009,\"month\":2,\"dayOfMonth\":11,\"hourOfDay\":14,\"minute\":29,\"second\":23}";
+      GregorianCalendar cal = gson.fromJson(json, GregorianCalendar.class);
+      assertThat(cal.get(Calendar.YEAR)).isEqualTo(2009);
+      assertThat(cal.get(Calendar.MONTH)).isEqualTo(2);
+      assertThat(cal.get(Calendar.DAY_OF_MONTH)).isEqualTo(11);
+      assertThat(cal.get(Calendar.HOUR_OF_DAY)).isEqualTo(14);
+      assertThat(cal.get(Calendar.MINUTE)).isEqualTo(29);
+      assertThat(cal.get(Calendar.SECOND)).isEqualTo(23);
+      assertThat(cal.getTimeInMillis()).isEqualTo(1236781763000L);
+
+      // Serializing value again should be equivalent to original JSON
+      assertThat(gson.toJson(cal)).isEqualTo(json);
+    } finally {
+      TimeZone.setDefault(defaultTimeZone);
+      Locale.setDefault(defaultLocale);
+    }
   }
 
   @Test
@@ -654,16 +663,13 @@ public void testJsonNullDeserialization() {
 
   @Test
   public void testJsonElementTypeMismatch() {
-    try {
-      gson.fromJson("\"abc\"", JsonObject.class);
-      fail();
-    } catch (JsonSyntaxException expected) {
-      assertThat(expected)
-          .hasMessageThat()
-          .isEqualTo(
-              "Expected a com.google.gson.JsonObject but was com.google.gson.JsonPrimitive;"
-                  + " at path $");
-    }
+    var exception =
+        assertThrows(JsonSyntaxException.class, () -> gson.fromJson("\"abc\"", JsonObject.class));
+    assertThat(exception)
+        .hasMessageThat()
+        .isEqualTo(
+            "Expected a com.google.gson.JsonObject but was com.google.gson.JsonPrimitive;"
+                + " at path $");
   }
 
   private static class ClassWithBigDecimal {

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
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
 
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -52,7 +51,7 @@ public void testDateFormatString() {
     Date date = calendar.getTime();
     String dateStr = ISO8601Utils.format(date);
     String expectedDate = "2018-06-25";
-    assertThat(dateStr.substring(0, expectedDate.length())).isEqualTo(expectedDate);
+    assertThat(dateStr).startsWith(expectedDate);
   }
 
   @Test
@@ -87,21 +86,13 @@ public void testDateParseWithDefaultTimezone() throws ParseException {
   @Test
   public void testDateParseInvalidDay() {
     String dateStr = "2022-12-33";
-    try {
-      ISO8601Utils.parse(dateStr, new ParsePosition(0));
-      fail("Expected parsing to fail");
-    } catch (ParseException expected) {
-    }
+    assertThrows(ParseException.class, () -> ISO8601Utils.parse(dateStr, new ParsePosition(0)));
   }
 
   @Test
   public void testDateParseInvalidMonth() {
     String dateStr = "2022-14-30";
-    try {
-      ISO8601Utils.parse(dateStr, new ParsePosition(0));
-      fail("Expected parsing to fail");
-    } catch (ParseException expected) {
-    }
+    assertThrows(ParseException.class, () -> ISO8601Utils.parse(dateStr, new ParsePosition(0)));
   }
 
   @Test

diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.16.0</version>
+      <version>2.16.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.caliper</groupId>

diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,7 @@
       <dependency>
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
-        <version>1.1.5</version>
+        <version>1.2.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -213,7 +213,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>3.12.1</version>
           <configuration>
             <showWarnings>true</showWarnings>
             <showDeprecation>true</showDeprecation>
@@ -293,7 +293,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.23.0</version>
+                <version>2.24.1</version>
               </path>
             </annotationProcessorPaths>
           </configuration>
@@ -329,7 +329,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>3.2.3</version>
           </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

diff --git a/proto/pom.xml b/proto/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.3-jre</version>
+      <version>33.0.0-jre</version>
     </dependency>
 
     <dependency>

diff --git a/shrinker-test/pom.xml b/shrinker-test/pom.xml
@@ -218,7 +218,7 @@
               but it appears that can be ignored -->
             <groupId>com.android.tools</groupId>
             <artifactId>r8</artifactId>
-            <version>8.2.33</version>
+            <version>8.2.42</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -228,7 +228,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.2.3</version>
         <executions>
           <execution>
             <goals>