Introduce Rewrite & PMD covering S1128: Unnecessary "using" should be removed

Vincent Potucek · Vincent Potucek · commit 13d0df68b588 · 2025-08-31T14:03:38.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/src/com/google/common/cache/AbstractLoadingCache.java b/guava/src/com/google/common/cache/AbstractLoadingCache.java
@@ -20,7 +20,6 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
 /**
diff --git a/pmd.xml b/pmd.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset name="DefinitionOfDone"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+    <description>DefinitionOfDone</description>
+    <exclude-pattern>.*/Multisets.java</exclude-pattern><!--https://github.com/pmd/pmd/issues/6028-->
+    <exclude-pattern>.*/com/google/common/reflect/A*.*</exclude-pattern>
+    <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
+    <!--<rule ref="category/java/codestyle.xml/UnnecessaryImport" /> https://github.com/pmd/pmd/issues/6027 -->
+    <!--<rule ref="category/java/bestpractices.xml/ModifierOrder"/> https://github.com/pmd/pmd/issues/6019 -->
+</ruleset>
diff --git a/pom.xml b/pom.xml
@@ -130,9 +130,66 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.openrewrite.maven</groupId>
+        <artifactId>rewrite-maven-plugin</artifactId>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>3.27.0</version>
+          <configuration>
+            <analysisCache>true</analysisCache>
+            <failOnViolation>true</failOnViolation>
+            <includeTests>true</includeTests>
+            <printFailingErrors>true</printFailingErrors>
+            <rulesets>
+              <ruleset>pmd.xml</ruleset>
+            </rulesets>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>verify</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.openrewrite.maven</groupId>
+          <artifactId>rewrite-maven-plugin</artifactId>
+          <version>6.15.0</version>
+          <configuration>
+            <activeRecipes>
+              <recipe>DefinitionOfDone</recipe>
+            </activeRecipes>
+            <exportDatatables>true</exportDatatables>
+            <failOnDryRunResults>true</failOnDryRunResults>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>verify</phase>
+              <goals>
+                <goal>dryRun</goal>
+              </goals>
+            </execution>
+          </executions>
+          <dependencies>
+            <dependency>
+              <groupId>org.openrewrite.recipe</groupId>
+              <artifactId>rewrite-static-analysis</artifactId>
+              <version>2.16.0</version>
+            </dependency>
+          </dependencies>
+        </plugin>
         <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.6</version>
diff --git a/rewrite.yml b/rewrite.yml
@@ -0,0 +1,9 @@
+type: specs.openrewrite.org/v1beta/recipe
+name: DefinitionOfDone
+displayName: Definition of Done
+description: Automatically cleanup code to comply checkstyle convention.
+recipeList:
+  - org.openrewrite.java.RemoveUnusedImports
+  - org.openrewrite.staticanalysis.ModifierOrder
+  - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
+  # - org.openrewrite.maven.BestPractices
