From 0e99c57f8e33e900dfb78333f02284d78eb3329e Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Thu, 24 Mar 2022 09:47:46 +0800
Subject: [PATCH 1/2] Prevent imports of null-safety annotations

See gh-30406
---
 src/checkstyle/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 148febe43fcc..90f953dfc567 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -13,7 +13,7 @@
 			name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="regexp" value="true" />
 			<property name="illegalPkgs"
-				value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.shaded.*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*" />
+				value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.shaded.*, ^org\.flywaydb\.core\.internal.*, ^org\.jetbrains\.annotations.*, ^org\.testcontainers\.shaded.*" />
 			<property name="illegalClasses"
 				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert"/>
 		</module>

From c087d609a0417bc09b1919855a6decdf3a61d79c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Fri, 25 Mar 2022 11:43:57 +0000
Subject: [PATCH 2/2] Polish "Prevent imports of null-safety annotations"

See gh-30406
---
 src/checkstyle/import-control.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/checkstyle/import-control.xml b/src/checkstyle/import-control.xml
index db983dd578f0..7c7f8aa6abd1 100644
--- a/src/checkstyle/import-control.xml
+++ b/src/checkstyle/import-control.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd">
 <import-control pkg="org.springframework.boot">
 	<disallow pkg="io.micrometer" />
+	<disallow pkg="org.springframework.lang" />
 	<allow pkg=".*" regex="true" />
 	<subpackage name="autoconfigure">
 		<disallow class="org.springframework.boot.autoconfigure.jdbc.DataSourceProperties"/>
@@ -45,6 +46,13 @@
 		<subpackage name="endpoint">
 			<disallow pkg="org.springframework.http" />
 			<disallow pkg="org.springframework.web" />
+			<subpackage name="invoke">
+				<subpackage name="reflect">
+					<file name="OperationMethodParameter">
+						<allow pkg="org.springframework.lang"/>
+					</file>
+				</subpackage>
+			</subpackage>
 			<subpackage name="web">
 				<allow pkg="org.springframework.http" />
 				<allow pkg="org.springframework.web" />
@@ -56,6 +64,9 @@
 				</subpackage>
 			</subpackage>
 		</subpackage>
+		<file name=".*Endpoint(WebExtension)?" regex="true">
+			<allow pkg="org.springframework.lang"/>
+		</file>
 	</subpackage>
 
 	<subpackage name="docs">