From 2e0dae5c848c7500ed3a224ffde9f1dd37b6fca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Schn=C3=A9ider?= Date: Thu, 15 Aug 2024 04:19:41 +0000 Subject: [PATCH] Migrate to JSpecify from OpenRewrite JSR-305 meta-annotations Use this link to re-run the recipe: https://app.moderne.io/builder/gW3xaSLWV?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne --- .../java/org/openrewrite/java/dependencies/AddDependency.java | 2 +- .../org/openrewrite/java/dependencies/ChangeDependency.java | 2 +- .../org/openrewrite/java/dependencies/DependencyInsight.java | 2 +- .../openrewrite/java/dependencies/DependencyLicenseCheck.java | 2 +- .../org/openrewrite/java/dependencies/DependencyList.java | 2 +- .../java/dependencies/DependencyResolutionDiagnostic.java | 2 +- .../java/dependencies/DependencyVulnerabilityCheck.java | 2 +- .../java/dependencies/RelocatedDependencyCheck.java | 2 +- .../org/openrewrite/java/dependencies/RemoveDependency.java | 2 +- src/main/java/org/openrewrite/java/dependencies/Sbom.java | 4 ++-- .../java/dependencies/UpgradeDependencyVersion.java | 2 +- .../java/dependencies/UpgradeTransitiveDependencyVersion.java | 2 +- .../java/dependencies/github/advisories/DatabaseSpecific.java | 2 +- .../java/dependencies/github/advisories/Range.java | 2 +- .../openrewrite/java/dependencies/oldgroupids/Migration.java | 2 +- .../dependencies/oldgroupids/ParseDefinitionMigrations.java | 2 +- .../java/org/openrewrite/java/dependencies/package-info.java | 4 ++-- .../dependencies/search/FindMinimumDependencyVersion.java | 2 +- .../openrewrite/java/dependencies/search/package-info.java | 4 ++-- .../java/dependencies/table/RelocatedDependencyReport.java | 2 +- .../dependencies/table/RepositoryAccessibilityReport.java | 2 +- .../org/openrewrite/java/dependencies/AddDependencyTest.java | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/openrewrite/java/dependencies/AddDependency.java b/src/main/java/org/openrewrite/java/dependencies/AddDependency.java index 024b9a3..5c40cdc 100644 --- a/src/main/java/org/openrewrite/java/dependencies/AddDependency.java +++ b/src/main/java/org/openrewrite/java/dependencies/AddDependency.java @@ -17,8 +17,8 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.maven.tree.Scope; @Value diff --git a/src/main/java/org/openrewrite/java/dependencies/ChangeDependency.java b/src/main/java/org/openrewrite/java/dependencies/ChangeDependency.java index 77f33b0..9e13b08 100644 --- a/src/main/java/org/openrewrite/java/dependencies/ChangeDependency.java +++ b/src/main/java/org/openrewrite/java/dependencies/ChangeDependency.java @@ -19,8 +19,8 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; -import org.openrewrite.internal.lang.Nullable; @Getter @AllArgsConstructor diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java b/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java index 1ce310f..7b4a974 100644 --- a/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java +++ b/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java @@ -17,8 +17,8 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.maven.table.DependenciesInUse; @Value diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyLicenseCheck.java b/src/main/java/org/openrewrite/java/dependencies/DependencyLicenseCheck.java index 8061f1d..e31a380 100644 --- a/src/main/java/org/openrewrite/java/dependencies/DependencyLicenseCheck.java +++ b/src/main/java/org/openrewrite/java/dependencies/DependencyLicenseCheck.java @@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.gradle.marker.GradleDependencyConfiguration; import org.openrewrite.gradle.marker.GradleProject; @@ -24,7 +25,6 @@ import org.openrewrite.groovy.GroovyVisitor; import org.openrewrite.groovy.tree.G; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.dependencies.table.LicenseReport; import org.openrewrite.maven.MavenIsoVisitor; import org.openrewrite.maven.MavenVisitor; diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyList.java b/src/main/java/org/openrewrite/java/dependencies/DependencyList.java index beffc7d..8bc66ad 100644 --- a/src/main/java/org/openrewrite/java/dependencies/DependencyList.java +++ b/src/main/java/org/openrewrite/java/dependencies/DependencyList.java @@ -17,10 +17,10 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.gradle.marker.GradleDependencyConfiguration; import org.openrewrite.gradle.marker.GradleProject; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.dependencies.table.DependencyListReport; import org.openrewrite.marker.Markers; import org.openrewrite.maven.tree.MavenResolutionResult; diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnostic.java b/src/main/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnostic.java index 3008a1a..73762a6 100644 --- a/src/main/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnostic.java +++ b/src/main/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnostic.java @@ -17,12 +17,12 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.gradle.marker.GradleDependencyConfiguration; import org.openrewrite.gradle.marker.GradleProject; import org.openrewrite.groovy.GroovyIsoVisitor; import org.openrewrite.groovy.tree.G; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.dependencies.table.GradleDependencyConfigurationErrors; import org.openrewrite.java.dependencies.table.RepositoryAccessibilityReport; import org.openrewrite.marker.Markup; diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyVulnerabilityCheck.java b/src/main/java/org/openrewrite/java/dependencies/DependencyVulnerabilityCheck.java index 815e860..87b3699 100644 --- a/src/main/java/org/openrewrite/java/dependencies/DependencyVulnerabilityCheck.java +++ b/src/main/java/org/openrewrite/java/dependencies/DependencyVulnerabilityCheck.java @@ -21,6 +21,7 @@ import lombok.EqualsAndHashCode; import lombok.Value; import lombok.experimental.NonFinal; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.gradle.UpgradeTransitiveDependencyVersion; import org.openrewrite.gradle.marker.GradleDependencyConfiguration; @@ -29,7 +30,6 @@ import org.openrewrite.groovy.GroovyVisitor; import org.openrewrite.groovy.tree.G; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.dependencies.internal.StaticVersionComparator; import org.openrewrite.java.dependencies.internal.Version; import org.openrewrite.java.dependencies.internal.VersionParser; diff --git a/src/main/java/org/openrewrite/java/dependencies/RelocatedDependencyCheck.java b/src/main/java/org/openrewrite/java/dependencies/RelocatedDependencyCheck.java index f0d9a61..830dc86 100644 --- a/src/main/java/org/openrewrite/java/dependencies/RelocatedDependencyCheck.java +++ b/src/main/java/org/openrewrite/java/dependencies/RelocatedDependencyCheck.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.dataformat.csv.CsvMapper; import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.groovy.GroovyIsoVisitor; import org.openrewrite.groovy.tree.G; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.dependencies.oldgroupids.Migration; import org.openrewrite.java.dependencies.table.RelocatedDependencyReport; diff --git a/src/main/java/org/openrewrite/java/dependencies/RemoveDependency.java b/src/main/java/org/openrewrite/java/dependencies/RemoveDependency.java index b749f1c..bbbed4d 100644 --- a/src/main/java/org/openrewrite/java/dependencies/RemoveDependency.java +++ b/src/main/java/org/openrewrite/java/dependencies/RemoveDependency.java @@ -17,9 +17,9 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.Option; import org.openrewrite.Recipe; -import org.openrewrite.internal.lang.Nullable; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/openrewrite/java/dependencies/Sbom.java b/src/main/java/org/openrewrite/java/dependencies/Sbom.java index 7c07a66..16c06cc 100644 --- a/src/main/java/org/openrewrite/java/dependencies/Sbom.java +++ b/src/main/java/org/openrewrite/java/dependencies/Sbom.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import lombok.Builder; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.gradle.marker.GradleDependencyConfiguration; import org.openrewrite.gradle.marker.GradleProject; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.marker.Marker; import org.openrewrite.maven.tree.MavenResolutionResult; import org.openrewrite.maven.tree.ResolvedDependency; @@ -40,7 +40,7 @@ @Value public class Sbom { - public static @Nullable Sbom.Bom sbomFrom(Marker m) { + public static Sbom.@Nullable Bom sbomFrom(Marker m) { if(m instanceof MavenResolutionResult) { return sbomFrom((MavenResolutionResult) m); } else if(m instanceof GradleProject) { diff --git a/src/main/java/org/openrewrite/java/dependencies/UpgradeDependencyVersion.java b/src/main/java/org/openrewrite/java/dependencies/UpgradeDependencyVersion.java index ad0f50f..bb32990 100644 --- a/src/main/java/org/openrewrite/java/dependencies/UpgradeDependencyVersion.java +++ b/src/main/java/org/openrewrite/java/dependencies/UpgradeDependencyVersion.java @@ -19,8 +19,8 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.maven.tree.GroupArtifact; import java.util.List; diff --git a/src/main/java/org/openrewrite/java/dependencies/UpgradeTransitiveDependencyVersion.java b/src/main/java/org/openrewrite/java/dependencies/UpgradeTransitiveDependencyVersion.java index 4a2aaee..e447ea2 100644 --- a/src/main/java/org/openrewrite/java/dependencies/UpgradeTransitiveDependencyVersion.java +++ b/src/main/java/org/openrewrite/java/dependencies/UpgradeTransitiveDependencyVersion.java @@ -17,9 +17,9 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.gradle.UpgradeDependencyVersion; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.maven.AddManagedDependency; @Value diff --git a/src/main/java/org/openrewrite/java/dependencies/github/advisories/DatabaseSpecific.java b/src/main/java/org/openrewrite/java/dependencies/github/advisories/DatabaseSpecific.java index 80e19c9..0656d04 100644 --- a/src/main/java/org/openrewrite/java/dependencies/github/advisories/DatabaseSpecific.java +++ b/src/main/java/org/openrewrite/java/dependencies/github/advisories/DatabaseSpecific.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Value; -import org.openrewrite.internal.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/src/main/java/org/openrewrite/java/dependencies/github/advisories/Range.java b/src/main/java/org/openrewrite/java/dependencies/github/advisories/Range.java index d7954da..eb9190f 100644 --- a/src/main/java/org/openrewrite/java/dependencies/github/advisories/Range.java +++ b/src/main/java/org/openrewrite/java/dependencies/github/advisories/Range.java @@ -16,7 +16,7 @@ package org.openrewrite.java.dependencies.github.advisories; import lombok.Value; -import org.openrewrite.internal.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/src/main/java/org/openrewrite/java/dependencies/oldgroupids/Migration.java b/src/main/java/org/openrewrite/java/dependencies/oldgroupids/Migration.java index 60276fe..5c0ca3c 100644 --- a/src/main/java/org/openrewrite/java/dependencies/oldgroupids/Migration.java +++ b/src/main/java/org/openrewrite/java/dependencies/oldgroupids/Migration.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Data; -import org.openrewrite.internal.lang.Nullable; +import org.jspecify.annotations.Nullable; @Data @AllArgsConstructor diff --git a/src/main/java/org/openrewrite/java/dependencies/oldgroupids/ParseDefinitionMigrations.java b/src/main/java/org/openrewrite/java/dependencies/oldgroupids/ParseDefinitionMigrations.java index 33809b3..56ef627 100644 --- a/src/main/java/org/openrewrite/java/dependencies/oldgroupids/ParseDefinitionMigrations.java +++ b/src/main/java/org/openrewrite/java/dependencies/oldgroupids/ParseDefinitionMigrations.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.dataformat.csv.CsvMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.Data; -import org.openrewrite.internal.lang.Nullable; +import org.jspecify.annotations.Nullable; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/openrewrite/java/dependencies/package-info.java b/src/main/java/org/openrewrite/java/dependencies/package-info.java index 236806a..bc09f46 100644 --- a/src/main/java/org/openrewrite/java/dependencies/package-info.java +++ b/src/main/java/org/openrewrite/java/dependencies/package-info.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@NonNullApi +@NullMarked @NonNullFields package org.openrewrite.java.dependencies; -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields; diff --git a/src/main/java/org/openrewrite/java/dependencies/search/FindMinimumDependencyVersion.java b/src/main/java/org/openrewrite/java/dependencies/search/FindMinimumDependencyVersion.java index 5351850..d77fc74 100644 --- a/src/main/java/org/openrewrite/java/dependencies/search/FindMinimumDependencyVersion.java +++ b/src/main/java/org/openrewrite/java/dependencies/search/FindMinimumDependencyVersion.java @@ -17,12 +17,12 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.gradle.IsBuildGradle; import org.openrewrite.gradle.marker.GradleDependencyConfiguration; import org.openrewrite.gradle.marker.GradleProject; import org.openrewrite.internal.StringUtils; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.dependencies.internal.StaticVersionComparator; import org.openrewrite.java.dependencies.internal.VersionParser; import org.openrewrite.java.marker.JavaSourceSet; diff --git a/src/main/java/org/openrewrite/java/dependencies/search/package-info.java b/src/main/java/org/openrewrite/java/dependencies/search/package-info.java index 1c8a1dd..018c3ad 100644 --- a/src/main/java/org/openrewrite/java/dependencies/search/package-info.java +++ b/src/main/java/org/openrewrite/java/dependencies/search/package-info.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@NonNullApi +@NullMarked @NonNullFields package org.openrewrite.java.dependencies.search; -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields; diff --git a/src/main/java/org/openrewrite/java/dependencies/table/RelocatedDependencyReport.java b/src/main/java/org/openrewrite/java/dependencies/table/RelocatedDependencyReport.java index 7c1e819..98a6889 100644 --- a/src/main/java/org/openrewrite/java/dependencies/table/RelocatedDependencyReport.java +++ b/src/main/java/org/openrewrite/java/dependencies/table/RelocatedDependencyReport.java @@ -17,10 +17,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreType; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.Column; import org.openrewrite.DataTable; import org.openrewrite.Recipe; -import org.openrewrite.internal.lang.Nullable; @JsonIgnoreType public class RelocatedDependencyReport extends DataTable { diff --git a/src/main/java/org/openrewrite/java/dependencies/table/RepositoryAccessibilityReport.java b/src/main/java/org/openrewrite/java/dependencies/table/RepositoryAccessibilityReport.java index 3077b95..daf2c12 100644 --- a/src/main/java/org/openrewrite/java/dependencies/table/RepositoryAccessibilityReport.java +++ b/src/main/java/org/openrewrite/java/dependencies/table/RepositoryAccessibilityReport.java @@ -17,10 +17,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreType; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.Column; import org.openrewrite.DataTable; import org.openrewrite.Recipe; -import org.openrewrite.internal.lang.Nullable; @JsonIgnoreType public class RepositoryAccessibilityReport extends DataTable { diff --git a/src/test/java/org/openrewrite/java/dependencies/AddDependencyTest.java b/src/test/java/org/openrewrite/java/dependencies/AddDependencyTest.java index 5fb2f6a..e788230 100644 --- a/src/test/java/org/openrewrite/java/dependencies/AddDependencyTest.java +++ b/src/test/java/org/openrewrite/java/dependencies/AddDependencyTest.java @@ -16,11 +16,11 @@ package org.openrewrite.java.dependencies; import org.intellij.lang.annotations.Language; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.openrewrite.DocumentExample; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.JavaParser; import org.openrewrite.test.RecipeSpec; import org.openrewrite.test.RewriteTest;