From 5b079eef84fd34990fbac92901889f4547f0ef1e Mon Sep 17 00:00:00 2001 From: Rick Ossendrijver Date: Thu, 29 Sep 2022 10:29:36 +0200 Subject: [PATCH] Rename package `tech.picnic.errorprone.refaster.{util => matchers}` (#267) --- .../errorprone/refastertemplates/AssertJNumberTemplates.java | 2 +- .../picnic/errorprone/refastertemplates/AssertJTemplates.java | 2 +- .../picnic/errorprone/refastertemplates/ReactorTemplates.java | 2 +- .../picnic/errorprone/refaster/{util => matchers}/IsArray.java | 2 +- .../errorprone/refaster/{util => matchers}/IsCharacter.java | 2 +- .../refaster/{util => matchers}/ThrowsCheckedException.java | 2 +- .../errorprone/refaster/{util => matchers}/package-info.java | 2 +- .../refaster/{util => matchers}/AbstractMatcherTestChecker.java | 2 +- .../errorprone/refaster/{util => matchers}/IsArrayTest.java | 2 +- .../errorprone/refaster/{util => matchers}/IsCharacterTest.java | 2 +- .../refaster/{util => matchers}/ThrowsCheckedExceptionTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename refaster-support/src/main/java/tech/picnic/errorprone/refaster/{util => matchers}/IsArray.java (91%) rename refaster-support/src/main/java/tech/picnic/errorprone/refaster/{util => matchers}/IsCharacter.java (93%) rename refaster-support/src/main/java/tech/picnic/errorprone/refaster/{util => matchers}/ThrowsCheckedException.java (97%) rename refaster-support/src/main/java/tech/picnic/errorprone/refaster/{util => matchers}/package-info.java (88%) rename refaster-support/src/test/java/tech/picnic/errorprone/refaster/{util => matchers}/AbstractMatcherTestChecker.java (97%) rename refaster-support/src/test/java/tech/picnic/errorprone/refaster/{util => matchers}/IsArrayTest.java (97%) rename refaster-support/src/test/java/tech/picnic/errorprone/refaster/{util => matchers}/IsCharacterTest.java (97%) rename refaster-support/src/test/java/tech/picnic/errorprone/refaster/{util => matchers}/ThrowsCheckedExceptionTest.java (98%) diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java index 3d2cb4cd32..0c7f08b6aa 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java @@ -19,7 +19,7 @@ import org.assertj.core.api.AbstractLongAssert; import org.assertj.core.api.AbstractShortAssert; import org.assertj.core.api.NumberAssert; -import tech.picnic.errorprone.refaster.util.IsCharacter; +import tech.picnic.errorprone.refaster.matchers.IsCharacter; final class AssertJNumberTemplates { private AssertJNumberTemplates() {} diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJTemplates.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJTemplates.java index 6eccc20cd5..e941254bb1 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJTemplates.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJTemplates.java @@ -53,7 +53,7 @@ import org.assertj.core.api.OptionalDoubleAssert; import org.assertj.core.api.OptionalIntAssert; import org.assertj.core.api.OptionalLongAssert; -import tech.picnic.errorprone.refaster.util.IsArray; +import tech.picnic.errorprone.refaster.matchers.IsArray; /** Refaster templates related to AssertJ expressions and statements. */ // XXX: Most `AbstractIntegerAssert` rules can also be applied for other primitive types. Generate diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ReactorTemplates.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ReactorTemplates.java index ff491b33a0..3201a8d4ee 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ReactorTemplates.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ReactorTemplates.java @@ -24,7 +24,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import reactor.test.publisher.PublisherProbe; -import tech.picnic.errorprone.refaster.util.ThrowsCheckedException; +import tech.picnic.errorprone.refaster.matchers.ThrowsCheckedException; /** Refaster templates related to Reactor expressions and statements. */ final class ReactorTemplates { diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/IsArray.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsArray.java similarity index 91% rename from refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/IsArray.java rename to refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsArray.java index 5b9ac4c44b..18cd53a063 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/IsArray.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsArray.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import static com.google.errorprone.matchers.Matchers.isArrayType; diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/IsCharacter.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsCharacter.java similarity index 93% rename from refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/IsCharacter.java rename to refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsCharacter.java index 891a04e80f..83ab9b5a9c 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/IsCharacter.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/IsCharacter.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import static com.google.errorprone.matchers.Matchers.anyOf; import static com.google.errorprone.matchers.Matchers.isSameType; diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/ThrowsCheckedException.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/ThrowsCheckedException.java similarity index 97% rename from refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/ThrowsCheckedException.java rename to refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/ThrowsCheckedException.java index aa1e581394..85f0a53a3d 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/ThrowsCheckedException.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/ThrowsCheckedException.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import com.google.common.collect.ImmutableSet; import com.google.errorprone.VisitorState; diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/package-info.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java similarity index 88% rename from refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/package-info.java rename to refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java index 297253575f..714c3224e2 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/util/package-info.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java @@ -6,4 +6,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue @javax.annotation.ParametersAreNonnullByDefault -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; diff --git a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/AbstractMatcherTestChecker.java b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java similarity index 97% rename from refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/AbstractMatcherTestChecker.java rename to refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java index f7fd67cb9e..adc2d1f965 100644 --- a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/AbstractMatcherTestChecker.java +++ b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import com.google.errorprone.VisitorState; import com.google.errorprone.bugpatterns.BugChecker; diff --git a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/IsArrayTest.java b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsArrayTest.java similarity index 97% rename from refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/IsArrayTest.java rename to refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsArrayTest.java index 3b78d3e06f..c2840d414a 100644 --- a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/IsArrayTest.java +++ b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsArrayTest.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import static com.google.errorprone.BugPattern.SeverityLevel.ERROR; diff --git a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/IsCharacterTest.java b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsCharacterTest.java similarity index 97% rename from refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/IsCharacterTest.java rename to refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsCharacterTest.java index d4534f227e..7f4ddc2fe1 100644 --- a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/IsCharacterTest.java +++ b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/IsCharacterTest.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import static com.google.errorprone.BugPattern.SeverityLevel.ERROR; diff --git a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/ThrowsCheckedExceptionTest.java b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/ThrowsCheckedExceptionTest.java similarity index 98% rename from refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/ThrowsCheckedExceptionTest.java rename to refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/ThrowsCheckedExceptionTest.java index 66811cb9e5..4281ba42c0 100644 --- a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/util/ThrowsCheckedExceptionTest.java +++ b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/ThrowsCheckedExceptionTest.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.refaster.util; +package tech.picnic.errorprone.refaster.matchers; import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;