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

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 · 5bc49bf · 5bc49bf
1 parent e342eac
commit 5bc49bf
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/src/main/java/io/moderne/ai/AgentGenerativeModelClient.java b/src/main/java/io/moderne/ai/AgentGenerativeModelClient.java
@@ -26,7 +26,7 @@
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ipc.http.HttpSender;
 import org.openrewrite.ipc.http.HttpUrlConnectionSender;
 

diff --git a/src/main/java/io/moderne/ai/ClusteringClient.java b/src/main/java/io/moderne/ai/ClusteringClient.java
@@ -24,7 +24,7 @@
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ipc.http.HttpSender;
 import org.openrewrite.ipc.http.HttpUrlConnectionSender;
 

diff --git a/src/main/java/io/moderne/ai/EmbeddingModelClient.java b/src/main/java/io/moderne/ai/EmbeddingModelClient.java
@@ -25,7 +25,7 @@
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ipc.http.HttpSender;
 import org.openrewrite.ipc.http.HttpUrlConnectionSender;
 

diff --git a/src/main/java/io/moderne/ai/LanguageDetectorModelClient.java b/src/main/java/io/moderne/ai/LanguageDetectorModelClient.java
@@ -25,7 +25,7 @@
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ipc.http.HttpSender;
 import org.openrewrite.ipc.http.HttpUrlConnectionSender;
 

diff --git a/src/main/java/io/moderne/ai/RelatedModelClient.java b/src/main/java/io/moderne/ai/RelatedModelClient.java
@@ -20,7 +20,7 @@
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.*;
 import java.nio.file.Files;

diff --git a/src/main/java/io/moderne/ai/SpellCheckerClient.java b/src/main/java/io/moderne/ai/SpellCheckerClient.java
@@ -25,7 +25,7 @@
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ipc.http.HttpSender;
 import org.openrewrite.ipc.http.HttpUrlConnectionSender;
 

diff --git a/src/main/java/io/moderne/ai/package-info.java b/src/main/java/io/moderne/ai/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 io.moderne.ai;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/io/moderne/ai/research/FindCodeThatResembles.java b/src/main/java/io/moderne/ai/research/FindCodeThatResembles.java
@@ -27,8 +27,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.experimental.NonFinal;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;

diff --git a/src/main/java/io/moderne/ai/research/GetRecommendations.java b/src/main/java/io/moderne/ai/research/GetRecommendations.java
@@ -21,11 +21,11 @@
 import io.moderne.ai.table.Recommendations;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Option;
 import org.openrewrite.ScanningRecipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaSourceFile;

diff --git a/src/main/java/io/moderne/ai/research/package-info.java b/src/main/java/io/moderne/ai/research/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 io.moderne.ai.research;
 
-import org.openrewrite.internal.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/main/java/io/moderne/ai/table/EmbeddingPerformance.java b/src/main/java/io/moderne/ai/table/EmbeddingPerformance.java
@@ -17,10 +17,10 @@
 
 import lombok.Getter;
 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;
 
 import java.time.Duration;
 import java.util.ArrayList;

diff --git a/src/main/java/io/moderne/ai/table/GenerativeModelPerformance.java b/src/main/java/io/moderne/ai/table/GenerativeModelPerformance.java
@@ -17,10 +17,10 @@
 
 import lombok.Getter;
 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;
 
 import java.time.Duration;
 import java.util.ArrayList;

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