PoC: Add rewrite support

Vincent Potucek · Vincent Potucek · commit f3fb364a6c01 · 2025-08-06T12:04:11.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,6 +55,9 @@ jobs:
       - 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
+      - name: 'Rewrite'
+        shell: bash
+        run: ./mvnw -B -P!standard-with-extra-repos -Dtoolchain.skip rewrite:dryRun -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() }}
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-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java b/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java
@@ -349,11 +349,11 @@ public long getWriteTimestamp() {
       return writeTimestamp;
     }
 
-    public boolean equals(Object o) {
+    @Override public boolean equals(Object o) {
       return value.equals(o);
     }
 
-    public int hashCode() {
+    @Override public int hashCode() {
       return value.hashCode();
     }
   }
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableCollection.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableCollection.java
@@ -49,7 +49,7 @@ public boolean containsAll(Collection<?> targets) {
     return delegate.containsAll(targets);
   }
 
-  public int size() {
+  @Override public int size() {
     return delegate.size();
   }
 
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableList.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableList.java
@@ -31,19 +31,19 @@ abstract class ForwardingImmutableList<E> extends ImmutableList<E> {
 
   abstract List<E> delegateList();
 
-  public int indexOf(@Nullable Object object) {
+  @Override public int indexOf(@Nullable Object object) {
     return delegateList().indexOf(object);
   }
 
-  public int lastIndexOf(@Nullable Object object) {
+  @Override public int lastIndexOf(@Nullable Object object) {
     return delegateList().lastIndexOf(object);
   }
 
-  public E get(int index) {
+  @Override public E get(int index) {
     return delegateList().get(index);
   }
 
-  public ImmutableList<E> subList(int fromIndex, int toIndex) {
+  @Override public ImmutableList<E> subList(int fromIndex, int toIndex) {
     return unsafeDelegateList(delegateList().subList(fromIndex, toIndex));
   }
 
@@ -79,7 +79,7 @@ public boolean containsAll(Collection<?> targets) {
     return delegateList().containsAll(targets);
   }
 
-  public int size() {
+  @Override public int size() {
     return delegateList().size();
   }
 
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java
@@ -49,23 +49,23 @@ public abstract class ForwardingImmutableMap<K, V> extends ImmutableMap<K, V> {
     this.delegate = Collections.unmodifiableMap(delegate);
   }
 
-  boolean isPartialView() {
+  @Override boolean isPartialView() {
     return false;
   }
 
-  public final boolean isEmpty() {
+  @Override public final boolean isEmpty() {
     return delegate.isEmpty();
   }
 
-  public final boolean containsKey(@Nullable Object key) {
+  @Override public final boolean containsKey(@Nullable Object key) {
     return Maps.safeContainsKey(delegate, key);
   }
 
-  public final boolean containsValue(@Nullable Object value) {
+  @Override public final boolean containsValue(@Nullable Object value) {
     return delegate.containsValue(value);
   }
 
-  public @Nullable V get(@Nullable Object key) {
+  @Override public @Nullable V get(@Nullable Object key) {
     return (key == null) ? null : Maps.safeGet(delegate, key);
   }
 
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableBiMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableBiMap.java
@@ -195,8 +195,7 @@ public Builder<K, V> putAll(Iterable<? extends Entry<? extends K, ? extends V>>
       return this;
     }
 
-    @CanIgnoreReturnValue
-    public Builder<K, V> orderEntriesByValue(Comparator<? super V> valueComparator) {
+    @CanIgnoreReturnValue @Override public Builder<K, V> orderEntriesByValue(Comparator<? super V> valueComparator) {
       super.orderEntriesByValue(valueComparator);
       return this;
     }
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java
@@ -39,37 +39,37 @@ public abstract class ImmutableCollection<E> extends AbstractCollection<E> imple
 
   ImmutableCollection() {}
 
-  public abstract UnmodifiableIterator<E> iterator();
+  @Override public abstract UnmodifiableIterator<E> iterator();
 
-  public boolean contains(@Nullable Object object) {
+  @Override public boolean contains(@Nullable Object object) {
     return object != null && super.contains(object);
   }
 
-  public final boolean add(E e) {
+  @Override public final boolean add(E e) {
     throw new UnsupportedOperationException();
   }
 
-  public final boolean remove(@Nullable Object object) {
+  @Override public final boolean remove(@Nullable Object object) {
     throw new UnsupportedOperationException();
   }
 
-  public final boolean addAll(Collection<? extends E> newElements) {
+  @Override public final boolean addAll(Collection<? extends E> newElements) {
     throw new UnsupportedOperationException();
   }
 
-  public final boolean removeAll(Collection<?> oldElements) {
+  @Override public final boolean removeAll(Collection<?> oldElements) {
     throw new UnsupportedOperationException();
   }
 
-  public final boolean removeIf(Predicate<? super E> predicate) {
+  @Override public final boolean removeIf(Predicate<? super E> predicate) {
     throw new UnsupportedOperationException();
   }
 
-  public final boolean retainAll(Collection<?> elementsToKeep) {
+  @Override public final boolean retainAll(Collection<?> elementsToKeep) {
     throw new UnsupportedOperationException();
   }
 
-  public final void clear() {
+  @Override public final void clear() {
     throw new UnsupportedOperationException();
   }
 
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java
@@ -231,19 +231,19 @@ public int lastIndexOf(@Nullable Object object) {
     return (object == null) ? -1 : Lists.lastIndexOfImpl(this, object);
   }
 
-  public final boolean addAll(int index, Collection<? extends E> newElements) {
+  @Override public final boolean addAll(int index, Collection<? extends E> newElements) {
     throw new UnsupportedOperationException();
   }
 
-  public final E set(int index, E element) {
+  @Override public final E set(int index, E element) {
     throw new UnsupportedOperationException();
   }
 
-  public final void add(int index, E element) {
+  @Override public final void add(int index, E element) {
     throw new UnsupportedOperationException();
   }
 
-  public final E remove(int index) {
+  @Override public final E remove(int index) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java
@@ -402,19 +402,19 @@ public static <K, V> ImmutableMap<K, V> copyOf(
 
   abstract boolean isPartialView();
 
-  public final @Nullable V put(K k, V v) {
+  @Override public final @Nullable V put(K k, V v) {
     throw new UnsupportedOperationException();
   }
 
-  public final @Nullable V remove(Object o) {
+  @Override public final @Nullable V remove(Object o) {
     throw new UnsupportedOperationException();
   }
 
-  public final void putAll(Map<? extends K, ? extends V> map) {
+  @Override public final void putAll(Map<? extends K, ? extends V> map) {
     throw new UnsupportedOperationException();
   }
 
-  public final void clear() {
+  @Override public final void clear() {
     throw new UnsupportedOperationException();
   }
 
@@ -435,7 +435,7 @@ public boolean containsValue(@Nullable Object value) {
 
   private transient @Nullable ImmutableSet<Entry<K, V>> cachedEntrySet = null;
 
-  public final ImmutableSet<Entry<K, V>> entrySet() {
+  @Override public final ImmutableSet<Entry<K, V>> entrySet() {
     if (cachedEntrySet != null) {
       return cachedEntrySet;
     }
@@ -446,7 +446,7 @@ public final ImmutableSet<Entry<K, V>> entrySet() {
 
   private transient @Nullable ImmutableSet<K> cachedKeySet = null;
 
-  public ImmutableSet<K> keySet() {
+  @Override public ImmutableSet<K> keySet() {
     if (cachedKeySet != null) {
       return cachedKeySet;
     }
@@ -478,7 +478,7 @@ Spliterator<K> keySpliterator() {
 
   private transient @Nullable ImmutableCollection<V> cachedValues = null;
 
-  public ImmutableCollection<V> values() {
+  @Override public ImmutableCollection<V> values() {
     if (cachedValues != null) {
       return cachedValues;
     }
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSet.java
@@ -198,7 +198,7 @@ public ImmutableList<E> asList() {
       }
     }
 
-    ImmutableList<E> createAsList() {
+    @Override ImmutableList<E> createAsList() {
       return new RegularImmutableAsList<E>(this, toArray());
     }
   }
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java
@@ -418,15 +418,15 @@ ImmutableSortedSet<K> createKeySet() {
     return ImmutableSortedSet.copyOf(comparator, sortedDelegate.keySet());
   }
 
-  public Comparator<? super K> comparator() {
+  @Override public Comparator<? super K> comparator() {
     return comparator;
   }
 
-  public @Nullable K firstKey() {
+  @Override public @Nullable K firstKey() {
     return sortedDelegate.firstKey();
   }
 
-  public @Nullable K lastKey() {
+  @Override public @Nullable K lastKey() {
     return sortedDelegate.lastKey();
   }
 
@@ -441,7 +441,7 @@ public Comparator<? super K> comparator() {
     return null;
   }
 
-  public ImmutableSortedMap<K, V> headMap(K toKey) {
+  @Override public ImmutableSortedMap<K, V> headMap(K toKey) {
     checkNotNull(toKey);
     return newView(sortedDelegate.headMap(toKey));
   }
@@ -458,7 +458,7 @@ ImmutableSortedMap<K, V> headMap(K toKey, boolean inclusive) {
     return headMap(toKey);
   }
 
-  public ImmutableSortedMap<K, V> subMap(K fromKey, K toKey) {
+  @Override public ImmutableSortedMap<K, V> subMap(K fromKey, K toKey) {
     checkNotNull(fromKey);
     checkNotNull(toKey);
     checkArgument(comparator.compare(fromKey, toKey) <= 0);
@@ -472,7 +472,7 @@ ImmutableSortedMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boole
     return tailMap(fromKey, fromInclusive).headMap(toKey, toInclusive);
   }
 
-  public ImmutableSortedMap<K, V> tailMap(K fromKey) {
+  @Override public ImmutableSortedMap<K, V> tailMap(K fromKey) {
     checkNotNull(fromKey);
     return newView(sortedDelegate.tailMap(fromKey));
   }
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java
diff --git a/guava-testlib/test/com/google/common/collect/testing/IteratorTesterTest.java b/guava-testlib/test/com/google/common/collect/testing/IteratorTesterTest.java
diff --git a/guava/src/com/google/common/cache/AbstractLoadingCache.java b/guava/src/com/google/common/cache/AbstractLoadingCache.java
diff --git a/pom.xml b/pom.xml
