File tree Expand file tree Collapse file tree 2 files changed +23
-1
lines changed Expand file tree Collapse file tree 2 files changed +23
-1
lines changed Original file line number Diff line number Diff line change 130
130
<suppress files =" sockjs[\\/]transport[\\/]TransportType" checks =" JavadocVariable" />
131
131
<suppress files =" src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]protobuf[\\/].*" checks =" .*" />
132
132
133
- <!-- Suppress JavadocPackage checks on packages outside of src/main-->
133
+ <!-- Suppress JavadocPackage checks and package null safety annotations on packages outside of src/main-->
134
134
<!-- And outside 'framework-docs' module-->
135
135
<!-- And outside 'spring-core/src/main/java/org/springframework/asm' package-->
136
136
<!-- And outside 'spring-core/src/main/java/org/springframework/cglib' package-->
137
137
<!-- And outside 'spring-core/src/main/java/org/springframework/objenesis' package-->
138
138
<!-- And outside 'spring-core/src/main/java/org/springframework/javapoet' package-->
139
139
<!-- And outside 'spring-core/src/main/java/org/springframework/lang' package-->
140
140
<suppress checks =" JavadocPackage" files =" (^(?!.*src[\\/]main[\\/]).*)|(.*framework-docs.*)|(.*spring-core\/src\/main\/java\/org\/springframework\/asm.*)|(.*spring-core\/src\/main\/java\/org\/springframework\/cglib.*)|(.*spring-core\/src\/main\/java\/org\/springframework\/objenesis.*)|(.*spring-core\/src\/main\/java\/org\/springframework\/javapoet.*)|(.*spring-core\/src\/main\/java\/org\/springframework\/lang.*)" />
141
+ <suppress checks =" RegexpSinglelineJava" files =" ^(?!.*(package-info.java))" id =" javaDocPackageNonNullFieldsAnnotation" />
142
+ <suppress checks =" RegexpSinglelineJava" files =" ^(?!.*(package-info.java))" id =" javaDocPackageNonNullApiAnnotation" />
141
143
142
144
</suppressions >
Original file line number Diff line number Diff line change 239
239
<module name =" io.spring.javaformat.checkstyle.check.SpringCatchCheck" />
240
240
<module name =" io.spring.javaformat.checkstyle.check.SpringJavadocCheck" />
241
241
<module name =" io.spring.javaformat.checkstyle.check.SpringJUnit5Check" />
242
+ <!-- package-info should contain null-safety annotations-->
243
+ <!-- These two modules will fail to detect multiline annotations-->
244
+ <module name =" RegexpSinglelineJavaCheck" >
245
+ <property name =" id" value =" javaDocPackageNonNullFieldsAnnotation" />
246
+ <property name =" format" value =" (@NonNullFields|@org\.springframework\.lang\.NonNullFields)" />
247
+ <property name =" minimum" value =" 1" />
248
+ <property name =" maximum" value =" 1" />
249
+ <property name =" severity" value =" warning" />
250
+ <property name =" message" value =" package-info.java is missing required null-safety annotation @NonNullFields." />
251
+ <property name =" ignoreComments" value =" true" />
252
+ </module >
253
+ <module name =" RegexpSinglelineJavaCheck" >
254
+ <property name =" id" value =" javaDocPackageNonNullApiAnnotation" />
255
+ <property name =" format" value =" (@NonNullApi|@org\.springframework\.lang\.NonNullApi)" />
256
+ <property name =" minimum" value =" 1" />
257
+ <property name =" maximum" value =" 1" />
258
+ <property name =" severity" value =" warning" />
259
+ <property name =" message" value =" package-info.java is missing required null-safety annotation @NonNullApi." />
260
+ <property name =" ignoreComments" value =" true" />
261
+ </module >
242
262
</module >
243
263
244
264
<!-- package-info checker -->
You can’t perform that action at this time.
0 commit comments