From b9be1179a2c846d1d678a34d85961a263ef3b279 Mon Sep 17 00:00:00 2001
From: Phillip Webb <phil.webb@broadcom.com>
Date: Mon, 15 Sep 2025 20:18:25 -0700
Subject: [PATCH] Update checkstyle import-control.xml following restructure

Closes gh-47218
---
 config/checkstyle/import-control.xml | 157 ++++++++++++---------------
 1 file changed, 68 insertions(+), 89 deletions(-)

diff --git a/config/checkstyle/import-control.xml b/config/checkstyle/import-control.xml
index 770737c57f5..2040ef93af2 100644
--- a/config/checkstyle/import-control.xml
+++ b/config/checkstyle/import-control.xml
@@ -1,113 +1,31 @@
 <?xml version="1.0"?>
 <!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">
+
+	<!-- Only use Micrometer Observation -->
 	<allow pkg="io.micrometer.observation" />
 	<disallow pkg="io.micrometer" />
+
+	<!-- Use JSpecify for nullability (not Spring)  -->
 	<allow class="org.springframework.lang.Contract" />
 	<disallow pkg="org.springframework.lang" />
+
+	<!-- Allow other imports -->
 	<allow pkg=".*" regex="true" />
 
-	<subpackage name="autoconfigure">
-		<disallow class="org.springframework.boot.autoconfigure.jdbc.DataSourceProperties"/>
-		<subpackage name="web">
-			<allow pkg="org.springframework.boot.web.server" />
-			<allow pkg="org.springframework.boot.web.servlet.server" />
-			<disallow pkg="org.springframework.boot.web" />
-			<disallow pkg="org.springframework.web.servlet" />
-			<disallow pkg="org.springframework.web.reactive" />
-			<disallow pkg="jakarta.servlet" />
-			<subpackage name="client">
-				<allow pkg="org.springframework.boot.web.client" />
-			</subpackage>
-			<subpackage name="server">
-				<allow pkg="org.springframework.boot.web.server" />
-				<subpackage name="reactive">
-					<allow pkg="org.springframework.boot.web.reactive.server" />
-				</subpackage>
-				<subpackage name="servlet">
-					<allow pkg="jakarta.servlet" />
-					<allow pkg="org.springframework.boot.web.servlet" />
-					<allow pkg="org.springframework.boot.web.error" />
-					<allow pkg="org.springframework.web.servlet" />
-				</subpackage>
-			</subpackage>
-			<subpackage name="servlet">
-				<allow pkg="jakarta.servlet" />
-				<allow pkg="org.springframework.boot.web.servlet" />
-				<allow pkg="org.springframework.web.servlet" />
-				<subpackage name="error">
-					<allow pkg="org.springframework.boot.web.error" />
-				</subpackage>
-			</subpackage>
-			<subpackage name="reactive">
-				<allow pkg="org.springframework.boot.web.codec" />
-				<allow pkg="org.springframework.boot.web.reactive" />
-				<allow pkg="org.springframework.web.reactive" />
-				<subpackage name="error">
-					<allow pkg="org.springframework.boot.web.error" />
-				</subpackage>
-			</subpackage>
-		</subpackage>
-	</subpackage>
-
+	<!-- Open direct use of micrometer to specific subpackages  -->
 	<subpackage name="metrics">
 		<allow pkg="io.micrometer" />
 	</subpackage>
-
 	<subpackage name=".*\.metrics" regex="true">
 		<allow pkg="io.micrometer" />
 	</subpackage>
-
 	<subpackage name=".*\.autoconfigure" regex="true">
 		<allow pkg="io.micrometer" />
 	</subpackage>
-
-	<subpackage name="[^.]+\.actuate" regex="true">
-		<subpackage name="endpoint">
-			<file name=".*Endpoint(WebExtension)?" regex="true">
-				<allow pkg="org.springframework.lang"/>
-			</file>
-		</subpackage>
-	</subpackage>
-
-	<subpackage name="actuate">
-		<!-- Endpoint infrastructure -->
-		<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" />
-				<subpackage name="servlet">
-					<disallow pkg="org.springframework.web.reactive" />
-				</subpackage>
-				<subpackage name="reactive">
-					<disallow pkg="org.springframework.web.servlet" />
-				</subpackage>
-			</subpackage>
-		</subpackage>
-	</subpackage>
-
 	<subpackage name="docs">
 		<allow pkg="io.micrometer" />
 	</subpackage>
-
-	<!-- Logging -->
-	<subpackage name="logging">
-		<allow pkg="org.springframework.boot.context.properties" />
-		<allow pkg="org.springframework.boot.context.properties.bind" />
-		<allow pkg="org.springframework.context.aot" />
-		<disallow pkg="org.springframework.context" />
-		<disallow pkg="org.springframework.boot.context" />
-	</subpackage>
-
 	<subpackage name="test">
 		<subpackage name="autoconfigure">
 			<subpackage name="actuate">
@@ -116,6 +34,15 @@
 		</subpackage>
 	</subpackage>
 
+	<!-- Keep logging focused on lower level packages (binding and AOT) -->
+	<subpackage name="logging">
+		<allow pkg="org.springframework.boot.context.properties" />
+		<allow pkg="org.springframework.boot.context.properties.bind" />
+		<allow pkg="org.springframework.context.aot" />
+		<disallow pkg="org.springframework.context" />
+		<disallow pkg="org.springframework.boot.context" />
+	</subpackage>
+
 	<!-- Web related concerns -->
 	<subpackage name="web">
 
@@ -208,4 +135,56 @@
 
 	</subpackage>
 
+	<!-- Actuator endpoint infrastructure -->
+	<subpackage name="actuate">
+		<subpackage name="endpoint">
+			<disallow pkg="org.springframework.http" />
+			<disallow pkg="org.springframework.web" />
+			<subpackage name="web">
+				<allow pkg="org.springframework.http" />
+				<allow pkg="org.springframework.web" />
+				<subpackage name="servlet">
+					<disallow pkg="org.springframework.web.reactive" />
+				</subpackage>
+				<subpackage name="reactive">
+					<disallow pkg="org.springframework.web.servlet" />
+				</subpackage>
+			</subpackage>
+		</subpackage>
+	</subpackage>
+
+	<!-- Web Servers -->
+	<subpackage name="tomcat|undertow|jetty|reactor" regex="true">
+			<allow pkg="org.springframework.boot.web.server" />
+			<disallow pkg="org.springframework.boot.web" />
+			<disallow pkg="org.springframework.web.servlet" />
+			<disallow pkg="org.springframework.web.reactive" />
+		<subpackage name="servlet">
+			<allow pkg="jakarta.servlet" />
+			<allow pkg="org.springframework.boot.web.server" />
+			<allow pkg="org.springframework.boot.web.servlet" />
+			<allow pkg="org.springframework.boot.web.error" />
+			<allow pkg="org.springframework.web.servlet" />
+		</subpackage>
+		<subpackage name="reactive">
+			<allow pkg="org.springframework.boot.web.server" />
+			<allow pkg="org.springframework.boot.web.codec" />
+			<allow pkg="org.springframework.boot.web.reactive" />
+			<allow pkg="org.springframework.web.reactive" />
+		</subpackage>
+		<subpackage name="autoconfigure">
+			<subpackage name="servlet">
+				<allow pkg="jakarta.servlet" />
+				<allow pkg="org.springframework.boot.web.servlet" />
+				<allow pkg="org.springframework.boot.web.error" />
+				<allow pkg="org.springframework.web.servlet" />
+			</subpackage>
+			<subpackage name="reactive">
+				<allow pkg="org.springframework.boot.web.codec" />
+				<allow pkg="org.springframework.boot.web.reactive" />
+				<allow pkg="org.springframework.web.reactive" />
+			</subpackage>
+		</subpackage>
+	</subpackage>
+
 </import-control>