Browse Source
This commit picks up where the two previous commits left off. Specifically, this commit: - Removes the "severity=warning" configuration to ensure that violations actually fail the build. - Fixes regular expressions for suppressions by matching forward slashes using `[\\/]` instead of `\/`. - Moves the configuration for newly introduced checks to locations in checkstyle.xml that align with the existing organization of that file. - Renames the IDs for RegexpSinglelineJava checks from javaDocPackageNonNullApiAnnotation/javaDocPackageNonNullFieldsAnnotation to packageLevelNonNullApiAnnotation/packageLevelNonNullFieldsAnnotation, respectively, since these checks are not related to Javadoc. - Simplifies the null-safety annotation checks to match against imported annotation types, which enforces consistency across package-info.java files for the annotation declarations. - Simplifies the RegEx for JavadocPackage suppressions to only exclude packages not under src/main/java (vs src/main) and those in the framework-docs module. - Consistently suppresses all checks for the `asm`, `cglib`, `objenesis`, and `javapoet` packages in spring-core. - Adds explicit suppressions for null-safety annotations for the `lang` package in spring-core. - Adds explicit suppressions for null-safety annotations for the `org.aopalliance` package in spring-aop. - Revises the RegEx for null-safety annotation suppressions to only exclude package-info.java files not under src/main/java and additionally to exclude package-info.java files in the framework-docs module as well as those in the spring-context-indexer, spring-instrument, and spring-jcl modules. - Adds all missing package-info.java files. - Adds null-safety annotations to package-info.java files where appropriate. Closes gh-30069pull/30107/head
Sam Brannen
2 years ago
22 changed files with 165 additions and 50 deletions
@ -0,0 +1,10 @@
@@ -0,0 +1,10 @@
|
||||
/** |
||||
* Support for dynamic, refreshable {@link org.springframework.aop.TargetSource} |
||||
* implementations for use with Spring AOP. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.aop.target.dynamic; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -0,0 +1,10 @@
@@ -0,0 +1,10 @@
|
||||
/** |
||||
* Various {@link org.springframework.aop.TargetSource} implementations for use |
||||
* with Spring AOP. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.aop.target; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -0,0 +1,9 @@
@@ -0,0 +1,9 @@
|
||||
/** |
||||
* AspectJ-based dependency injection support. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.beans.factory.aspectj; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -0,0 +1,9 @@
@@ -0,0 +1,9 @@
|
||||
/** |
||||
* AspectJ-based caching support. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.cache.aspectj; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -0,0 +1,11 @@
@@ -0,0 +1,11 @@
|
||||
/** |
||||
* AspectJ-based dependency injection support driven by the |
||||
* {@link org.springframework.beans.factory.annotation.Configurable @Configurable} |
||||
* annotation. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.context.annotation.aspectj; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -0,0 +1,9 @@
@@ -0,0 +1,9 @@
|
||||
/** |
||||
* AspectJ-based scheduling support. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.scheduling.aspectj; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -0,0 +1,9 @@
@@ -0,0 +1,9 @@
|
||||
/** |
||||
* AspectJ-based transaction management support. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.transaction.aspectj; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -1,4 +1,9 @@
@@ -1,4 +1,9 @@
|
||||
/** |
||||
* Support package for Groovy-based bean definitions. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.beans.factory.groovy; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
@ -0,0 +1,4 @@
@@ -0,0 +1,4 @@
|
||||
/** |
||||
* Core package for Spring Framework's scanned component index. |
||||
*/ |
||||
package org.springframework.context.index.processor; |
@ -0,0 +1,4 @@
@@ -0,0 +1,4 @@
|
||||
/** |
||||
* Core package for byte code instrumentation. |
||||
*/ |
||||
package org.springframework.instrument; |
@ -1,6 +1,9 @@
@@ -1,6 +1,9 @@
|
||||
/** |
||||
* Provides extensible support for initializing databases through scripts. |
||||
*/ |
||||
@org.springframework.lang.NonNullApi |
||||
@org.springframework.lang.NonNullFields |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.r2dbc.connection.init; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
@ -1,6 +1,9 @@
@@ -1,6 +1,9 @@
|
||||
/** |
||||
* Core domain types around DatabaseClient. |
||||
*/ |
||||
@org.springframework.lang.NonNullApi |
||||
@org.springframework.lang.NonNullFields |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.r2dbc.core; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
@ -1,4 +1,9 @@
@@ -1,4 +1,9 @@
|
||||
/** |
||||
* Test execution event annotations for the <em>Spring TestContext Framework</em>. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.test.context.event.annotation; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
@ -1,4 +1,9 @@
@@ -1,4 +1,9 @@
|
||||
/** |
||||
* Test event support classes for the <em>Spring TestContext Framework</em>. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.test.context.event; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
@ -1,6 +0,0 @@
@@ -1,6 +0,0 @@
|
||||
/** |
||||
* Generic unit testing support classes. |
||||
* |
||||
* @see org.springframework.test.util |
||||
*/ |
||||
package org.springframework.test; |
@ -1,4 +1,9 @@
@@ -1,4 +1,9 @@
|
||||
/** |
||||
* Helper classes for unit tests based on Spring's web support. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.test.web; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
@ -0,0 +1,9 @@
@@ -0,0 +1,9 @@
|
||||
/** |
||||
* CBOR encoder and decoder support. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.http.codec.cbor; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
@ -1,4 +1,9 @@
@@ -1,4 +1,9 @@
|
||||
/** |
||||
* Support for asynchronous request processing. |
||||
*/ |
||||
@NonNullApi |
||||
@NonNullFields |
||||
package org.springframework.web.context.request.async; |
||||
|
||||
import org.springframework.lang.NonNullApi; |
||||
import org.springframework.lang.NonNullFields; |
||||
|
Loading…
Reference in new issue