From 2ae39fce8a4b9ac8abfd8302b837d1d50e6539e0 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 24 Jul 2017 19:54:28 +0100
Subject: [PATCH] Restrict imports in o.s.b.autoconfigure.web

Closes gh-8682
---
 .../src/checkstyle/import-control.xml         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/spring-boot-parent/src/checkstyle/import-control.xml b/spring-boot-parent/src/checkstyle/import-control.xml
index db8c4a8f5d..b73b7cbd40 100644
--- a/spring-boot-parent/src/checkstyle/import-control.xml
+++ b/spring-boot-parent/src/checkstyle/import-control.xml
@@ -3,6 +3,32 @@
 <import-control pkg="org.springframework.boot">
 	<allow pkg=".*" regex="true" />
 
+	<subpackage name="autoconfigure">
+		<subpackage name="web">
+			<disallow pkg="org.springframework.boot.web" />
+			<disallow pkg="org.springframework.web.servlet" />
+			<disallow pkg="org.springframework.web.reactive" />
+			<disallow pkg="javax.servlet" />
+			<allow pkg="org.springframework.boot.web.server" />
+			<allow pkg="org.springframework.boot.web.servlet.server" />
+			<subpackage name="client">
+				<allow pkg="org.springframework.boot.web.client" />
+			</subpackage>
+			<subpackage name="servlet">
+				<allow pkg="javax.servlet" />
+				<allow pkg="org.springframework.boot.web.embedded" />
+				<allow pkg="org.springframework.boot.web.servlet" />
+				<allow pkg="org.springframework.web.servlet" />
+			</subpackage>
+			<subpackage name="reactive">
+				<allow pkg="org.springframework.boot.web.codec" />
+				<allow pkg="org.springframework.boot.web.embedded" />
+				<allow pkg="org.springframework.boot.web.reactive" />
+				<allow pkg="org.springframework.web.reactive" />
+			</subpackage>
+		</subpackage>
+	</subpackage>
+
 	<!-- Logging -->
 	<subpackage name="logging">
 		<disallow pkg="org.springframework.context" />