From acf2955b960fe570e9c99187f2294bccf2b7df6e Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Thu, 24 Mar 2022 09:00:03 +0800
Subject: [PATCH] Ban jetbrains annotations imports

Closes gh-28226
---
 .../core/metrics/jfr/FlightRecorderStartupStep.java          | 5 ++---
 src/checkstyle/checkstyle.xml                                | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

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<Tag> iterator() {
 			return new TagsIterator();
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 @@
 			<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">