From eed508eb983602ccbc5c44687752e8cd8fd018a9 Mon Sep 17 00:00:00 2001 From: mohamedsamehsalah Date: Sat, 21 Oct 2023 21:16:59 +0200 Subject: [PATCH] Apply the suggestions....manually ? --- .../AssertJThrowingCallableRulesTestInput.java | 2 +- .../AssertJThrowingCallableRulesTestOutput.java | 2 +- .../refasterrules/ComparatorRulesTestInput.java | 4 ++-- .../refasterrules/ComparatorRulesTestOutput.java | 4 ++-- .../refasterrules/EqualityRulesTestInput.java | 2 +- .../refasterrules/EqualityRulesTestOutput.java | 2 +- .../ImmutableListMultimapRulesTestInput.java | 2 +- .../ImmutableListMultimapRulesTestOutput.java | 2 +- .../refasterrules/ImmutableListRulesTestInput.java | 2 +- .../refasterrules/ImmutableListRulesTestOutput.java | 2 +- .../refasterrules/ImmutableMapRulesTestInput.java | 2 +- .../refasterrules/ImmutableMapRulesTestOutput.java | 2 +- .../ImmutableSetMultimapRulesTestInput.java | 2 +- .../ImmutableSetMultimapRulesTestOutput.java | 2 +- .../refasterrules/ImmutableSetRulesTestInput.java | 2 +- .../refasterrules/ImmutableSetRulesTestOutput.java | 2 +- .../ImmutableSortedMapRulesTestInput.java | 2 +- .../ImmutableSortedMapRulesTestOutput.java | 2 +- .../refasterrules/JUnitToAssertJRulesTestInput.java | 12 ++++++------ .../refasterrules/JUnitToAssertJRulesTestOutput.java | 12 ++++++------ .../refasterrules/ReactorRulesTestInput.java | 4 ++-- .../refasterrules/ReactorRulesTestOutput.java | 4 ++-- .../refasterrules/StreamRulesTestInput.java | 11 +++++------ .../refasterrules/StreamRulesTestOutput.java | 12 ++++++------ .../refasterrules/StringRulesTestInput.java | 2 +- .../refasterrules/StringRulesTestOutput.java | 2 +- .../refasterrules/WebClientRulesTestInput.java | 2 +- .../refasterrules/WebClientRulesTestOutput.java | 2 +- 28 files changed, 51 insertions(+), 52 deletions(-) diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestInput.java index e34dc556..8164cfe9 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestInput.java @@ -17,9 +17,9 @@ final class AssertJThrowingCallableRulesTest implements RefasterRuleCollectionTe public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( assertThatExceptionOfType(Throwable.class), - assertThatIOException(), assertThatIllegalArgumentException(), assertThatIllegalStateException(), + assertThatIOException(), assertThatNullPointerException()); } diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestOutput.java index bb2a99ca..4abc5152 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/AssertJThrowingCallableRulesTestOutput.java @@ -18,9 +18,9 @@ final class AssertJThrowingCallableRulesTest implements RefasterRuleCollectionTe public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( assertThatExceptionOfType(Throwable.class), - assertThatIOException(), assertThatIllegalArgumentException(), assertThatIllegalStateException(), + assertThatIOException(), assertThatNullPointerException()); } diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestInput.java index 0fca14f8..170a9c5f 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestInput.java @@ -25,10 +25,10 @@ final class ComparatorRulesTest implements RefasterRuleCollectionTestCase { return ImmutableSet.of( Arrays.class, Collections.class, + identity(), ImmutableList.class, ImmutableSet.class, - Stream.class, - identity()); + Stream.class); } ImmutableSet> testNaturalOrder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestOutput.java index 9c34e008..3af4d384 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ComparatorRulesTestOutput.java @@ -26,10 +26,10 @@ final class ComparatorRulesTest implements RefasterRuleCollectionTestCase { return ImmutableSet.of( Arrays.class, Collections.class, + identity(), ImmutableList.class, ImmutableSet.class, - Stream.class, - identity()); + Stream.class); } ImmutableSet> testNaturalOrder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java index 7cd4e3bf..d873681d 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestInput.java @@ -14,7 +14,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class EqualityRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(Objects.class, Optional.class, not(null)); + return ImmutableSet.of(not(null), Objects.class, Optional.class); } ImmutableSet testPrimitiveOrReferenceEquality() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java index 0b8af555..2a0adf90 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/EqualityRulesTestOutput.java @@ -14,7 +14,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class EqualityRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(Objects.class, Optional.class, not(null)); + return ImmutableSet.of(not(null), Objects.class, Optional.class); } ImmutableSet testPrimitiveOrReferenceEquality() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestInput.java index 27b23104..5f5e72a2 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestInput.java @@ -22,7 +22,7 @@ final class ImmutableListMultimapRulesTest implements RefasterRuleCollectionTest @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - Streams.class, flatteningToImmutableListMultimap(null, null), identity()); + flatteningToImmutableListMultimap(null, null), identity(), Streams.class); } ImmutableSet> testImmutableListMultimapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestOutput.java index ca4dbdfd..dc33a6a2 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListMultimapRulesTestOutput.java @@ -22,7 +22,7 @@ final class ImmutableListMultimapRulesTest implements RefasterRuleCollectionTest @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - Streams.class, flatteningToImmutableListMultimap(null, null), identity()); + flatteningToImmutableListMultimap(null, null), identity(), Streams.class); } ImmutableSet> testImmutableListMultimapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestInput.java index 84882105..cacf0216 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestInput.java @@ -17,7 +17,7 @@ final class ImmutableListRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - Arrays.class, Collections.class, Comparator.class, Streams.class, naturalOrder()); + Arrays.class, Collections.class, Comparator.class, naturalOrder(), Streams.class); } ImmutableList.Builder testImmutableListBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestOutput.java index b152693d..73c563ee 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableListRulesTestOutput.java @@ -18,7 +18,7 @@ final class ImmutableListRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - Arrays.class, Collections.class, Comparator.class, Streams.class, naturalOrder()); + Arrays.class, Collections.class, Comparator.class, naturalOrder(), Streams.class); } ImmutableList.Builder testImmutableListBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestInput.java index 2302bb4c..14b75690 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestInput.java @@ -17,7 +17,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class ImmutableMapRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(Collections.class, Streams.class, identity()); + return ImmutableSet.of(Collections.class, identity(), Streams.class); } ImmutableMap.Builder testImmutableMapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestOutput.java index 3365f3fd..c26deacd 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableMapRulesTestOutput.java @@ -17,7 +17,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class ImmutableMapRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(Collections.class, Streams.class, identity()); + return ImmutableSet.of(Collections.class, identity(), Streams.class); } ImmutableMap.Builder testImmutableMapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestInput.java index 34e43bae..1eca73fb 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestInput.java @@ -18,7 +18,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class ImmutableSetMultimapRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(Streams.class, flatteningToImmutableSetMultimap(null, null)); + return ImmutableSet.of(flatteningToImmutableSetMultimap(null, null), Streams.class); } ImmutableSetMultimap.Builder testImmutableSetMultimapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestOutput.java index 60ac3cd9..5853dd57 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetMultimapRulesTestOutput.java @@ -18,7 +18,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class ImmutableSetMultimapRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(Streams.class, flatteningToImmutableSetMultimap(null, null)); + return ImmutableSet.of(flatteningToImmutableSetMultimap(null, null), Streams.class); } ImmutableSetMultimap.Builder testImmutableSetMultimapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestInput.java index 53e7c415..d457816e 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestInput.java @@ -18,7 +18,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class ImmutableSetRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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 testImmutableSetBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestOutput.java index 74a6c9d6..5bba22cf 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSetRulesTestOutput.java @@ -18,7 +18,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class ImmutableSetRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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 testImmutableSetBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestInput.java index 3dc40717..31ff897b 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestInput.java @@ -16,7 +16,7 @@ final class ImmutableSortedMapRulesTest implements RefasterRuleCollectionTestCas @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - Stream.class, Streams.class, naturalOrder(), toImmutableSortedMap(null, null, null)); + naturalOrder(), Stream.class, Streams.class, toImmutableSortedMap(null, null, null)); } ImmutableSortedMap.Builder testImmutableSortedMapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestOutput.java index 6a37cbf3..46120a32 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ImmutableSortedMapRulesTestOutput.java @@ -16,7 +16,7 @@ final class ImmutableSortedMapRulesTest implements RefasterRuleCollectionTestCas @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - Stream.class, Streams.class, naturalOrder(), toImmutableSortedMap(null, null, null)); + naturalOrder(), Stream.class, Streams.class, toImmutableSortedMap(null, null, null)); } ImmutableSortedMap.Builder testImmutableSortedMapBuilder() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java index 0c398251..a5dd823c 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestInput.java @@ -19,17 +19,17 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java index 99a62a38..3830279f 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/JUnitToAssertJRulesTestOutput.java @@ -22,17 +22,17 @@ final class JUnitToAssertJRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java index 300c70e8..0be2cd0b 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java @@ -36,12 +36,12 @@ final class ReactorRulesTest implements RefasterRuleCollectionTestCase { public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( ArrayList.class, + assertThat(0), Collection.class, HashMap.class, - List.class, ImmutableCollection.class, ImmutableMap.class, - assertThat(0), + List.class, maxBy(null), minBy(null), naturalOrder(), diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java index a8751ff1..b708ba35 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java @@ -39,12 +39,12 @@ final class ReactorRulesTest implements RefasterRuleCollectionTestCase { public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( ArrayList.class, + assertThat(0), Collection.class, HashMap.class, - List.class, ImmutableCollection.class, ImmutableMap.class, - assertThat(0), + List.class, maxBy(null), minBy(null), naturalOrder(), diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java index 5126726c..7a7ce8fc 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java @@ -43,22 +43,21 @@ final class StreamRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - ImmutableList.class, - ImmutableMap.class, - List.class, - Map.class, - Objects.class, - Streams.class, collectingAndThen(null, null), counting(), filtering(null, null), flatMapping(null, null), identity(), + ImmutableList.class, + ImmutableMap.class, + Map.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/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestOutput.java index a11b7ca6..bebbddc3 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestOutput.java @@ -45,22 +45,22 @@ final class StreamRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { return ImmutableSet.of( - ImmutableList.class, - ImmutableMap.class, - List.class, - Map.class, - Objects.class, - Streams.class, collectingAndThen(null, null), counting(), filtering(null, null), flatMapping(null, null), identity(), + ImmutableList.class, + ImmutableMap.class, + List.class, + Map.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/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestInput.java index a6b2f1cb..04992826 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestInput.java @@ -20,7 +20,7 @@ final class StringRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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 testStringIsEmpty() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestOutput.java index d5e1241a..01cd3be5 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StringRulesTestOutput.java @@ -23,7 +23,7 @@ final class StringRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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 testStringIsEmpty() { diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestInput.java index 2bbb7e81..2dc45813 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestInput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestInput.java @@ -16,7 +16,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class WebClientRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet 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/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestOutput.java index 445d3ab5..7f0df54c 100644 --- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestOutput.java +++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/WebClientRulesTestOutput.java @@ -16,7 +16,7 @@ import tech.picnic.errorprone.refaster.test.RefasterRuleCollectionTestCase; final class WebClientRulesTest implements RefasterRuleCollectionTestCase { @Override public ImmutableSet elidedTypesAndStaticImports() { - return ImmutableSet.of(fromValue(""), GET, HEAD, OPTIONS, PATCH, POST, PUT); + return ImmutableSet.of(GET, HEAD, OPTIONS, PATCH, POST, PUT, fromValue("")); } ImmutableSet testBodyValue() {