GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update checkstyle import-control.xml following restructure 

Closes gh-47218
pull/47229/head
Phillip Webb 3 months ago
parent
8651e971ea
commit
b9be1179a2
1 changed files with 66 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 153
      config/checkstyle/import-control.xml

153
config/checkstyle/import-control.xml
Unescape View File

@ -1,105 +1,40 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd"> <!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"> <import-control pkg="org.springframework.boot">
<!-- Only use Micrometer Observation -->
<allow pkg="io.micrometer.observation" /> <allow pkg="io.micrometer.observation" />
<disallow pkg="io.micrometer" /> <disallow pkg="io.micrometer" />
<!-- Use JSpecify for nullability (not Spring) -->
<allow class="org.springframework.lang.Contract" /> <allow class="org.springframework.lang.Contract" />
<disallow pkg="org.springframework.lang" /> <disallow pkg="org.springframework.lang" />
<allow pkg=".*" regex="true" />
<subpackage name="autoconfigure"> <!-- Allow other imports -->
<disallow class="org.springframework.boot.autoconfigure.jdbc.DataSourceProperties"/> <allow pkg=".*" regex="true" />
<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"> <subpackage name="metrics">
<allow pkg="io.micrometer" /> <allow pkg="io.micrometer" />
</subpackage> </subpackage>
<subpackage name=".*\.metrics" regex="true"> <subpackage name=".*\.metrics" regex="true">
<allow pkg="io.micrometer" /> <allow pkg="io.micrometer" />
</subpackage> </subpackage>
<subpackage name=".*\.autoconfigure" regex="true"> <subpackage name=".*\.autoconfigure" regex="true">
<allow pkg="io.micrometer" /> <allow pkg="io.micrometer" />
</subpackage> </subpackage>
<subpackage name="docs">
<subpackage name="[^.]+\.actuate" regex="true"> <allow pkg="io.micrometer" />
<subpackage name="endpoint">
<file name=".*Endpoint(WebExtension)?" regex="true">
<allow pkg="org.springframework.lang"/>
</file>
</subpackage>
</subpackage> </subpackage>
<subpackage name="test">
<subpackage name="actuate"> <subpackage name="autoconfigure">
<!-- Endpoint infrastructure --> <subpackage name="actuate">
<subpackage name="endpoint"> <allow pkg="io.micrometer" />
<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>
</subpackage> </subpackage>
<subpackage name="docs"> <!-- Keep logging focused on lower level packages (binding and AOT) -->
<allow pkg="io.micrometer" />
</subpackage>
<!-- Logging -->
<subpackage name="logging"> <subpackage name="logging">
<allow pkg="org.springframework.boot.context.properties" /> <allow pkg="org.springframework.boot.context.properties" />
<allow pkg="org.springframework.boot.context.properties.bind" /> <allow pkg="org.springframework.boot.context.properties.bind" />
@ -108,14 +43,6 @@
<disallow pkg="org.springframework.boot.context" /> <disallow pkg="org.springframework.boot.context" />
</subpackage> </subpackage>
<subpackage name="test">
<subpackage name="autoconfigure">
<subpackage name="actuate">
<allow pkg="io.micrometer" />
</subpackage>
</subpackage>
</subpackage>
<!-- Web related concerns --> <!-- Web related concerns -->
<subpackage name="web"> <subpackage name="web">
@ -208,4 +135,56 @@
</subpackage> </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> </import-control>

Write Preview
Loading…
Cancel
Save