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 <team@moderne.io>
openrewrite · Aug 15, 2024 · 2e0dae5 · 2e0dae5
1 parent 5defdde
commit 2e0dae5
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -17,14 +17,14 @@
 
 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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<RelocatedDependencyReport.Row> {

diff --git 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<RepositoryAccessibilityReport.Row> {

diff --git 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;