Apply the suggestions....manually ?

PicnicSupermarket · Oct 21, 2023 · 24a8c9b · 24a8c9b
1 parent 505870a
commit 24a8c9b
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 46 deletions.
diff --git a/...resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestInput.java b/...resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestInput.java
@@ -17,9 +17,9 @@ final class AssertJThrowingCallableRulesTest implements RefasterRuleCollectionTe
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         assertThatExceptionOfType(Throwable.class),
-        assertThatIOException(),
         assertThatIllegalArgumentException(),
         assertThatIllegalStateException(),
+        assertThatIOException(),
         assertThatNullPointerException());
   }
 

diff --git a/...esources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestOutput.java b/...esources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestOutput.java
@@ -18,9 +18,9 @@ final class AssertJThrowingCallableRulesTest implements RefasterRuleCollectionTe
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         assertThatExceptionOfType(Throwable.class),
-        assertThatIOException(),
         assertThatIllegalArgumentException(),
         assertThatIllegalStateException(),
+        assertThatIOException(),
         assertThatNullPointerException());
   }
 

diff --git a/...rib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestInput.java b/...rib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestInput.java
@@ -20,10 +20,10 @@ public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         Arrays.class,
         Collections.class,
+        identity(),
         ImmutableList.class,
         ImmutableSet.class,
-        Stream.class,
-        identity());
+        Stream.class);
   }
 
   ImmutableSet<Comparator<String>> testNaturalOrder() {

diff --git a/...ib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestOutput.java b/...ib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestOutput.java
@@ -20,10 +20,10 @@ public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         Arrays.class,
         Collections.class,
+        identity(),
         ImmutableList.class,
         ImmutableSet.class,
-        Stream.class,
-        identity());
+        Stream.class);
   }
 
   ImmutableSet<Comparator<String>> testNaturalOrder() {

diff --git a/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java b/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java
@@ -14,7 +14,7 @@
 final class EqualityRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Objects.class, Optional.class, not(null));
+    return ImmutableSet.of(not(null), Objects.class, Optional.class);
   }
 
   ImmutableSet<Boolean> testPrimitiveOrReferenceEquality() {

diff --git a/...trib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java b/...trib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java
@@ -14,7 +14,7 @@
 final class EqualityRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Objects.class, Optional.class, not(null));
+    return ImmutableSet.of(not(null), Objects.class, Optional.class);
   }
 
   ImmutableSet<Boolean> testPrimitiveOrReferenceEquality() {

diff --git a/...t/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestInput.java b/...t/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestInput.java
@@ -22,7 +22,7 @@ final class ImmutableListMultimapRulesTest implements RefasterRuleCollectionTest
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Streams.class, flatteningToImmutableListMultimap(null, null), identity());
+        flatteningToImmutableListMultimap(null, null), identity(), Streams.class);
   }
 
   ImmutableSet<ImmutableMultimap.Builder<String, Integer>> testImmutableListMultimapBuilder() {

diff --git a/.../resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestOutput.java b/.../resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestOutput.java
@@ -22,7 +22,7 @@ final class ImmutableListMultimapRulesTest implements RefasterRuleCollectionTest
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Streams.class, flatteningToImmutableListMultimap(null, null), identity());
+        flatteningToImmutableListMultimap(null, null), identity(), Streams.class);
   }
 
   ImmutableSet<ImmutableMultimap.Builder<String, Integer>> testImmutableListMultimapBuilder() {

diff --git a/.../src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestInput.java b/.../src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestInput.java
@@ -17,7 +17,7 @@ final class ImmutableListRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Arrays.class, Collections.class, Comparator.class, Streams.class, naturalOrder());
+        Arrays.class, Collections.class, Comparator.class, naturalOrder(), Streams.class);
   }
 
   ImmutableList.Builder<String> testImmutableListBuilder() {

diff --git a/...src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestOutput.java b/...src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestOutput.java
@@ -18,7 +18,7 @@ final class ImmutableListRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Arrays.class, Collections.class, Comparator.class, Streams.class, naturalOrder());
+        Arrays.class, Collections.class, Comparator.class, naturalOrder(), Streams.class);
   }
 
   ImmutableList.Builder<String> testImmutableListBuilder() {

diff --git a/...b/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestInput.java b/...b/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestInput.java
@@ -17,7 +17,7 @@
 final class ImmutableMapRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Collections.class, Streams.class, identity());
+    return ImmutableSet.of(Collections.class, identity(), Streams.class);
   }
 
   ImmutableMap.Builder<String, Integer> testImmutableMapBuilder() {

diff --git a/.../src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestOutput.java b/.../src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestOutput.java
@@ -17,7 +17,7 @@
 final class ImmutableMapRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Collections.class, Streams.class, identity());
+    return ImmutableSet.of(Collections.class, identity(), Streams.class);
   }
 
   ImmutableMap.Builder<String, Integer> testImmutableMapBuilder() {

diff --git a/...st/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestInput.java b/...st/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestInput.java
@@ -18,7 +18,7 @@
 final class ImmutableSetMultimapRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Streams.class, flatteningToImmutableSetMultimap(null, null));
+    return ImmutableSet.of(flatteningToImmutableSetMultimap(null, null), Streams.class);
   }
 
   ImmutableSetMultimap.Builder<String, Integer> testImmutableSetMultimapBuilder() {

diff --git a/...t/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestOutput.java b/...t/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestOutput.java
@@ -18,7 +18,7 @@
 final class ImmutableSetMultimapRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Streams.class, flatteningToImmutableSetMultimap(null, null));
+    return ImmutableSet.of(flatteningToImmutableSetMultimap(null, null), Streams.class);
   }
 
   ImmutableSetMultimap.Builder<String, Integer> testImmutableSetMultimapBuilder() {

diff --git a/...b/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestInput.java b/...b/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestInput.java
@@ -18,7 +18,7 @@
 final class ImmutableSetRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Arrays.class, Collections.class, Streams.class, not(null));
+    return ImmutableSet.of(Arrays.class, Collections.class, not(null), Streams.class);
   }
 
   ImmutableSet.Builder<String> testImmutableSetBuilder() {

diff --git a/.../src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestOutput.java b/.../src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestOutput.java
@@ -18,7 +18,7 @@
 final class ImmutableSetRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(Arrays.class, Collections.class, Streams.class, not(null));
+    return ImmutableSet.of(Arrays.class, Collections.class, not(null), Streams.class);
   }
 
   ImmutableSet.Builder<String> testImmutableSetBuilder() {

diff --git a/...test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestInput.java b/...test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestInput.java
@@ -16,7 +16,7 @@ final class ImmutableSortedMapRulesTest implements RefasterRuleCollectionTestCas
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Stream.class, Streams.class, naturalOrder(), toImmutableSortedMap(null, null, null));
+        naturalOrder(), Stream.class, Streams.class, toImmutableSortedMap(null, null, null));
   }
 
   ImmutableSortedMap.Builder<String, Integer> testImmutableSortedMapBuilder() {

diff --git a/...est/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestOutput.java b/...est/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestOutput.java
@@ -16,7 +16,7 @@ final class ImmutableSortedMapRulesTest implements RefasterRuleCollectionTestCas
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Stream.class, Streams.class, naturalOrder(), toImmutableSortedMap(null, null, null));
+        naturalOrder(), Stream.class, Streams.class, toImmutableSortedMap(null, null, null));
   }
 
   ImmutableSortedMap.Builder<String, Integer> testImmutableSortedMapBuilder() {

diff --git a/...src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java b/...src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java
@@ -19,17 +19,17 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Assertions.class,
-        assertDoesNotThrow(() -> null),
-        assertInstanceOf(null, null),
-        assertThrows(null, null),
-        assertThrowsExactly(null, null),
         (Runnable) () -> assertFalse(true),
         (Runnable) () -> assertNotNull(null),
         (Runnable) () -> assertNotSame(null, null),
         (Runnable) () -> assertNull(null),
         (Runnable) () -> assertSame(null, null),
-        (Runnable) () -> assertTrue(true));
+        (Runnable) () -> assertTrue(true),
+        assertDoesNotThrow(() -> null),
+        assertInstanceOf(null, null),
+        Assertions.class,
+        assertThrows(null, null),
+        assertThrowsExactly(null, null));
   }
 
   void testThrowNewAssertionError() {

diff --git a/...rc/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java b/...rc/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java
@@ -23,17 +23,17 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Assertions.class,
-        assertDoesNotThrow(() -> null),
-        assertInstanceOf(null, null),
-        assertThrows(null, null),
-        assertThrowsExactly(null, null),
         (Runnable) () -> assertFalse(true),
         (Runnable) () -> assertNotNull(null),
         (Runnable) () -> assertNotSame(null, null),
         (Runnable) () -> assertNull(null),
         (Runnable) () -> assertSame(null, null),
-        (Runnable) () -> assertTrue(true));
+        (Runnable) () -> assertTrue(true),
+        assertDoesNotThrow(() -> null),
+        assertInstanceOf(null, null),
+        Assertions.class,
+        assertThrows(null, null),
+        assertThrowsExactly(null, null));
   }
 
   void testThrowNewAssertionError() {

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -32,12 +32,12 @@ final class ReactorRulesTest implements RefasterRuleCollectionTestCase {
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         ArrayList.class,
+        assertThat(0),
         Collection.class,
         HashMap.class,
-        List.class,
         ImmutableCollection.class,
         ImmutableMap.class,
-        assertThat(0),
+        List.class,
         toCollection(null),
         toImmutableList(),
         toOptional());

diff --git a/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
@@ -35,12 +35,12 @@ final class ReactorRulesTest implements RefasterRuleCollectionTestCase {
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
         ArrayList.class,
+        assertThat(0),
         Collection.class,
         HashMap.class,
-        List.class,
         ImmutableCollection.class,
         ImmutableMap.class,
-        assertThat(0),
+        List.class,
         toCollection(null),
         toImmutableList(),
         toOptional());

diff --git a/...contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java b/...contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java
@@ -37,18 +37,18 @@ final class StreamRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        ImmutableList.class,
-        Objects.class,
-        Streams.class,
         counting(),
         filtering(null, null),
         flatMapping(null, null),
         identity(),
+        ImmutableList.class,
         mapping(null, null),
         maxBy(null),
         minBy(null),
         not(null),
+        Objects.class,
         reducing(null),
+        Streams.class,
         summarizingDouble(null),
         summarizingInt(null),
         summarizingLong(null),

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestOutput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestOutput.java
@@ -39,18 +39,18 @@ final class StreamRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        ImmutableList.class,
-        Objects.class,
-        Streams.class,
         counting(),
         filtering(null, null),
         flatMapping(null, null),
         identity(),
+        ImmutableList.class,
         mapping(null, null),
         maxBy(null),
         minBy(null),
         not(null),
+        Objects.class,
         reducing(null),
+        Streams.class,
         summarizingDouble(null),
         summarizingInt(null),
         summarizingLong(null),

diff --git a/...contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestInput.java b/...contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestInput.java
@@ -20,7 +20,7 @@ final class StringRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Arrays.class, Joiner.class, Objects.class, Stream.class, Streams.class, joining(), UTF_8);
+        UTF_8, Arrays.class, Joiner.class, joining(), Objects.class, Stream.class, Streams.class);
   }
 
   ImmutableSet<Boolean> testStringIsEmpty() {

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestOutput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestOutput.java
@@ -23,7 +23,7 @@ final class StringRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
     return ImmutableSet.of(
-        Arrays.class, Joiner.class, Objects.class, Stream.class, Streams.class, joining(), UTF_8);
+        UTF_8, Arrays.class, Joiner.class, joining(), Objects.class, Stream.class, Streams.class);
   }
 
   ImmutableSet<Boolean> testStringIsEmpty() {

diff --git a/...trib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestInput.java b/...trib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestInput.java
@@ -16,7 +16,7 @@
 final class WebClientRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(fromValue(""), GET, HEAD, OPTIONS, PATCH, POST, PUT);
+    return ImmutableSet.of(GET, HEAD, OPTIONS, PATCH, POST, PUT, fromValue(""));
   }
 
   ImmutableSet<?> testBodyValue() {

diff --git a/...rib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestOutput.java b/...rib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestOutput.java
@@ -16,7 +16,7 @@
 final class WebClientRulesTest implements RefasterRuleCollectionTestCase {
   @Override
   public ImmutableSet<Object> elidedTypesAndStaticImports() {
-    return ImmutableSet.of(fromValue(""), GET, HEAD, OPTIONS, PATCH, POST, PUT);
+    return ImmutableSet.of(GET, HEAD, OPTIONS, PATCH, POST, PUT, fromValue(""));
   }
 
   ImmutableSet<?> testBodyValue() {