From 17aeeb9ea94a932bb86a5bde7ce852a59e7db063 Mon Sep 17 00:00:00 2001 From: Picnic-Bot Date: Mon, 19 Dec 2022 12:56:03 +0100 Subject: [PATCH 1/2] Upgrade versions-maven-plugin 2.13.0 -> 2.14.1 (#414) See: - https://github.com/mojohaus/versions/releases/tag/2.14.0 - https://github.com/mojohaus/versions/releases/tag/2.14.1 - https://github.com/mojohaus/versions-maven-plugin/compare/2.13.0...2.14.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ccda990c9a7..66ad13c9679 100644 --- a/pom.xml +++ b/pom.xml @@ -1197,7 +1197,7 @@ org.codehaus.mojo versions-maven-plugin - 2.13.0 + 2.14.1 never From ff2ed6f82cc8cface6f63829fb67eb8cc4520601 Mon Sep 17 00:00:00 2001 From: Picnic-Bot Date: Mon, 19 Dec 2022 13:14:50 +0100 Subject: [PATCH 2/2] Upgrade JSpecify 0.2.0 -> 0.3.0 (#415) See: - https://github.com/jspecify/jspecify/releases/tag/v0.3.0-alpha-1 - https://github.com/jspecify/jspecify/releases/tag/v0.3.0-alpha-2 - https://github.com/jspecify/jspecify/releases/tag/v0.3.0-alpha-3 - https://github.com/jspecify/jspecify/releases/tag/v0.3.0 - https://github.com/jspecify/jspecify/compare/v0.2.0...v0.3.0 --- .../bugpatterns/FormatStringConcatenation.java | 2 +- .../LexicographicalAnnotationAttributeListing.java | 2 +- .../bugpatterns/LexicographicalAnnotationListing.java | 2 +- .../tech/picnic/errorprone/bugpatterns/StringJoin.java | 2 +- .../picnic/errorprone/bugpatterns/package-info.java | 2 +- .../errorprone/bugpatterns/util/MoreJUnitMatchers.java | 2 +- .../errorprone/bugpatterns/util/package-info.java | 2 +- .../picnic/errorprone/refasterrules/AssortedRules.java | 5 +++-- .../tech/picnic/errorprone/refasterrules/MapRules.java | 8 +++++--- .../picnic/errorprone/refasterrules/MultimapRules.java | 5 +++-- .../picnic/errorprone/refasterrules/NullRules.java | 2 +- .../picnic/errorprone/refasterrules/OptionalRules.java | 2 +- .../picnic/errorprone/refasterrules/ReactorRules.java | 2 +- .../errorprone/refasterrules/RxJava2AdapterRules.java | 2 +- .../picnic/errorprone/refasterrules/StringRules.java | 2 +- .../picnic/errorprone/refasterrules/package-info.java | 2 +- .../errorprone/bugpatterns/RequestParamTypeTest.java | 2 +- pom.xml | 10 +++++----- .../plugin/RefasterRuleCompilerTaskListener.java | 2 +- .../errorprone/refaster/plugin/package-info.java | 2 +- .../errorprone/refaster/runner/package-info.java | 2 +- .../errorprone/refaster/annotation/package-info.java | 2 +- .../errorprone/refaster/matchers/package-info.java | 2 +- .../tech/picnic/errorprone/refaster/package-info.java | 2 +- .../refaster/matchers/AbstractMatcherTestChecker.java | 2 +- .../refaster/test/RefasterRuleCollection.java | 2 +- .../picnic/errorprone/refaster/test/package-info.java | 2 +- .../picnic/errorprone/refaster/test/ValidRules.java | 2 +- 28 files changed, 40 insertions(+), 36 deletions(-) diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FormatStringConcatenation.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FormatStringConcatenation.java index a51ec69db94..4c8f1fdd4ae 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FormatStringConcatenation.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/FormatStringConcatenation.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.bugpatterns.util.SourceCode; /** diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java index baefb2fa343..28e5f51b40c 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java @@ -40,7 +40,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.bugpatterns.util.AnnotationAttributeMatcher; import tech.picnic.errorprone.bugpatterns.util.SourceCode; diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationListing.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationListing.java index 046d95e71d5..01cd32f5e78 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationListing.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationListing.java @@ -27,7 +27,7 @@ import com.sun.tools.javac.code.TypeAnnotations.AnnotationType; import java.util.Comparator; import java.util.List; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.bugpatterns.util.SourceCode; /** diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringJoin.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringJoin.java index f7d8f810b72..ff520704f33 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringJoin.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/StringJoin.java @@ -27,7 +27,7 @@ import java.util.Formattable; import java.util.Iterator; import java.util.List; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.bugpatterns.util.SourceCode; /** diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/package-info.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/package-info.java index 08a3ad5ec25..7c79d4135e3 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/package-info.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/package-info.java @@ -1,4 +1,4 @@ /** Picnic Error Prone Contrib checks. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.bugpatterns; diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreJUnitMatchers.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreJUnitMatchers.java index 59aacd17910..c26bda471f4 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreJUnitMatchers.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/MoreJUnitMatchers.java @@ -18,7 +18,7 @@ import com.sun.source.tree.ExpressionTree; import com.sun.source.tree.MethodTree; import com.sun.source.tree.NewArrayTree; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection of JUnit-specific helper methods and {@link Matcher}s. diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/package-info.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/package-info.java index 280aa786d03..4b8726cede6 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/package-info.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/util/package-info.java @@ -1,4 +1,4 @@ /** Auxiliary utilities for use by Error Prone checks. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.bugpatterns.util; diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssortedRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssortedRules.java index 80d97c7b258..ff0cd1f17a6 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssortedRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssortedRules.java @@ -24,7 +24,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation; /** @@ -103,7 +103,8 @@ T before(Iterator iterator, T defaultValue) { } @AfterTemplate - @Nullable T after(Iterator iterator, T defaultValue) { + @Nullable + T after(Iterator iterator, T defaultValue) { return Iterators.getNext(iterator, defaultValue); } } diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MapRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MapRules.java index 2d56fbbc765..cdf99f5e609 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MapRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MapRules.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Stream; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation; /** Refaster rules related to expressions dealing with {@link Map} instances. */ @@ -31,12 +31,14 @@ Map after() { static final class MapGetOrNull { @BeforeTemplate - @Nullable V before(Map map, T key) { + @Nullable + V before(Map map, T key) { return map.getOrDefault(key, null); } @AfterTemplate - @Nullable V after(Map map, T key) { + @Nullable + V after(Map map, T key) { return map.get(key); } } diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MultimapRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MultimapRules.java index 0fba35943a0..0e17d57f320 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MultimapRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/MultimapRules.java @@ -7,7 +7,7 @@ import com.google.errorprone.refaster.annotation.BeforeTemplate; import java.util.Collection; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation; /** Refaster rules related to expressions dealing with {@link Multimap}s. */ @@ -50,7 +50,8 @@ int after(Multimap multimap) { */ static final class MultimapGet { @BeforeTemplate - @Nullable Collection before(Multimap multimap, K key) { + @Nullable + Collection before(Multimap multimap, K key) { return Refaster.anyOf(multimap.asMap(), Multimaps.asMap(multimap)).get(key); } diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/NullRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/NullRules.java index 823d82cea53..0a77f8c5e6d 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/NullRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/NullRules.java @@ -9,7 +9,7 @@ import com.google.errorprone.refaster.annotation.UseImportPolicy; import java.util.Objects; import java.util.function.Predicate; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation; /** Refaster rules related to expressions dealing with (possibly) null values. */ diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/OptionalRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/OptionalRules.java index a42a8198f20..676c7633e9d 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/OptionalRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/OptionalRules.java @@ -16,7 +16,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Stream; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation; /** Refaster rules related to expressions dealing with {@link Optional}s. */ diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java index 52a3e5fdd84..40faa052f89 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java @@ -27,7 +27,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/RxJava2AdapterRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/RxJava2AdapterRules.java index ad75d06fc51..c2d2724dcd1 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/RxJava2AdapterRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/RxJava2AdapterRules.java @@ -9,7 +9,7 @@ import io.reactivex.Maybe; import io.reactivex.Observable; import io.reactivex.Single; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import reactor.adapter.rxjava.RxJava2Adapter; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/StringRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/StringRules.java index ec4f6c005b8..4b403a02fb5 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/StringRules.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/StringRules.java @@ -16,7 +16,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Function; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.annotation.OnlineDocumentation; /** Refaster rules related to expressions dealing with {@link String}s. */ diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/package-info.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/package-info.java index 3423a8048d8..4a2bb28cd04 100644 --- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/package-info.java +++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/package-info.java @@ -1,4 +1,4 @@ /** Picnic Refaster rules. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refasterrules; diff --git a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/RequestParamTypeTest.java b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/RequestParamTypeTest.java index 6dfc7fb329d..45d58534c67 100644 --- a/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/RequestParamTypeTest.java +++ b/error-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/RequestParamTypeTest.java @@ -19,7 +19,7 @@ void identification() { "import java.util.List;", "import java.util.Map;", "import java.util.Set;", - "import org.jspecify.nullness.Nullable;", + "import org.jspecify.annotations.Nullable;", "import org.springframework.web.bind.annotation.DeleteMapping;", "import org.springframework.web.bind.annotation.GetMapping;", "import org.springframework.web.bind.annotation.PostMapping;", diff --git a/pom.xml b/pom.xml index 66ad13c9679..ee60ff903f4 100644 --- a/pom.xml +++ b/pom.xml @@ -358,7 +358,7 @@ org.jspecify jspecify - 0.2.0 + 0.3.0 org.junit @@ -611,15 +611,15 @@ + `org.jspecify.annotations.Nullable`. --> + `org.jspecify.annotations.Nullable`. --> + `org.jspecify.annotations.Nullable`. --> + `org.jspecify.annotations.Nullable`. --> diff --git a/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java b/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java index f7bd2c29085..f62efde1965 100644 --- a/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java +++ b/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java @@ -31,7 +31,7 @@ import javax.tools.FileObject; import javax.tools.JavaFileManager; import javax.tools.StandardLocation; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.AnnotatedCompositeCodeTransformer; /** diff --git a/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/package-info.java b/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/package-info.java index 4217cb239c1..69a95934187 100644 --- a/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/package-info.java +++ b/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/package-info.java @@ -3,5 +3,5 @@ * files on the classpath. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refaster.plugin; diff --git a/refaster-runner/src/main/java/tech/picnic/errorprone/refaster/runner/package-info.java b/refaster-runner/src/main/java/tech/picnic/errorprone/refaster/runner/package-info.java index f71089d3e1a..04188c8a866 100644 --- a/refaster-runner/src/main/java/tech/picnic/errorprone/refaster/runner/package-info.java +++ b/refaster-runner/src/main/java/tech/picnic/errorprone/refaster/runner/package-info.java @@ -1,4 +1,4 @@ /** Exposes Refaster rules found on the classpath through a regular Error Prone check. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refaster.runner; diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java index 99339a5c9fd..b5340854293 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java @@ -4,5 +4,5 @@ * non-patch mode. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refaster.annotation; diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java index 7a68fc5e307..0507845cc3e 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/matchers/package-info.java @@ -5,5 +5,5 @@ * com.google.errorprone.refaster.annotation.NotMatches @NotMatches} annotations. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refaster.matchers; diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/package-info.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/package-info.java index 99bd0885b7f..edb92bf1e4e 100644 --- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/package-info.java +++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/package-info.java @@ -1,4 +1,4 @@ /** Assorted classes that aid the compilation or evaluation of Refaster rules. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refaster; diff --git a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java index b1370b519d0..9449b8169c8 100644 --- a/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java +++ b/refaster-support/src/test/java/tech/picnic/errorprone/refaster/matchers/AbstractMatcherTestChecker.java @@ -11,7 +11,7 @@ import com.sun.source.tree.MethodTree; import com.sun.source.tree.Tree; import com.sun.source.util.TreeScanner; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** * An abstract {@link BugChecker} that reports a match for each expression matched by the given diff --git a/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java b/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java index 45a734cea6e..588077a10e2 100644 --- a/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java +++ b/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java @@ -44,7 +44,7 @@ import java.util.Optional; import java.util.Set; import java.util.regex.Pattern; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.refaster.runner.CodeTransformers; import tech.picnic.errorprone.refaster.runner.Refaster; diff --git a/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/package-info.java b/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/package-info.java index cce52793782..c4b7c62d9f8 100644 --- a/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/package-info.java +++ b/refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/package-info.java @@ -1,4 +1,4 @@ /** Opinionated utilities for the testing of Refaster rules. */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package tech.picnic.errorprone.refaster.test; diff --git a/refaster-test-support/src/test/java/tech/picnic/errorprone/refaster/test/ValidRules.java b/refaster-test-support/src/test/java/tech/picnic/errorprone/refaster/test/ValidRules.java index 1d6c2359c9d..45921ca60b7 100644 --- a/refaster-test-support/src/test/java/tech/picnic/errorprone/refaster/test/ValidRules.java +++ b/refaster-test-support/src/test/java/tech/picnic/errorprone/refaster/test/ValidRules.java @@ -8,7 +8,7 @@ import com.google.errorprone.refaster.annotation.Placeholder; import com.google.errorprone.refaster.annotation.UseImportPolicy; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** Refaster rule collection to validate that having no violations works as expected. */ final class ValidRules {