Merge branch '5.3.x'

spring-projects · Mar 24, 2022 · 7161940 · 7161940
2 parents 72e7ae6 + acf2955
commit 7161940
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/...ng-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java b/...ng-core/src/main/java/org/springframework/core/metrics/jfr/FlightRecorderStartupStep.java
@@ -20,9 +20,8 @@
 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 @@ public void add(String key, Supplier<String> value) {
 			add(key, value.get());
 		}
 
-		@NotNull
+		@NonNull
 		@Override
 		public Iterator<Tag> iterator() {
 			return new TagsIterator();

diff --git a/...ession/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java b/...ession/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java
@@ -18,12 +18,12 @@
 
 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 ComparableType(int id) {
 		}
 
 		@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
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import org.jetbrains.annotations.NotNull;
+import org.springframework.lang.NonNull;
 
 /**
  * Default implementation of {@link HttpStatusCode}.
@@ -79,7 +79,7 @@ private int hundreds() {
 	}
 
 	@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
@@ -134,6 +134,11 @@
 			<property name="regexp" value="true" />
 			<property name="illegalClasses" value="^org\.hamcrest\..+" />
 		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
+			<property name="id" value="bannedJetbrainsAnnotationsImports"/>
+			<property name="regexp" value="true" />
+			<property name="illegalClasses" value="^org\.jetbrains\.annotations\..+" />
+		</module>
 
 		<!-- Javadoc Comments -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">