Skip to content

Commit f963fc5

Browse files
jhoellerjhoeller
committed
Check that nullable annotations are from org.springframework.lang
Closes gh-28410
1 parent b55eee1 commit f963fc5

File tree

2 files changed

+167
-161
lines changed

2 files changed

+167
-161
lines changed

‎src/checkstyle/checkstyle-suppressions.xml

Lines changed: 77 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3,114 +3,120 @@
33
<suppressions>
44

55
<!-- global -->
6-
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="AnnotationLocation|AnnotationUseStyle|AtclauseOrder|AvoidNestedBlocks|FinalClass|HideUtilityClassConstructor|InnerTypeLast|JavadocStyle|JavadocType|JavadocVariable|LeftCurly|MultipleVariableDeclarations|NeedBraces|OneTopLevelClass|OuterTypeFilename|RequireThis|SpringCatch|SpringJavadoc|SpringNoThis" />
7-
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]org[\\/]springframework[\\/].+(Tests|Suite)" checks="IllegalImport" id="bannedJUnitJupiterImports" />
8-
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="SpringJUnit5" message="should not be public" />
6+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="AnnotationLocation|AnnotationUseStyle|AtclauseOrder|AvoidNestedBlocks|FinalClass|HideUtilityClassConstructor|InnerTypeLast|JavadocStyle|JavadocType|JavadocVariable|LeftCurly|MultipleVariableDeclarations|NeedBraces|OneTopLevelClass|OuterTypeFilename|RequireThis|SpringCatch|SpringJavadoc|SpringNoThis"/>
7+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]org[\\/]springframework[\\/].+(Tests|Suite)" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
8+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="SpringJUnit5" message="should not be public"/>
99
<!-- generated sources -->
10-
<suppress files="[\\/]build[\\/]generated[\\/]sources[\\/]" checks=".*" />
10+
<suppress files="[\\/]build[\\/]generated[\\/]sources[\\/]" checks=".*"/>
1111

1212
<!-- JMH benchmarks -->
13-
<suppress files="[\\/]src[\\/]jmh[\\/]java[\\/]org[\\/]springframework[\\/]" checks="JavadocVariable|JavadocStyle|InnerTypeLast" />
13+
<suppress files="[\\/]src[\\/]jmh[\\/]java[\\/]org[\\/]springframework[\\/]" checks="JavadocVariable|JavadocStyle|InnerTypeLast"/>
14+
15+
<!-- spring-aop -->
16+
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]aopalliance[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
1417

1518
<!-- spring-beans -->
1619
<suppress files="TypeMismatchException" checks="MutableException"/>
1720
<suppress files="BeanCreationException" checks="MutableException"/>
18-
<suppress files="BeanDefinitionParserDelegate" checks="JavadocVariable" />
19-
<suppress files="DefaultBeanDefinitionDocumentReader" checks="JavadocVariable" />
20-
<suppress files="BeanComponentDefinition" checks="EqualsHashCode" />
21-
<suppress files="GenericBeanDefinition" checks="EqualsHashCode" />
22-
<suppress files="RootBeanDefinition" checks="EqualsHashCode" />
21+
<suppress files="BeanDefinitionParserDelegate" checks="JavadocVariable"/>
22+
<suppress files="DefaultBeanDefinitionDocumentReader" checks="JavadocVariable"/>
23+
<suppress files="BeanComponentDefinition" checks="EqualsHashCode"/>
24+
<suppress files="GenericBeanDefinition" checks="EqualsHashCode"/>
25+
<suppress files="RootBeanDefinition" checks="EqualsHashCode"/>
2326

2427
<!-- spring-context -->
25-
<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" id="bannedJUnit3Imports" />
28+
<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" id="bannedJUnit3Imports"/>
2629

2730
<!-- spring-core -->
28-
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*" />
29-
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]cglib[\\/]" checks=".*" />
30-
<suppress files="ByteArrayEncoder" checks="SpringLambda" />
31-
<suppress files="SocketUtils" checks="HideUtilityClassConstructor" />
32-
<suppress files="ResolvableType" checks="FinalClass" />
33-
<suppress files="[\\/]src[\\/]testFixtures[\\/]java[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports" />
31+
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*"/>
32+
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]cglib[\\/]" checks=".*"/>
33+
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]lang[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
34+
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]core[\\/]annotation[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
35+
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]core[\\/]annotation[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
36+
<suppress files="ByteArrayEncoder" checks="SpringLambda"/>
37+
<suppress files="SocketUtils" checks="HideUtilityClassConstructor"/>
38+
<suppress files="ResolvableType" checks="FinalClass"/>
39+
<suppress files="[\\/]src[\\/]testFixtures[\\/]java[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
3440

3541
<!-- spring-expression -->
36-
<suppress files="ExpressionException" checks="MutableException" />
37-
<suppress files="SpelMessage" checks="JavadocVariable|JavadocStyle" />
38-
<suppress files="SpelReproTests" checks="InterfaceIsType" />
42+
<suppress files="ExpressionException" checks="MutableException"/>
43+
<suppress files="SpelMessage" checks="JavadocVariable|JavadocStyle"/>
44+
<suppress files="SpelReproTests" checks="InterfaceIsType"/>
3945

4046
<!-- spring-jcl -->
41-
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]commons[\\/]logging[\\/]" checks="Header|SpringNoThis|IllegalImport" />
47+
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]commons[\\/]logging[\\/]" checks="Header|SpringNoThis|IllegalImport"/>
4248

4349
<!-- spring-jdbc -->
44-
<suppress files="ResultSetWrappingSqlRowSet" checks="JavadocStyle" />
50+
<suppress files="ResultSetWrappingSqlRowSet" checks="JavadocStyle"/>
4551

4652
<!-- spring-jms -->
47-
<suppress files="JmsHeaderMapper" checks="InterfaceIsType" />
48-
<suppress files="JmsHeaders" checks="InterfaceIsType" />
49-
<suppress files="AbstractJmsListenerContainerFactory" checks="JavadocStyle" />
50-
<suppress files="DefaultJmsListenerContainerFactory" checks="JavadocStyle" />
51-
<suppress files="DefaultJcaListenerContainerFactory" checks="JavadocStyle" />
53+
<suppress files="JmsHeaderMapper" checks="InterfaceIsType"/>
54+
<suppress files="JmsHeaders" checks="InterfaceIsType"/>
55+
<suppress files="AbstractJmsListenerContainerFactory" checks="JavadocStyle"/>
56+
<suppress files="DefaultJmsListenerContainerFactory" checks="JavadocStyle"/>
57+
<suppress files="DefaultJcaListenerContainerFactory" checks="JavadocStyle"/>
5258

5359
<!-- spring-messaging -->
54-
<suppress files="SimpMessageHeaderAccessor" checks="JavadocVariable" />
55-
<suppress files="SimpMessageType" checks="JavadocVariable" />
56-
<suppress files="StompCommand" checks="JavadocVariable" />
57-
<suppress files="StompHeaderAccessor" checks="JavadocVariable" />
58-
<suppress files="StompHeaders" checks="JavadocVariable" />
59-
<suppress files="org[\\/]springframework[\\/]messaging[\\/]handler[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType" />
60-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]messaging[\\/]protobuf[\\/].*" checks=".*" />
60+
<suppress files="SimpMessageHeaderAccessor" checks="JavadocVariable"/>
61+
<suppress files="SimpMessageType" checks="JavadocVariable"/>
62+
<suppress files="StompCommand" checks="JavadocVariable"/>
63+
<suppress files="StompHeaderAccessor" checks="JavadocVariable"/>
64+
<suppress files="StompHeaders" checks="JavadocVariable"/>
65+
<suppress files="org[\\/]springframework[\\/]messaging[\\/]handler[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType"/>
66+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]messaging[\\/]protobuf[\\/].*" checks=".*"/>
6167

6268
<!-- spring-orm -->
6369
<suppress files="jpa[\\/]vendor[\\/]Database" checks="JavadocVariable|JavadocStyle"/>
6470

6571
<!-- spring-tx -->
66-
<suppress files="TransactionSystemException" checks="MutableException" />
67-
<suppress files="TransactionTemplate" checks="EqualsHashCode" />
72+
<suppress files="TransactionSystemException" checks="MutableException"/>
73+
<suppress files="TransactionTemplate" checks="EqualsHashCode"/>
6874

6975
<!-- spring-test - main and test -->
70-
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit4[\\/].+" checks="IllegalImport" id="bannedJUnit4Imports" />
71-
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports" />
72-
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]testng[\\/].+" checks="IllegalImport" id="bannedTestNGImports" />
76+
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit4[\\/].+" checks="IllegalImport" id="bannedJUnit4Imports"/>
77+
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
78+
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]testng[\\/].+" checks="IllegalImport" id="bannedTestNGImports"/>
7379
<!-- spring-test - main -->
74-
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Helper" checks="IllegalImport" id="bannedHamcrestImports" />
75-
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]client[\\/]match[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports" />
76-
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]reactive[\\/]server[\\/].+" checks="IllegalImport" id="bannedHamcrestImports" />
77-
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]servlet[\\/]result[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports" />
80+
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Helper" checks="IllegalImport" id="bannedHamcrestImports"/>
81+
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]client[\\/]match[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports"/>
82+
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]reactive[\\/]server[\\/].+" checks="IllegalImport" id="bannedHamcrestImports"/>
83+
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]servlet[\\/]result[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports"/>
7884
<!-- spring-test - test -->
79-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/].+TestNGTests" checks="IllegalImport" id="bannedTestNGImports" />
80-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/]web[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports" />
81-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports" />
82-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/](client|reactive|servlet)[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports" />
83-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit4" checks="SpringJUnit5" />
84-
<suppress files="ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" checks="SpringJUnit5" />
85-
<suppress files=".+TestSuite|ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" checks="IllegalImport" id="bannedJUnit4Imports" />
86-
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/].+[\\/](ExpectedExceptionSpringRunnerTests|StandardJUnit4FeaturesTests|ProgrammaticTxMgmtTestNGTests)" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation" />
85+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/].+TestNGTests" checks="IllegalImport" id="bannedTestNGImports"/>
86+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/]web[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports"/>
87+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports"/>
88+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/](client|reactive|servlet)[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports"/>
89+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit4" checks="SpringJUnit5"/>
90+
<suppress files="ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" checks="SpringJUnit5"/>
91+
<suppress files=".+TestSuite|ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" checks="IllegalImport" id="bannedJUnit4Imports"/>
92+
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/].+[\\/](ExpectedExceptionSpringRunnerTests|StandardJUnit4FeaturesTests|ProgrammaticTxMgmtTestNGTests)" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation"/>
8793

8894
<!-- spring-web -->
89-
<suppress files="SpringHandlerInstantiator" checks="JavadocStyle" />
90-
<suppress files="org[\\/]springframework[\\/]http[\\/]HttpMethod" checks="JavadocVariable|JavadocStyle" />
91-
<suppress files="org[\\/]springframework[\\/]http[\\/]HttpStatus" checks="JavadocVariable|JavadocStyle" />
92-
<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]CrossOrigin" checks="JavadocStyle" />
93-
<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]RequestMethod" checks="JavadocVariable" />
94-
<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType" />
95-
<suppress files="PatternParseException" checks="JavadocVariable" />
96-
<suppress files="web[\\/]reactive[\\/]socket[\\/]CloseStatus" checks="JavadocStyle" />
95+
<suppress files="SpringHandlerInstantiator" checks="JavadocStyle"/>
96+
<suppress files="org[\\/]springframework[\\/]http[\\/]HttpMethod" checks="JavadocVariable|JavadocStyle"/>
97+
<suppress files="org[\\/]springframework[\\/]http[\\/]HttpStatus" checks="JavadocVariable|JavadocStyle"/>
98+
<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]CrossOrigin" checks="JavadocStyle"/>
99+
<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]RequestMethod" checks="JavadocVariable"/>
100+
<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType"/>
101+
<suppress files="PatternParseException" checks="JavadocVariable"/>
102+
<suppress files="web[\\/]reactive[\\/]socket[\\/]CloseStatus" checks="JavadocStyle"/>
97103

98104
<!-- spring-webflux -->
99-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports" />
105+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
100106

101107
<!-- spring-webmvc -->
102-
<suppress files="org[\\/]springframework[\\/]web[\\/]servlet[\\/]tags[\\/]form[\\/].*Tag" checks="JavadocVariable" />
103-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]protobuf[\\/].*" checks=".*" />
104-
<suppress files="ExtractingResponseErrorHandlerTests" checks="MutableException" />
105-
<suppress files="ServletAnnotationControllerHandlerMethodTests" checks="InterfaceIsType" />
106-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]servlet[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports" />
107-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]servlet[\\/]handler[\\/]PathPatterns.+" checks="IllegalImport" id="bannedJUnitJupiterImports" />
108+
<suppress files="org[\\/]springframework[\\/]web[\\/]servlet[\\/]tags[\\/]form[\\/].*Tag" checks="JavadocVariable"/>
109+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]protobuf[\\/].*" checks=".*"/>
110+
<suppress files="ExtractingResponseErrorHandlerTests" checks="MutableException"/>
111+
<suppress files="ServletAnnotationControllerHandlerMethodTests" checks="InterfaceIsType"/>
112+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]servlet[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
113+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]servlet[\\/]handler[\\/]PathPatterns.+" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
108114

109115
<!-- spring-websocket -->
110-
<suppress files="web[\\/]socket[\\/]CloseStatus" checks="JavadocStyle" />
111-
<suppress files="web[\\/]socket[\\/]WebSocketHttpHeaders" checks="JavadocVariable" />
112-
<suppress files="sockjs[\\/]frame[\\/]SockJsFrameType" checks="JavadocVariable" />
113-
<suppress files="sockjs[\\/]transport[\\/]TransportType" checks="JavadocVariable" />
114-
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]protobuf[\\/].*" checks=".*" />
116+
<suppress files="web[\\/]socket[\\/]CloseStatus" checks="JavadocStyle"/>
117+
<suppress files="web[\\/]socket[\\/]WebSocketHttpHeaders" checks="JavadocVariable"/>
118+
<suppress files="sockjs[\\/]frame[\\/]SockJsFrameType" checks="JavadocVariable"/>
119+
<suppress files="sockjs[\\/]transport[\\/]TransportType" checks="JavadocVariable"/>
120+
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]protobuf[\\/].*" checks=".*"/>
115121

116122
</suppressions>

0 commit comments

Comments
 (0)