Migrate to JSpecify from OpenRewrite JSR-305 meta-annotations (#70)

Use this link to re-run the recipe: https://app.moderne.io/builder/gW3xaSLWV?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne <[email protected]>
openrewrite · Aug 15, 2024 · e8a8db5 · e8a8db5
1 parent 6ac42e0
commit e8a8db5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/openrewrite/jenkins/CreateIndexJelly.java b/src/main/java/org/openrewrite/jenkins/CreateIndexJelly.java
@@ -16,8 +16,8 @@
 package org.openrewrite.jenkins;
 
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.MavenIsoVisitor;
 import org.openrewrite.text.PlainText;
 import org.openrewrite.text.PlainTextParser;

diff --git a/src/main/java/org/openrewrite/jenkins/Jenkins.java b/src/main/java/org/openrewrite/jenkins/Jenkins.java
@@ -15,9 +15,9 @@
  */
 package org.openrewrite.jenkins;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.SourceFile;
-import org.openrewrite.internal.lang.NonNull;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.tree.MavenResolutionResult;
 
 import java.util.function.Predicate;

diff --git a/src/main/java/org/openrewrite/jenkins/UpgradeJavaVersion.java b/src/main/java/org/openrewrite/jenkins/UpgradeJavaVersion.java
@@ -17,13 +17,13 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.GroovyParser;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.marker.Markup;
 

diff --git a/src/main/java/org/openrewrite/jenkins/github/AddTeamToCodeowners.java b/src/main/java/org/openrewrite/jenkins/github/AddTeamToCodeowners.java
@@ -18,9 +18,9 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
 import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.MavenIsoVisitor;
 import org.openrewrite.text.PlainText;
 import org.openrewrite.text.PlainTextParser;

diff --git a/src/main/java/org/openrewrite/jenkins/github/InMemoryTeamNameValidator.java b/src/main/java/org/openrewrite/jenkins/github/InMemoryTeamNameValidator.java
@@ -15,7 +15,7 @@
  */
 package org.openrewrite.jenkins.github;
 
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/main/java/org/openrewrite/jenkins/github/package-info.java b/src/main/java/org/openrewrite/jenkins/github/package-info.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 package org.openrewrite.jenkins.github;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
diff --git a/src/main/java/org/openrewrite/jenkins/package-info.java b/src/main/java/org/openrewrite/jenkins/package-info.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@NonNullApi
+@NullMarked
 package org.openrewrite.jenkins;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;