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

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 · 41c55c7 · 41c55c7
1 parent f5f144d
commit 41c55c7
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/org/openrewrite/quarkus/AddQuarkusProperty.java b/src/main/java/org/openrewrite/quarkus/AddQuarkusProperty.java
@@ -17,9 +17,9 @@
 
 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.properties.AddProperty;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.yaml.MergeYaml;

diff --git a/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyKey.java b/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyKey.java
@@ -17,9 +17,9 @@
 
 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.quarkus.search.FindQuarkusProperties;
 
 import java.util.List;

diff --git a/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyKeyVisitor.java b/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyKeyVisitor.java
@@ -16,11 +16,11 @@
 package org.openrewrite.quarkus;
 
 import lombok.RequiredArgsConstructor;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.Tree;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.quarkus.search.FindQuarkusProperties;
 import org.openrewrite.yaml.tree.Yaml;

diff --git a/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyValue.java b/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyValue.java
@@ -17,9 +17,9 @@
 
 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.quarkus.search.FindQuarkusProperties;
 
 import java.util.List;

diff --git a/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyValueVisitor.java b/src/main/java/org/openrewrite/quarkus/ChangeQuarkusPropertyValueVisitor.java
@@ -16,11 +16,11 @@
 package org.openrewrite.quarkus;
 
 import lombok.RequiredArgsConstructor;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.Tree;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.quarkus.search.FindQuarkusProperties;
 import org.openrewrite.yaml.tree.Yaml;

diff --git a/src/main/java/org/openrewrite/quarkus/DeleteQuarkusProperty.java b/src/main/java/org/openrewrite/quarkus/DeleteQuarkusProperty.java
@@ -17,9 +17,9 @@
 
 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.quarkus.search.FindQuarkusProperties;
 
 import java.util.List;

diff --git a/src/main/java/org/openrewrite/quarkus/DeleteQuarkusPropertyVisitor.java b/src/main/java/org/openrewrite/quarkus/DeleteQuarkusPropertyVisitor.java
@@ -16,11 +16,11 @@
 package org.openrewrite.quarkus;
 
 import lombok.RequiredArgsConstructor;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.Tree;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.quarkus.search.FindQuarkusProperties;
 import org.openrewrite.yaml.tree.Yaml;

diff --git a/src/main/java/org/openrewrite/quarkus/QuarkusExecutionContextView.java b/src/main/java/org/openrewrite/quarkus/QuarkusExecutionContextView.java
@@ -15,11 +15,11 @@
  */
 package org.openrewrite.quarkus;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.DelegatingExecutionContext;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.Tree;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.yaml.tree.Yaml;
 

diff --git a/src/main/java/org/openrewrite/quarkus/package-info.java b/src/main/java/org/openrewrite/quarkus/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.quarkus;
 
-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/quarkus/quarkus2/UsePanacheEntityBaseStaticMethods.java b/src/main/java/org/openrewrite/quarkus/quarkus2/UsePanacheEntityBaseStaticMethods.java
@@ -15,11 +15,11 @@
  */
 package org.openrewrite.quarkus.quarkus2;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.ChangeMethodTargetToStatic;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.MethodMatcher;

diff --git a/src/main/java/org/openrewrite/quarkus/quarkus2/package-info.java b/src/main/java/org/openrewrite/quarkus/quarkus2/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.quarkus.quarkus2;
 
-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/quarkus/search/FindQuarkusProfiles.java b/src/main/java/org/openrewrite/quarkus/search/FindQuarkusProfiles.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.marker.SearchResult;
 import org.openrewrite.properties.PropertiesIsoVisitor;
 import org.openrewrite.properties.tree.Properties;

diff --git a/src/main/java/org/openrewrite/quarkus/search/FindQuarkusProperties.java b/src/main/java/org/openrewrite/quarkus/search/FindQuarkusProperties.java
@@ -17,9 +17,9 @@
 
 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.marker.SearchResult;
 import org.openrewrite.properties.PropertiesIsoVisitor;
 import org.openrewrite.properties.PropertiesVisitor;

diff --git a/src/main/java/org/openrewrite/quarkus/search/package-info.java b/src/main/java/org/openrewrite/quarkus/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.quarkus.search;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;