Introduce Rewrite & PMD covering S1144: Unused "private" methods should be removed

Vincent Potucek · Vincent Potucek · commit 65725f8d7731 · 2025-08-31T13:25:01.000+02:00
diff --git a/android/guava-testlib/src/com/google/common/escape/testing/package-info.java b/android/guava-testlib/src/com/google/common/escape/testing/package-info.java
@@ -22,5 +22,3 @@
  */
 @CheckReturnValue
 package com.google.common.escape.testing;
-
-import com.google.errorprone.annotations.CheckReturnValue;
diff --git a/android/guava-testlib/src/com/google/common/testing/package-info.java b/android/guava-testlib/src/com/google/common/testing/package-info.java
@@ -21,6 +21,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.testing;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/base/package-info.java b/android/guava/src/com/google/common/base/package-info.java
@@ -59,6 +59,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.base;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/cache/package-info.java b/android/guava/src/com/google/common/cache/package-info.java
@@ -31,6 +31,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.cache;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/collect/package-info.java b/android/guava/src/com/google/common/collect/package-info.java
@@ -122,6 +122,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.collect;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/escape/package-info.java b/android/guava/src/com/google/common/escape/package-info.java
@@ -27,6 +27,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.escape;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/eventbus/package-info.java b/android/guava/src/com/google/common/eventbus/package-info.java
@@ -22,6 +22,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.eventbus;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/graph/package-info.java b/android/guava/src/com/google/common/graph/package-info.java
@@ -24,6 +24,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.graph;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/hash/package-info.java b/android/guava/src/com/google/common/hash/package-info.java
@@ -22,6 +22,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.hash;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/html/package-info.java b/android/guava/src/com/google/common/html/package-info.java
@@ -23,6 +23,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.html;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/io/package-info.java b/android/guava/src/com/google/common/io/package-info.java
@@ -30,6 +30,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.io;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/math/package-info.java b/android/guava/src/com/google/common/math/package-info.java
@@ -25,6 +25,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.math;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/net/package-info.java b/android/guava/src/com/google/common/net/package-info.java
@@ -23,6 +23,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.net;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/primitives/package-info.java b/android/guava/src/com/google/common/primitives/package-info.java
@@ -66,6 +66,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.primitives;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/reflect/package-info.java b/android/guava/src/com/google/common/reflect/package-info.java
@@ -19,6 +19,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.reflect;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/util/concurrent/package-info.java b/android/guava/src/com/google/common/util/concurrent/package-info.java
@@ -27,6 +27,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.util.concurrent;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/android/guava/src/com/google/common/xml/package-info.java b/android/guava/src/com/google/common/xml/package-info.java
@@ -23,6 +23,3 @@
 @CheckReturnValue
 @NullMarked
 package com.google.common.xml;
-
-import com.google.errorprone.annotations.CheckReturnValue;
-import org.jspecify.annotations.NullMarked;
diff --git a/guava-bom/pom.xml b/guava-bom/pom.xml
@@ -16,11 +16,6 @@
   <url>https://github.com/google/guava</url>
   <inceptionYear>2010</inceptionYear>
 
-  <issueManagement>
-    <system>GitHub Issues</system>
-    <url>https://github.com/google/guava/issues</url>
-  </issueManagement>
-
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -29,6 +24,11 @@
     </license>
   </licenses>
 
+  <issueManagement>
+    <system>GitHub Issues</system>
+    <url>https://github.com/google/guava/issues</url>
+  </issueManagement>
+
   <distributionManagement>
     <snapshotRepository>
       <id>sonatype-nexus-snapshots</id>
diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml
@@ -21,26 +21,6 @@
     <gwt.plugin.version>2.10.0</gwt.plugin.version>
     <gwt.logLevel>WARN</gwt.logLevel>
   </properties>
-  <repositories>
-    <repository>
-      <id>sonatype-google-snapshots</id>
-      <name>sonatype-google-snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype-snapshots</id>
-      <name>sonatype-snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -123,16 +103,38 @@
       </exclusions>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>sonatype-google-snapshots</id>
+      <name>sonatype-google-snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype-snapshots</id>
+      <name>sonatype-snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>
         <groupId>org.mvnsearch</groupId>
         <artifactId>toolchains-maven-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <executions>
           <execution>
@@ -150,6 +152,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <excludes>
@@ -160,6 +163,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
         <configuration>
           <excludes>
@@ -170,6 +174,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <sourceFileExcludes>
@@ -184,18 +189,22 @@
       </plugin>
       <!-- Disable "normal" testing, which doesn't work for GWT tests. -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
             <id>unpack-failureaccess-sources</id>
             <phase>generate-resources</phase>
-            <goals><goal>unpack-dependencies</goal></goals>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
             <configuration>
               <includeArtifactIds>failureaccess</includeArtifactIds>
               <classifier>sources</classifier>
@@ -209,7 +218,9 @@
           <execution>
             <id>unpack-guava-sources</id>
             <phase>generate-resources</phase>
-            <goals><goal>unpack-dependencies</goal></goals>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
             <configuration>
               <includeArtifactIds>guava</includeArtifactIds>
               <classifier>sources</classifier>
@@ -223,7 +234,9 @@
           <execution>
             <id>unpack-guava-testlib-sources</id>
             <phase>generate-resources</phase>
-            <goals><goal>unpack-dependencies</goal></goals>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
             <configuration>
               <includeArtifactIds>guava-testlib</includeArtifactIds>
               <classifier>sources</classifier>
@@ -237,7 +250,9 @@
           <execution>
             <id>unpack-guava-testlib-test-sources</id>
             <phase>generate-resources</phase>
-            <goals><goal>unpack-dependencies</goal></goals>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
             <configuration>
               <includeArtifactIds>guava-testlib</includeArtifactIds>
               <classifier>test-sources</classifier>
@@ -251,7 +266,9 @@
           <execution>
             <id>unpack-guava-test-sources</id>
             <phase>generate-resources</phase>
-            <goals><goal>unpack-dependencies</goal></goals>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
             <configuration>
               <includeArtifactIds>guava-tests</includeArtifactIds>
               <classifier>test-sources</classifier>
@@ -297,12 +314,15 @@
         </dependencies>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
             <id>copy-gwt-files</id>
             <phase>generate-resources</phase>
-            <goals><goal>run</goal></goals>
+            <goals>
+              <goal>run</goal>
+            </goals>
             <configuration>
               <target name="copy-gwt-resources">
                 <delete dir="${project.build.directory}/guava-gwt-sources" quiet="true" />
@@ -418,8 +438,10 @@
               <extraJvmArgs>-Xms3500m -Xmx3500m -Xss1024k</extraJvmArgs>
               <sourceLevel>1.8</sourceLevel>
               <!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( -->
-              <testTimeOut>86400 <!-- seconds --></testTimeOut>
-              <testMethodTimeout>1440 <!-- minutes --></testMethodTimeout>
+              <testTimeOut>86400 
+                <!-- seconds --></testTimeOut>
+              <testMethodTimeout>1440 
+                <!-- minutes --></testMethodTimeout>
               <!-- Presumably we want watchFileChanges=false here, since we want it for compile: -->
               <extraJvmArgs>-Dgwt.watchFileChanges=false</extraJvmArgs>
             </configuration>
diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml
@@ -67,9 +67,11 @@
         <artifactId>toolchains-maven-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <executions>
           <execution>
@@ -112,6 +114,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
@@ -122,6 +125,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
@@ -135,9 +139,11 @@
         <artifactId>animal-sniffer-maven-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
     </plugins>
diff --git a/guava-testlib/src/com/google/common/testing/DummyProxy.java b/guava-testlib/src/com/google/common/testing/DummyProxy.java
@@ -126,11 +126,5 @@ private DummyProxy identity() {
     public String toString() {
       return "Dummy proxy for " + interfaceType;
     }
-
-    // Since type variables aren't serializable, reduce the type down to raw type before
-    // serialization.
-        private Object writeReplace() {
-      return new DummyHandler(TypeToken.of(interfaceType.getRawType()));
-    }
   }
 }
diff --git a/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java b/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java
@@ -103,10 +103,6 @@ public int hashCode() {
       return 1;
     }
 
-    private Object writeReplace() {
-      return new OtherForm();
-    }
-
     private static class OtherForm implements Serializable {
       @Override
       public boolean equals(@Nullable Object other) {
diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml
diff --git a/guava-tests/test/com/google/common/reflect/ClassPathTest.java b/guava-tests/test/com/google/common/reflect/ClassPathTest.java
diff --git a/guava/pom.xml b/guava/pom.xml
diff --git a/guava/src/com/google/common/cache/AbstractLoadingCache.java b/guava/src/com/google/common/cache/AbstractLoadingCache.java
diff --git a/guava/src/com/google/common/collect/MutableClassToInstanceMap.java b/guava/src/com/google/common/collect/MutableClassToInstanceMap.java
diff --git a/guava/src/com/google/common/hash/BloomFilter.java b/guava/src/com/google/common/hash/BloomFilter.java
diff --git a/pmd.xml b/pmd.xml
diff --git a/pom.xml b/pom.xml
diff --git a/rewrite.yml b/rewrite.yml
