diff --git a/spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java b/spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java index f9bfdb71eb5..915a52833c9 100644 --- a/spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java +++ b/spring-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java @@ -20,9 +20,8 @@ import java.util.Iterator; import java.util.function.Consumer; import java.util.function.Supplier; -import org.jetbrains.annotations.NotNull; - import org.springframework.core.metrics.StartupStep; +import org.springframework.lang.NonNull; /** * {@link StartupStep} implementation for the Java Flight Recorder. @@ -115,7 +114,7 @@ class FlightRecorderStartupStep implements StartupStep { add(key, value.get()); } - @NotNull + @NonNull @Override public Iterator iterator() { return new TagsIterator(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java index 956187ea6fa..c962943c4c2 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java @@ -18,12 +18,12 @@ package org.springframework.expression.spel; import java.math.BigDecimal; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.springframework.expression.EvaluationException; import org.springframework.expression.TypeComparator; import org.springframework.expression.spel.support.StandardTypeComparator; +import org.springframework.lang.NonNull; import static org.assertj.core.api.Assertions.assertThat; @@ -143,7 +143,7 @@ public class StandardTypeComparatorTests { } @Override - public int compareTo(@NotNull ComparableType other) { + public int compareTo(@NonNull ComparableType other) { return this.id - other.id; } diff --git a/spring-web/src/main/java/org/springframework/http/DefaultHttpStatusCode.java b/spring-web/src/main/java/org/springframework/http/DefaultHttpStatusCode.java index 46dbeaf1932..8a1f52c4444 100644 --- a/spring-web/src/main/java/org/springframework/http/DefaultHttpStatusCode.java +++ b/spring-web/src/main/java/org/springframework/http/DefaultHttpStatusCode.java @@ -18,7 +18,7 @@ package org.springframework.http; import java.io.Serializable; -import org.jetbrains.annotations.NotNull; +import org.springframework.lang.NonNull; /** * Default implementation of {@link HttpStatusCode}. @@ -79,7 +79,7 @@ final class DefaultHttpStatusCode } @Override - public int compareTo(@NotNull HttpStatusCode o) { + public int compareTo(@NonNull HttpStatusCode o) { return Integer.compare(this.value, o.value()); } diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index f94de141f9a..3ea64aef027 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -134,6 +134,11 @@ + + + + +