Add rewrite support for staticanalysis.RemoveUnused and maven.BestPractices

Author: Vincent Potucek

.github/workflows/ci.yml

@@ -51,10 +51,16 @@ jobs:
           cache: 'maven'
       - name: 'Install'
         shell: bash
-        run: ./mvnw -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dtoolchain.skip install -U -DskipTests=true -f $ROOT_POM
+        run: ./mvnw -DrewriteSkip=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dtoolchain.skip install -U -DskipTests=true -f $ROOT_POM
       - name: 'Test'
         shell: bash
-        run: ./mvnw -B -P!standard-with-extra-repos -Dtoolchain.skip verify -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
+        run: ./mvnw -DrewriteSkip=true -B -P!standard-with-extra-repos -Dtoolchain.skip verify -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
+#     Apple M2 (4E+4P+10GPU 8GB)
+#     Total time:  44.504 s
+#     TODO: consider switch invert, executing on CI only (if acceptable build time).
+      - name: 'Rewrite'
+        shell: bash
+        run: ./mvnw rewrite:dryRun -B -P!standard-with-extra-repos -Dtoolchain.skip -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
       - name: 'Print Surefire reports'
         # Note: Normally a step won't run if the job has failed, but this causes it to
         if: ${{ failure() }}

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;

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;

android/guava-tests/test/com/google/common/collect/MapsTest.java

@@ -1266,15 +1266,6 @@ public Double transformEntry(Number key, Number value) {
           }
         };
 
-    Map<Object, Double> objectKeyed;
-    Map<Number, Double> numberKeyed;
-    Map<Integer, Double> integerKeyed;
-
-    numberKeyed = transformEntries(map5, transformer);
-    numberKeyed = transformEntries(map6, transformer);
-    integerKeyed = transformEntries(map8, transformer);
-    integerKeyed = transformEntries(map9, transformer);
-
     Map<? extends Number, Double> wildcarded = transformEntries(map0, transformer);
 
     // Can't loosen the key type:

android/guava-tests/test/com/google/common/util/concurrent/RateLimiterTest.java

@@ -141,9 +141,6 @@ public void testOneSecondBurst() {
   }
 
   public void testCreateWarmupParameterValidation() {
-    RateLimiter unused;
-    unused = RateLimiter.create(1.0, 1, NANOSECONDS);
-    unused = RateLimiter.create(1.0, 0, NANOSECONDS);
 
     assertThrows(IllegalArgumentException.class, () -> RateLimiter.create(0.0, 1, NANOSECONDS));
 

android/guava-tests/test/com/google/common/util/concurrent/ThreadFactoryBuilderTest.java

@@ -160,10 +160,7 @@ public void testBuildMutateBuild() {
     assertEquals(2, factory2.newThread(monitoredRunnable).getPriority());
   }
 
-  public void testBuildTwice() {
-    ThreadFactory unused;
-    unused = builder.build(); // this is allowed
-    unused = builder.build(); // this is *also* allowed
+  public void testBuildTwice() { // this is *also* allowed
   }
 
   public void testBuildMutate() {

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;

android/guava/src/com/google/common/cache/LocalCache.java

@@ -4069,10 +4069,9 @@ public boolean containsValue(@Nullable Object value) {
     long last = -1L;
     for (int i = 0; i < CONTAINS_VALUE_RETRIES; i++) {
       long sum = 0L;
-      for (Segment<K, V> segment : segments) {
-        // ensure visibility of most recent completed write
-        int unused = segment.count; // read-volatile
+      for (Segment<K, V> segment : segments) { // read-volatile
 
+        // ensure visibility of most recent completed write
         AtomicReferenceArray<ReferenceEntry<K, V>> table = segment.table;
         for (int j = 0; j < table.length(); j++) {
           for (ReferenceEntry<K, V> e = table.get(j); e != null; e = e.getNext()) {

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;

android/guava/src/com/google/common/collect/MapMakerInternalMap.java

@@ -2397,10 +2397,9 @@ public boolean containsValue(@Nullable Object value) {
     long last = -1L;
     for (int i = 0; i < CONTAINS_VALUE_RETRIES; i++) {
       long sum = 0L;
-      for (Segment<K, V, E, S> segment : segments) {
-        // ensure visibility of most recent completed write
-        int unused = segment.count; // read-volatile
+      for (Segment<K, V, E, S> segment : segments) { // read-volatile
 
+        // ensure visibility of most recent completed write
         AtomicReferenceArray<E> table = segment.table;
         for (int j = 0; j < table.length(); j++) {
           for (E e = table.get(j); e != null; e = e.getNext()) {