Restore import-control checkstyle

Restore checkstyle import control and fix a few violations in the
process.

Closes gh-14660
This commit is contained in:
Phillip Webb
2018-10-02 10:11:57 -07:00
parent 63b64b4efa
commit 3ff20b2440
7 changed files with 13 additions and 6 deletions

View File

@@ -11,5 +11,11 @@
<property name="illegalClasses"
value="^reactor\.core\.support\.Assert" />
</module>
<module
name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">
<property name="file"
value="${main.basedir}/src/checkstyle/import-control.xml" />
<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" />
</module>
</module>
</module>

View File

@@ -5,12 +5,12 @@
<subpackage name="autoconfigure">
<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="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>