diff --git a/src/main/java/org/openrewrite/java/logging/ChangeLombokLogAnnotation.java b/src/main/java/org/openrewrite/java/logging/ChangeLombokLogAnnotation.java index cc7e138..697f3c9 100644 --- a/src/main/java/org/openrewrite/java/logging/ChangeLombokLogAnnotation.java +++ b/src/main/java/org/openrewrite/java/logging/ChangeLombokLogAnnotation.java @@ -16,9 +16,9 @@ package org.openrewrite.java.logging; import lombok.AllArgsConstructor; +import org.jspecify.annotations.Nullable; import org.openrewrite.Option; import org.openrewrite.Recipe; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.ChangeType; import java.util.List; diff --git a/src/main/java/org/openrewrite/java/logging/LoggingFramework.java b/src/main/java/org/openrewrite/java/logging/LoggingFramework.java index 6ea6b77..4b5645d 100644 --- a/src/main/java/org/openrewrite/java/logging/LoggingFramework.java +++ b/src/main/java/org/openrewrite/java/logging/LoggingFramework.java @@ -15,8 +15,8 @@ */ package org.openrewrite.java.logging; +import org.jspecify.annotations.Nullable; import org.openrewrite.ExecutionContext; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.JavaParser; import org.openrewrite.java.JavaTemplate; diff --git a/src/main/java/org/openrewrite/java/logging/ParameterizedLogging.java b/src/main/java/org/openrewrite/java/logging/ParameterizedLogging.java index 29addbe..f08883d 100644 --- a/src/main/java/org/openrewrite/java/logging/ParameterizedLogging.java +++ b/src/main/java/org/openrewrite/java/logging/ParameterizedLogging.java @@ -17,10 +17,10 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.lang.NonNull; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.JavaTemplate; import org.openrewrite.java.JavaVisitor; diff --git a/src/main/java/org/openrewrite/java/logging/PrintStackTraceToLogError.java b/src/main/java/org/openrewrite/java/logging/PrintStackTraceToLogError.java index d0c73c8..26cefa1 100644 --- a/src/main/java/org/openrewrite/java/logging/PrintStackTraceToLogError.java +++ b/src/main/java/org/openrewrite/java/logging/PrintStackTraceToLogError.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.java.AnnotationMatcher; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.MethodMatcher; diff --git a/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java index 53e29c8..016f300 100644 --- a/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java +++ b/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java @@ -17,9 +17,9 @@ import lombok.EqualsAndHashCode; import lombok.Value; +import org.jspecify.annotations.Nullable; import org.openrewrite.*; import org.openrewrite.internal.ListUtils; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.*; import org.openrewrite.java.search.FindFieldsOfType; import org.openrewrite.java.search.UsesMethod; diff --git a/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java index 04bedd1..db03b68 100644 --- a/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java +++ b/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.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.java.*; import org.openrewrite.java.search.FindFieldsOfType; import org.openrewrite.java.search.UsesMethod; diff --git a/src/main/java/org/openrewrite/java/logging/SystemPrintToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemPrintToLogging.java index 5c44190..2133b09 100644 --- a/src/main/java/org/openrewrite/java/logging/SystemPrintToLogging.java +++ b/src/main/java/org/openrewrite/java/logging/SystemPrintToLogging.java @@ -18,9 +18,9 @@ import lombok.EqualsAndHashCode; import lombok.Getter; 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/logging/log4j/package-info.java b/src/main/java/org/openrewrite/java/logging/log4j/package-info.java index d13b85f..79fc2ad 100644 --- a/src/main/java/org/openrewrite/java/logging/log4j/package-info.java +++ b/src/main/java/org/openrewrite/java/logging/log4j/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.logging.log4j; -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/logging/logback/package-info.java b/src/main/java/org/openrewrite/java/logging/logback/package-info.java index 200053a..b780e5f 100644 --- a/src/main/java/org/openrewrite/java/logging/logback/package-info.java +++ b/src/main/java/org/openrewrite/java/logging/logback/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.logging.logback; -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/logging/package-info.java b/src/main/java/org/openrewrite/java/logging/package-info.java index 13ee4ba..1576b66 100644 --- a/src/main/java/org/openrewrite/java/logging/package-info.java +++ b/src/main/java/org/openrewrite/java/logging/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.logging; -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/logging/slf4j/ChangeLogLevel.java b/src/main/java/org/openrewrite/java/logging/slf4j/ChangeLogLevel.java index 913b5bf..7386b26 100644 --- a/src/main/java/org/openrewrite/java/logging/slf4j/ChangeLogLevel.java +++ b/src/main/java/org/openrewrite/java/logging/slf4j/ChangeLogLevel.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.java.ChangeMethodName; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.MethodMatcher; @@ -98,8 +98,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu }); } - @Nullable - J.Literal leftMostLiteral(Expression arg) { + J.@Nullable Literal leftMostLiteral(Expression arg) { if (arg instanceof J.Literal) { return (J.Literal) arg; } diff --git a/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java b/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java index ba1bce7..b6e9a4e 100644 --- a/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java +++ b/src/main/java/org/openrewrite/java/logging/slf4j/CompleteExceptionLogging.java @@ -15,12 +15,12 @@ */ package org.openrewrite.java.logging.slf4j; +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.ListUtils; -import org.openrewrite.internal.lang.Nullable; import org.openrewrite.java.JavaIsoVisitor; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.search.UsesType; diff --git a/src/main/java/org/openrewrite/java/logging/slf4j/JulParameterizedArguments.java b/src/main/java/org/openrewrite/java/logging/slf4j/JulParameterizedArguments.java index 4c7685d..64d4867 100644 --- a/src/main/java/org/openrewrite/java/logging/slf4j/JulParameterizedArguments.java +++ b/src/main/java/org/openrewrite/java/logging/slf4j/JulParameterizedArguments.java @@ -15,11 +15,11 @@ */ package org.openrewrite.java.logging.slf4j; +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.JavaIsoVisitor; import org.openrewrite.java.JavaParser; import org.openrewrite.java.JavaTemplate; diff --git a/src/main/java/org/openrewrite/java/logging/slf4j/package-info.java b/src/main/java/org/openrewrite/java/logging/slf4j/package-info.java index 811ee30..d88081a 100644 --- a/src/main/java/org/openrewrite/java/logging/slf4j/package-info.java +++ b/src/main/java/org/openrewrite/java/logging/slf4j/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.logging.slf4j; -import org.openrewrite.internal.lang.NonNullApi; +import org.jspecify.annotations.NullMarked; import org.openrewrite.internal.lang.NonNullFields;