diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java index 3a745025f0d3..f9f0f3d11f8e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java @@ -4,6 +4,8 @@ *
Normally to be used through an AspectJAutoProxyCreator rather than directly. */ @NonNullApi +@NonNullFields package org.springframework.aop.aspectj.annotation; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java index b9bb0d36f982..5f5b7dedd4c3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java @@ -3,6 +3,8 @@ * Support for AspectJ annotation aspects resides in the "aspectj.annotation" package. */ @NonNullApi +@NonNullFields package org.springframework.aop.aspectj.autoproxy; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java index 3dcadb4e882c..cf0e9a19e345 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java @@ -9,6 +9,8 @@ * functionality, with consistent semantics, with the proxy-based Spring AOP framework. */ @NonNullApi +@NonNullFields package org.springframework.aop.aspectj; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-aop/src/main/java/org/springframework/aop/config/package-info.java b/spring-aop/src/main/java/org/springframework/aop/config/package-info.java index b5733f7f212c..e5edac7411a9 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/package-info.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/package-info.java @@ -3,6 +3,8 @@ * with XML schema being the primary configuration format. */ @NonNullApi +@NonNullFields package org.springframework.aop.config; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java index a00663c252ed..9f7ca35fbad7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java @@ -10,6 +10,8 @@ *
These adapters do not depend on any other Spring framework classes to allow such usage.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.framework.adapter;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
index 986c60f19daf..fde3c07636a2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
@@ -10,6 +10,8 @@
* Post-processors can be explicitly registered on a ConfigurableBeanFactory instead.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.framework.autoproxy;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
index 722fe85c55ad..1e92cc203374 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
@@ -13,6 +13,8 @@
* ProxyFactory class.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.framework;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java
index 7ec37824e58d..bc4bd2843710 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java
@@ -4,6 +4,8 @@
* functionality packages, like "transaction" and "orm".
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.interceptor;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/package-info.java b/spring-aop/src/main/java/org/springframework/aop/package-info.java
index 7cdcbf66fcbe..c2e18abd3b30 100644
--- a/spring-aop/src/main/java/org/springframework/aop/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/package-info.java
@@ -18,6 +18,8 @@
* integrated with the Spring IoC container.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/package-info.java b/spring-aop/src/main/java/org/springframework/aop/scope/package-info.java
index d48a870cf10f..10bb1730aa13 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/package-info.java
@@ -2,6 +2,8 @@
* Support for AOP-based scoping of target objects, with configurable backend.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.scope;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java
index 0d65448e9ce4..9abf44f9cf7b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java
@@ -2,6 +2,8 @@
* Annotation support for AOP pointcuts.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.support.annotation;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/package-info.java b/spring-aop/src/main/java/org/springframework/aop/support/package-info.java
index 6e4227630711..74ec5f9b9dfe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/package-info.java
@@ -2,6 +2,8 @@
* Convenience classes for using Spring's AOP API.
*/
@NonNullApi
+@NonNullFields
package org.springframework.aop.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java b/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
index 113e56cfb676..d2667da96fd4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
@@ -2,6 +2,8 @@
* Support package for beans-style handling of Java 5 annotations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java
index aada302b8156..5a277e0126d9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java
@@ -2,6 +2,8 @@
* Support package for annotation-driven bean configuration.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java
index 1bfd372f34c4..280e916ab186 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java
@@ -2,6 +2,8 @@
* SPI interfaces and configuration-related convenience classes for bean factories.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.config;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
index 10b3a3a3cf34..4497650b4553 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
@@ -10,6 +10,8 @@
* by Rod Johnson (Wrox, 2002).
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java
index ab87c9bc5d50..0f57ef135159 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java
@@ -2,6 +2,8 @@
* Support infrastructure for bean definition parsing.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.parsing;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java
index 71ae52391295..4e66e56347e4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java
@@ -2,6 +2,8 @@
* Support package for the Java 6 ServiceLoader facility.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.serviceloader;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
index df8d1de0ee39..0a5599d3f0eb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
@@ -3,6 +3,8 @@
* Contains abstract base classes for {@code BeanFactory} implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java
index eac2388aeca1..c069d7d1af60 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/package-info.java
@@ -3,6 +3,8 @@
* Foundation for aspect-driven bean configuration.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.wiring;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
index 949b5e791b54..3dcc0d43ad0b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
@@ -3,6 +3,8 @@
* including a standard "spring-beans" XSD.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.factory.xml;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/package-info.java b/spring-beans/src/main/java/org/springframework/beans/package-info.java
index e264366a08ce..6b8a3a7cba13 100644
--- a/spring-beans/src/main/java/org/springframework/beans/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/package-info.java
@@ -10,6 +10,8 @@
* by Rod Johnson (Wrox, 2002).
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
index 45e18cc85182..ddb64ffdc167 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
@@ -7,6 +7,8 @@
* specific binding processes, as they are localized or the like.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.propertyeditors;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/package-info.java b/spring-beans/src/main/java/org/springframework/beans/support/package-info.java
index 7147fd0293cf..326ce25e1448 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/package-info.java
@@ -3,6 +3,8 @@
* such as utility classes for sorting and holding lists of beans.
*/
@NonNullApi
+@NonNullFields
package org.springframework.beans.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-context-support/src/main/java/org/springframework/cache/caffeine/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/caffeine/package-info.java
index e98cf7f00cd3..95e57c860e49 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/caffeine/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/caffeine/package-info.java
@@ -4,6 +4,8 @@
* allowing to set up Caffeine caches within Spring's cache abstraction.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.caffeine;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
index ba15c197014b..00c29fcf6cdf 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
@@ -10,6 +10,8 @@
* Spring's support in {@code org.springframework.cache.jcache}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.ehcache;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/package-info.java
index aedc6c65c1c0..d03e27ac1e85 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/package-info.java
@@ -5,6 +5,8 @@
* use in a Spring context, using a JSR-107 compliant cache provider.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.jcache;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/cache/transaction/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/transaction/package-info.java
index 89b7e74dd2ce..48cbbeb62b1c 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/transaction/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/transaction/package-info.java
@@ -3,6 +3,8 @@
* Provides synchronization of put operations with Spring-managed transactions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.transaction;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java
index ea2101475c7f..6e8845e3cf76 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java
@@ -4,6 +4,8 @@
* class for convenient population of a JavaMail MimeMessage.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mail.javamail;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/mail/package-info.java b/spring-context-support/src/main/java/org/springframework/mail/package-info.java
index cf4d9360f799..4e32ff71a970 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/package-info.java
@@ -3,6 +3,8 @@
* Concrete implementations are provided in the subpackages.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mail;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
index edaf056d5b3a..62647aaeb459 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
@@ -3,6 +3,8 @@
* facility, as supported by IBM WebSphere 6.0+ and BEA WebLogic 9.0+.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling.commonj;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
index 3681e86d3ba7..67dda7af026f 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
@@ -6,6 +6,8 @@
* convenience classes for implementing Quartz Jobs.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling.quartz;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
index d7cb60f3ad7f..d8e8aea516c5 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
@@ -4,6 +4,8 @@
* within a Spring application context.
*/
@NonNullApi
+@NonNullFields
package org.springframework.ui.freemarker;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/package-info.java b/spring-context/src/main/java/org/springframework/cache/annotation/package-info.java
index fe4e17c50a01..7ab6f1cca20e 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/package-info.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/package-info.java
@@ -4,6 +4,8 @@
* {@link org.springframework.cache.interceptor.CacheOperationSource}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.annotation;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/package-info.java b/spring-context/src/main/java/org/springframework/cache/concurrent/package-info.java
index d2e7d514bb7a..5b47ebda46f8 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/package-info.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/package-info.java
@@ -5,6 +5,8 @@
* use in a Spring context, using a JDK based thread pool at runtime.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.concurrent;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/cache/config/package-info.java b/spring-context/src/main/java/org/springframework/cache/config/package-info.java
index 9d1e1f37f42c..94289f1ba20e 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/package-info.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/package-info.java
@@ -5,6 +5,8 @@
* for details on code-based configuration without XML.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.config;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/package-info.java b/spring-context/src/main/java/org/springframework/cache/interceptor/package-info.java
index cce2ac4f347c..5d1e05dce352 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/package-info.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/package-info.java
@@ -4,6 +4,8 @@
* Any POJO can be cache-advised with Spring.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.interceptor;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/cache/package-info.java b/spring-context/src/main/java/org/springframework/cache/package-info.java
index 3944cf0ce12b..ad63756d54fe 100644
--- a/spring-context/src/main/java/org/springframework/cache/package-info.java
+++ b/spring-context/src/main/java/org/springframework/cache/package-info.java
@@ -3,6 +3,8 @@
* Concrete implementations are provided in the subpackages.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/cache/support/package-info.java b/spring-context/src/main/java/org/springframework/cache/support/package-info.java
index 6be9db7ef0fc..5bb26c8c2882 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/package-info.java
@@ -3,6 +3,8 @@
* Provides abstract classes for cache managers and caches.
*/
@NonNullApi
+@NonNullFields
package org.springframework.cache.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/package-info.java b/spring-context/src/main/java/org/springframework/context/annotation/package-info.java
index e803a5451075..d40f541f125a 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/package-info.java
@@ -4,6 +4,8 @@
* Spring-managed objects.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-context/src/main/java/org/springframework/context/config/package-info.java b/spring-context/src/main/java/org/springframework/context/config/package-info.java
index cb5eea6b560f..844bcc8ed696 100644
--- a/spring-context/src/main/java/org/springframework/context/config/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/config/package-info.java
@@ -3,6 +3,8 @@
* with XML schema being the primary configuration format.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.config;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/event/package-info.java b/spring-context/src/main/java/org/springframework/context/event/package-info.java
index b364750977c6..0e99cff2751f 100644
--- a/spring-context/src/main/java/org/springframework/context/event/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/event/package-info.java
@@ -3,6 +3,8 @@
* To be supported by all major application context implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.event;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/expression/package-info.java b/spring-context/src/main/java/org/springframework/context/expression/package-info.java
index 37e662a87674..41ada0aa2625 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/package-info.java
@@ -2,6 +2,8 @@
* Expression parsing support within a Spring application context.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.expression;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/i18n/package-info.java b/spring-context/src/main/java/org/springframework/context/i18n/package-info.java
index 41c681a297d3..30f2af8a25b2 100644
--- a/spring-context/src/main/java/org/springframework/context/i18n/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/i18n/package-info.java
@@ -3,6 +3,8 @@
* plus global holder that exposes a thread-bound Locale.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.i18n;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/index/package-info.java b/spring-context/src/main/java/org/springframework/context/index/package-info.java
index 4793fd57ea0a..addff9ea5c16 100644
--- a/spring-context/src/main/java/org/springframework/context/index/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/index/package-info.java
@@ -2,6 +2,8 @@
* Support package for reading and managing the components index.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.index;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/package-info.java b/spring-context/src/main/java/org/springframework/context/package-info.java
index 3f08f4ef0b6f..62521a35af51 100644
--- a/spring-context/src/main/java/org/springframework/context/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/package-info.java
@@ -11,6 +11,8 @@
* any dependency on Spring-specific APIs.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/support/package-info.java b/spring-context/src/main/java/org/springframework/context/support/package-info.java
index c84723e8e061..7240046943f3 100644
--- a/spring-context/src/main/java/org/springframework/context/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/support/package-info.java
@@ -4,6 +4,8 @@
* implementations and a MessageSource implementation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/package-info.java b/spring-context/src/main/java/org/springframework/context/weaving/package-info.java
index 533a21bedbe0..8c5efdc810a4 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.instrument.classloading.LoadTimeWeaver} abstraction.
*/
@NonNullApi
+@NonNullFields
package org.springframework.context.weaving;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
index bc4fcfdf628b..96186f681243 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
@@ -20,6 +20,8 @@
* Expert One-on-One J2EE.
*/
@NonNullApi
+@NonNullFields
package org.springframework.ejb.access;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/package-info.java b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
index 7cdd1053479e..42e917c0000a 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
@@ -3,6 +3,8 @@
* with XML schema being the primary configuration format.
*/
@NonNullApi
+@NonNullFields
package org.springframework.ejb.config;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/package-info.java b/spring-context/src/main/java/org/springframework/format/annotation/package-info.java
index 88d246417c57..1a5d9d6108cf 100644
--- a/spring-context/src/main/java/org/springframework/format/annotation/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/annotation/package-info.java
@@ -2,6 +2,8 @@
* Annotations for declaratively configuring field formatting rules.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.annotation;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
index ec5ed4421923..81b7ab758b90 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
@@ -2,6 +2,8 @@
* Integration with Joda-Time for formatting Joda date and time types as well as standard JDK Date types.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.datetime.joda;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
index e52e15806f4a..0be72ef4a436 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
@@ -2,6 +2,8 @@
* Formatters for {@code java.util.Date} properties.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.datetime;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/package-info.java
index 90341d52ecef..bec9a30b2b1d 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/package-info.java
@@ -2,6 +2,8 @@
* Integration with the JSR-310 java.time
package in JDK 8.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.datetime.standard;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/number/money/package-info.java b/spring-context/src/main/java/org/springframework/format/number/money/package-info.java
index 1e9169ff468f..71ecbce0beaa 100644
--- a/spring-context/src/main/java/org/springframework/format/number/money/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/number/money/package-info.java
@@ -2,6 +2,8 @@
* Integration with the JSR-354 javax.money
package.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.number.money;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/number/package-info.java b/spring-context/src/main/java/org/springframework/format/number/package-info.java
index 538351d7a274..c7a0bdd735c1 100644
--- a/spring-context/src/main/java/org/springframework/format/number/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/number/package-info.java
@@ -2,6 +2,8 @@
* Formatters for {@code java.lang.Number} properties.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.number;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/package-info.java b/spring-context/src/main/java/org/springframework/format/package-info.java
index 4c03ccf2f74e..ea71c91cafaa 100644
--- a/spring-context/src/main/java/org/springframework/format/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/package-info.java
@@ -2,6 +2,8 @@
* An API for defining Formatters to format field model values for display in a UI.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/format/support/package-info.java b/spring-context/src/main/java/org/springframework/format/support/package-info.java
index 8b44df0e34d6..c1269bfa3d09 100644
--- a/spring-context/src/main/java/org/springframework/format/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/support/package-info.java
@@ -3,6 +3,8 @@
* providing common implementations as well as adapters.
*/
@NonNullApi
+@NonNullFields
package org.springframework.format.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java
index 04734b910e70..45e2f4c52d32 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/package-info.java
@@ -2,6 +2,8 @@
* Support for class instrumentation on GlassFish.
*/
@NonNullApi
+@NonNullFields
package org.springframework.instrument.classloading.glassfish;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
index 50447e45937a..7c4b5a98184d 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
@@ -2,6 +2,8 @@
* Support for class instrumentation on JBoss AS 6 and 7.
*/
@NonNullApi
+@NonNullFields
package org.springframework.instrument.classloading.jboss;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/package-info.java
index 8714f2dba606..64b2c82b18f4 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/package-info.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/package-info.java
@@ -3,6 +3,8 @@
* as required by JPA providers (but not JPA-specific).
*/
@NonNullApi
+@NonNullFields
package org.springframework.instrument.classloading;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
index e5441f1aff57..adc34568fd09 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
@@ -2,6 +2,8 @@
* Support for class instrumentation on Tomcat.
*/
@NonNullApi
+@NonNullFields
package org.springframework.instrument.classloading.tomcat;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
index 3293ec2ba7fa..e14dbf3b1a45 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
@@ -2,6 +2,8 @@
* Support for class instrumentation on BEA WebLogic 10+.
*/
@NonNullApi
+@NonNullFields
package org.springframework.instrument.classloading.weblogic;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
index ed9abd003989..e6b7c325810e 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
@@ -2,6 +2,8 @@
* Support for class instrumentation on IBM WebSphere Application Server 7+.
*/
@NonNullApi
+@NonNullFields
package org.springframework.instrument.classloading.websphere;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/package-info.java b/spring-context/src/main/java/org/springframework/jmx/access/package-info.java
index a97129abba6f..13223d7faf38 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/package-info.java
@@ -2,6 +2,8 @@
* Provides support for accessing remote MBean resources.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.access;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/package-info.java
index 6a9da5ccc947..ebd546ab9f04 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/package-info.java
@@ -4,6 +4,8 @@
* via a special JmxAttributeSource implementation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.export.annotation;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/package-info.java
index a708f600e496..4c1c5c58354f 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/package-info.java
@@ -3,6 +3,8 @@
* determine the attributes and operations to expose for Spring-managed beans.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.export.assembler;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/package-info.java
index 0eeca2933335..0107698ea33b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/package-info.java
@@ -3,6 +3,8 @@
* JMX metadata in a provider-agnostic manner.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.export.metadata;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/package-info.java
index f64aec45ccec..db23a629e3e7 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/package-info.java
@@ -3,6 +3,8 @@
* to determine the JMX names to use for exported Spring-managed beans.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.export.naming;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/package-info.java
index 3cedf29c0480..d0db47f1ead4 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/package-info.java
@@ -3,6 +3,8 @@
* to send JMX notifications.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.export.notification;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/package-info.java b/spring-context/src/main/java/org/springframework/jmx/export/package-info.java
index a3a63477193d..1d0e9477111a 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/package-info.java
@@ -3,6 +3,8 @@
* Spring-managed beans as JMX MBeans.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.export;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/package-info.java b/spring-context/src/main/java/org/springframework/jmx/package-info.java
index f300a243cc51..62b9ef8ed024 100644
--- a/spring-context/src/main/java/org/springframework/jmx/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/package-info.java
@@ -3,6 +3,8 @@
* Spring-managed beans as JMX MBeans as well as access to remote JMX MBeans.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/package-info.java b/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
index 1e9aeb5337b4..3c89e5b5bf40 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
@@ -3,6 +3,8 @@
* and for exposing an {@code MBeanServer} to remote clients.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jmx.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jndi/package-info.java b/spring-context/src/main/java/org/springframework/jndi/package-info.java
index 259a4f9a48c9..927fb3bbfce7 100644
--- a/spring-context/src/main/java/org/springframework/jndi/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jndi/package-info.java
@@ -8,6 +8,8 @@
* by Rod Johnson (Wrox, 2002).
*/
@NonNullApi
+@NonNullFields
package org.springframework.jndi;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/jndi/support/package-info.java b/spring-context/src/main/java/org/springframework/jndi/support/package-info.java
index 2654ad32bfda..4db7341e035c 100644
--- a/spring-context/src/main/java/org/springframework/jndi/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jndi/support/package-info.java
@@ -3,6 +3,8 @@
* including a JNDI-based BeanFactory implementation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jndi.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/remoting/package-info.java b/spring-context/src/main/java/org/springframework/remoting/package-info.java
index 85517537a404..d83bdb302037 100644
--- a/spring-context/src/main/java/org/springframework/remoting/package-info.java
+++ b/spring-context/src/main/java/org/springframework/remoting/package-info.java
@@ -3,6 +3,8 @@
* independent of any specific remote method invocation system.
*/
@NonNullApi
+@NonNullFields
package org.springframework.remoting;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/package-info.java
index 1f38139ead2d..87f44bfb1729 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/package-info.java
@@ -2,6 +2,8 @@
* Java 5 annotation for asynchronous method execution.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling.annotation;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
index bf23055e21f9..9c3842e318fc 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
@@ -6,6 +6,8 @@
* interfaces as well as the Spring {@code TaskExecutor} mechanism.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling.concurrent;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/config/package-info.java
index 8fdf7b700ba7..c2483f08461f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/package-info.java
@@ -3,6 +3,8 @@
* with XML schema being the primary configuration format.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling.config;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scheduling/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/package-info.java
index 6ae921bb0ed1..8d99975ca8a5 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/package-info.java
@@ -3,6 +3,8 @@
* independent of any specific scheduling system.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/support/package-info.java
index d1bc1cefffac..f0d9cbdcf501 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/package-info.java
@@ -3,6 +3,8 @@
* Provides a Runnable adapter for Spring's MethodInvoker.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scheduling.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/package-info.java b/spring-context/src/main/java/org/springframework/scripting/bsh/package-info.java
index 9ac76f5b1113..5c3ac8cb517d 100644
--- a/spring-context/src/main/java/org/springframework/scripting/bsh/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/bsh/package-info.java
@@ -5,6 +5,8 @@
* into Spring's scripting infrastructure.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scripting.bsh;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/package-info.java b/spring-context/src/main/java/org/springframework/scripting/config/package-info.java
index 6688a44389ed..781deff3f06a 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/package-info.java
@@ -3,6 +3,8 @@
* with XML schema being the primary configuration format.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scripting.config;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
index a8d72bb5ed6d..8b82ddc181dc 100644
--- a/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java
@@ -4,6 +4,8 @@
* into Spring's scripting infrastructure.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scripting.groovy;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scripting/package-info.java b/spring-context/src/main/java/org/springframework/scripting/package-info.java
index cbbf0f1ee6fd..b07bce006b46 100644
--- a/spring-context/src/main/java/org/springframework/scripting/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/package-info.java
@@ -2,6 +2,8 @@
* Core interfaces for Spring's scripting support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scripting;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/package-info.java b/spring-context/src/main/java/org/springframework/scripting/support/package-info.java
index 6fee64c9631a..7ffa7c28171f 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/package-info.java
@@ -4,6 +4,8 @@
* definitions into scripted objects.
*/
@NonNullApi
+@NonNullFields
package org.springframework.scripting.support;
-import org.springframework.lang.NonNullApi;
\ No newline at end of file
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
\ No newline at end of file
diff --git a/spring-context/src/main/java/org/springframework/stereotype/package-info.java b/spring-context/src/main/java/org/springframework/stereotype/package-info.java
index 8754a2681452..2585584cd8e2 100644
--- a/spring-context/src/main/java/org/springframework/stereotype/package-info.java
+++ b/spring-context/src/main/java/org/springframework/stereotype/package-info.java
@@ -5,6 +5,8 @@
*
Intended for use by tools and aspects (making an ideal target for pointcuts). */ @NonNullApi +@NonNullFields package org.springframework.stereotype; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/ui/context/package-info.java b/spring-context/src/main/java/org/springframework/ui/context/package-info.java index 355eabb4beb2..c86ce10bf802 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/package-info.java +++ b/spring-context/src/main/java/org/springframework/ui/context/package-info.java @@ -3,6 +3,8 @@ * for UI applications. The theme feature is added here. */ @NonNullApi +@NonNullFields package org.springframework.ui.context; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/package-info.java b/spring-context/src/main/java/org/springframework/ui/context/support/package-info.java index 59d7fb291d65..9fa8abdd5f9b 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/package-info.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/package-info.java @@ -3,6 +3,8 @@ * Provides support classes for specialized UI contexts, e.g. for web UIs. */ @NonNullApi +@NonNullFields package org.springframework.ui.context.support; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/ui/package-info.java b/spring-context/src/main/java/org/springframework/ui/package-info.java index a513de693843..dc9d2de9d750 100644 --- a/spring-context/src/main/java/org/springframework/ui/package-info.java +++ b/spring-context/src/main/java/org/springframework/ui/package-info.java @@ -3,6 +3,8 @@ * Provides a generic ModelMap for model holding. */ @NonNullApi +@NonNullFields package org.springframework.ui; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java b/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java index 8e50d9326e31..b1e3718a9faa 100644 --- a/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java +++ b/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java @@ -6,6 +6,8 @@ * supporting the specification of validation groups. */ @NonNullApi +@NonNullFields package org.springframework.validation.annotation; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/package-info.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/package-info.java index 2f76fd1ba680..5540b98c5871 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/package-info.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/package-info.java @@ -9,6 +9,8 @@ * to other Spring components. */ @NonNullApi +@NonNullFields package org.springframework.validation.beanvalidation; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/validation/package-info.java b/spring-context/src/main/java/org/springframework/validation/package-info.java index 04d9aea2fe8d..900d83a1433a 100644 --- a/spring-context/src/main/java/org/springframework/validation/package-info.java +++ b/spring-context/src/main/java/org/springframework/validation/package-info.java @@ -3,6 +3,8 @@ * for usage in business and/or UI layers. */ @NonNullApi +@NonNullFields package org.springframework.validation; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-context/src/main/java/org/springframework/validation/support/package-info.java b/spring-context/src/main/java/org/springframework/validation/support/package-info.java index 595a80b9aa50..809b4368acb6 100644 --- a/spring-context/src/main/java/org/springframework/validation/support/package-info.java +++ b/spring-context/src/main/java/org/springframework/validation/support/package-info.java @@ -2,6 +2,8 @@ * Support classes for handling validation results. */ @NonNullApi +@NonNullFields package org.springframework.validation.support; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-core/src/main/java/org/springframework/core/annotation/package-info.java b/spring-core/src/main/java/org/springframework/core/annotation/package-info.java index 3715a52176b5..e67bc0fd5e6d 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/package-info.java @@ -3,6 +3,8 @@ * annotations with attribute overrides. */ @NonNullApi +@NonNullFields package org.springframework.core.annotation; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; \ No newline at end of file diff --git a/spring-core/src/main/java/org/springframework/core/codec/package-info.java b/spring-core/src/main/java/org/springframework/core/codec/package-info.java index 5a35824df1a8..acf70ed8f96c 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/codec/package-info.java @@ -4,6 +4,8 @@ * between a reactive stream of bytes and Java objects. */ @NonNullApi +@NonNullFields package org.springframework.core.codec; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java b/spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java index d1f79c261b40..c7a057daabdf 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java @@ -2,6 +2,8 @@ * SPI to implement Converters for the type conversion system. */ @NonNullApi +@NonNullFields package org.springframework.core.convert.converter; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/convert/package-info.java b/spring-core/src/main/java/org/springframework/core/convert/package-info.java index b63fe0e89f01..7cef7265ea03 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/convert/package-info.java @@ -2,6 +2,8 @@ * Type conversion system API. */ @NonNullApi +@NonNullFields package org.springframework.core.convert; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/package-info.java b/spring-core/src/main/java/org/springframework/core/convert/support/package-info.java index 954c82f0686b..c516a7e37fd3 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/package-info.java @@ -2,6 +2,8 @@ * Default implementation of the type conversion system. */ @NonNullApi +@NonNullFields package org.springframework.core.convert.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/env/package-info.java b/spring-core/src/main/java/org/springframework/core/env/package-info.java index 5939ffabbabb..a0784c4c8d76 100644 --- a/spring-core/src/main/java/org/springframework/core/env/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/env/package-info.java @@ -3,6 +3,8 @@ * profile and hierarchical property source support. */ @NonNullApi +@NonNullFields package org.springframework.core.env; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/package-info.java b/spring-core/src/main/java/org/springframework/core/io/buffer/package-info.java index c49eadf6f478..51f02e9a80a1 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/package-info.java @@ -2,6 +2,8 @@ * Generic abstraction for working with byte buffer implementations. */ @NonNullApi +@NonNullFields package org.springframework.core.io.buffer; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/io/package-info.java b/spring-core/src/main/java/org/springframework/core/io/package-info.java index 02a8633e5a67..632855acb150 100644 --- a/spring-core/src/main/java/org/springframework/core/io/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/io/package-info.java @@ -2,6 +2,8 @@ * Generic abstraction for (file-based) resources, used throughout the framework. */ @NonNullApi +@NonNullFields package org.springframework.core.io; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/io/support/package-info.java b/spring-core/src/main/java/org/springframework/core/io/support/package-info.java index de525d5ed67d..2b1395fbb2eb 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/package-info.java @@ -3,6 +3,8 @@ * Includes a ResourcePatternResolver mechanism. */ @NonNullApi +@NonNullFields package org.springframework.core.io.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/package-info.java b/spring-core/src/main/java/org/springframework/core/package-info.java index f1d5c2c70b50..703f29b4b238 100644 --- a/spring-core/src/main/java/org/springframework/core/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/package-info.java @@ -3,6 +3,8 @@ * and other core helpers that are not specific to any part of the framework. */ @NonNullApi +@NonNullFields package org.springframework.core; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/serializer/package-info.java b/spring-core/src/main/java/org/springframework/core/serializer/package-info.java index e577036602e8..88f4d3ba4a36 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/package-info.java @@ -4,6 +4,8 @@ * Includes exceptions for serialization and deserialization failures. */ @NonNullApi +@NonNullFields package org.springframework.core.serializer; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/package-info.java b/spring-core/src/main/java/org/springframework/core/serializer/support/package-info.java index bdc50c04c33e..4e46ea8a5921 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/support/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/support/package-info.java @@ -3,6 +3,8 @@ * Includes adapters to the Converter SPI. */ @NonNullApi +@NonNullFields package org.springframework.core.serializer.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/style/package-info.java b/spring-core/src/main/java/org/springframework/core/style/package-info.java index 9c7abc49ef57..c3fe9bfa482d 100644 --- a/spring-core/src/main/java/org/springframework/core/style/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/style/package-info.java @@ -2,6 +2,8 @@ * Support for styling values as Strings, with ToStringCreator as central class. */ @NonNullApi +@NonNullFields package org.springframework.core.style; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/task/package-info.java b/spring-core/src/main/java/org/springframework/core/task/package-info.java index 599d6161f6ea..099867d9c64f 100644 --- a/spring-core/src/main/java/org/springframework/core/task/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/task/package-info.java @@ -3,6 +3,8 @@ * and provides SyncTaskExecutor and SimpleAsyncTaskExecutor implementations. */ @NonNullApi +@NonNullFields package org.springframework.core.task; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/task/support/package-info.java b/spring-core/src/main/java/org/springframework/core/task/support/package-info.java index 4f789307fe10..e9dfcd9dc443 100644 --- a/spring-core/src/main/java/org/springframework/core/task/support/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/task/support/package-info.java @@ -3,6 +3,8 @@ * Includes an adapter for the standard ExecutorService interface. */ @NonNullApi +@NonNullFields package org.springframework.core.task.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java b/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java index 384402890891..37a94af610b3 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java @@ -2,6 +2,8 @@ * Support classes for reading annotation and class-level metadata. */ @NonNullApi +@NonNullFields package org.springframework.core.type.classreading; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/package-info.java b/spring-core/src/main/java/org/springframework/core/type/filter/package-info.java index 4eafe49ae78f..7c60af6640c8 100644 --- a/spring-core/src/main/java/org/springframework/core/type/filter/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/type/filter/package-info.java @@ -2,6 +2,8 @@ * Core support package for type filtering (e.g. for classpath scanning). */ @NonNullApi +@NonNullFields package org.springframework.core.type.filter; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/core/type/package-info.java b/spring-core/src/main/java/org/springframework/core/type/package-info.java index 56b4c2ffa7a2..f63ddb1be36b 100644 --- a/spring-core/src/main/java/org/springframework/core/type/package-info.java +++ b/spring-core/src/main/java/org/springframework/core/type/package-info.java @@ -2,6 +2,8 @@ * Core support package for type introspection. */ @NonNullApi +@NonNullFields package org.springframework.core.type; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/lang/NonNull.java b/spring-core/src/main/java/org/springframework/lang/NonNull.java new file mode 100644 index 000000000000..27974078fa34 --- /dev/null +++ b/spring-core/src/main/java/org/springframework/lang/NonNull.java @@ -0,0 +1,56 @@ +/* + * Copyright 2002-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.lang; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.annotation.Nonnull; +import javax.annotation.meta.TypeQualifierNickname; + +/** + * A common Spring annotation to declare that annotated elements cannot be {@code null}. + * Leverages JSR 305 meta-annotations to indicate nullability in Java to common tools with + * JSR 305 support and used by Kotlin to infer nullability of Spring API. + * + *
Should be used at generic type argument, parameter, return value, and field level. + * Methods overrides should repeat parent {@code @NonNull} annotations unless they behave + * differently. + * + *
Use {@code @NonNullApi} (scope = parameters + return values) and/or {@code @NonNullFields} + * (scope = fields) to set the default behavior to non-nullable in order to avoid annotating + * your whole codebase with {@code @NonNull}. No default retricted to generic type argument + * is possible ({@code ElementType.TYPE_USE} scope is too wide) so each generic type argument + * needs to be annotated with @code @NonNull}. + * + * @author Sebastien Deleuze + * @author Juergen Hoeller + * @since 5.0 + * @see NonNullApi + * @see NonNullFields + * @see Nullable + */ +@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE_USE, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Nonnull +@TypeQualifierNickname +public @interface NonNull { +} diff --git a/spring-core/src/main/java/org/springframework/lang/NonNullApi.java b/spring-core/src/main/java/org/springframework/lang/NonNullApi.java index 0e823e29c0ff..050abe0c1567 100644 --- a/spring-core/src/main/java/org/springframework/lang/NonNullApi.java +++ b/spring-core/src/main/java/org/springframework/lang/NonNullApi.java @@ -26,25 +26,30 @@ /** * A common Spring annotation to declare that parameters and return values - * are to be considered as non-nullable by default for a given package, - * along with their underlying fields. + * are to be considered as non-nullable by default for a given package. + * Leverages JSR 305 meta-annotations to indicate nullability in Java to common tools with + * JSR 305 support and used by Kotlin to infer nullability of Spring API. + * * *
Should be used at package level in association with {@link Nullable} * annotations at parameter and return value level. * - *
Leverages JSR-305 meta-annotations to indicate its semantics to - * common tools with JSR-305 support. + *
This annotation does not define nullability of generic type arguments, because + * {@code @TypeQualifierDefault(ElementType.TYPE_USE)} scope would be too broad. + * As a consequence, each API generic type argument should be annotated + * with {@link Nullable} or {@link NonNull} to specify their nullability. * * @author Sebastien Deleuze * @author Juergen Hoeller * @since 5.0 + * @see NonNullFields * @see Nullable - * @see javax.annotation.Nonnull + * @see NonNull */ @Target(ElementType.PACKAGE) @Retention(RetentionPolicy.RUNTIME) @Documented @Nonnull -@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE_PARAMETER, ElementType.FIELD}) +@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER}) public @interface NonNullApi { } diff --git a/spring-core/src/main/java/org/springframework/lang/NonNullFields.java b/spring-core/src/main/java/org/springframework/lang/NonNullFields.java new file mode 100644 index 000000000000..213ec2878162 --- /dev/null +++ b/spring-core/src/main/java/org/springframework/lang/NonNullFields.java @@ -0,0 +1,54 @@ +/* + * Copyright 2002-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.lang; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.annotation.Nonnull; +import javax.annotation.meta.TypeQualifierDefault; + +/** + * A common Spring annotation to declare that fields are to be considered as + * non-nullable by default for a given package. Leverages JSR 305 meta-annotations to + * indicate nullability in Java to common tools with JSR 305 support and used by Kotlin + * to infer nullability of Spring API. + * + *
Should be used at package level in association with {@link Nullable} + * annotations at field level. + * + *
This annotation does not define nullability of generic type arguments, because + * {@code @TypeQualifierDefault(ElementType.TYPE_USE)} scope would be too broad. + * As a consequence, each field generic type argument should be annotated + * with {@link Nullable} or {@link NonNull} to specify their nullability. + * + * @author Sebastien Deleuze + * @since 5.0 + * @see NonNullFields + * @see Nullable + * @see NonNull + */ +@Target(ElementType.PACKAGE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Nonnull +@TypeQualifierDefault(ElementType.FIELD) +public @interface NonNullFields { +} diff --git a/spring-core/src/main/java/org/springframework/lang/Nullable.java b/spring-core/src/main/java/org/springframework/lang/Nullable.java index a1cb932b4e9b..7db3b9cbfed4 100644 --- a/spring-core/src/main/java/org/springframework/lang/Nullable.java +++ b/spring-core/src/main/java/org/springframework/lang/Nullable.java @@ -26,23 +26,25 @@ import javax.annotation.meta.When; /** - * A common Spring annotation to declare that the annotated parameter, - * return value or field could be {@code null} under some circumstances. + * A common Spring annotation to declare that annotated elements can be {@code null} under + * some circumstance. Leverages JSR 305 meta-annotations to indicate nullability in Java + * to common tools with JSR 305 support and used by Kotlin to infer nullability of Spring API. * - *
Should be used at parameters, return values and optionally field level in association - * with {@link NonNullApi} package-level annotations. Methods overrides should repeat parent - * parameter or return value {@code @Nullable} annotations unless they behave differently. + *
Should be used at generic type argument, parameter, return value, and field level. + * Methods overrides should repeat parent {@code @Nullable} annotations unless they behave + * differently. * - *
Leverages JSR-305 meta-annotations to indicate its semantics to - * common tools with JSR-305 support. + *
Can be used in association with {@code NonNullApi} or {@code @NonNullFields} to + * override the default non-nullable semantic to nullable. * * @author Sebastien Deleuze * @author Juergen Hoeller * @since 5.0 * @see NonNullApi - * @see javax.annotation.Nullable + * @see NonNullFields + * @see NonNull */ -@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE_PARAMETER, ElementType.FIELD}) +@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE_USE, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) @Documented @Nonnull(when = When.MAYBE) diff --git a/spring-core/src/main/java/org/springframework/lang/package-info.java b/spring-core/src/main/java/org/springframework/lang/package-info.java index 5fddf8838d9a..845371015116 100644 --- a/spring-core/src/main/java/org/springframework/lang/package-info.java +++ b/spring-core/src/main/java/org/springframework/lang/package-info.java @@ -3,5 +3,6 @@ * Used descriptively within the framework codebase; validated by Animal Sniffer at build time. */ @NonNullApi +@NonNullFields package org.springframework.lang; diff --git a/spring-core/src/main/java/org/springframework/util/backoff/package-info.java b/spring-core/src/main/java/org/springframework/util/backoff/package-info.java index e23152d7732d..071542a7a1b4 100644 --- a/spring-core/src/main/java/org/springframework/util/backoff/package-info.java +++ b/spring-core/src/main/java/org/springframework/util/backoff/package-info.java @@ -2,6 +2,8 @@ * A generic back-off abstraction. */ @NonNullApi +@NonNullFields package org.springframework.util.backoff; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/util/comparator/package-info.java b/spring-core/src/main/java/org/springframework/util/comparator/package-info.java index 29821e3ae2e4..3d4ebd53b7f7 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/package-info.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/package-info.java @@ -3,6 +3,8 @@ * such as an invertible comparator and a compound comparator. */ @NonNullApi +@NonNullFields package org.springframework.util.comparator; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/package-info.java b/spring-core/src/main/java/org/springframework/util/concurrent/package-info.java index 5bc5f5d04643..32a77878f92a 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/package-info.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/package-info.java @@ -2,6 +2,8 @@ * Useful generic {@code java.util.concurrent.Future} extension. */ @NonNullApi +@NonNullFields package org.springframework.util.concurrent; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/util/package-info.java b/spring-core/src/main/java/org/springframework/util/package-info.java index b1f68b55ab8d..93237c0315e6 100644 --- a/spring-core/src/main/java/org/springframework/util/package-info.java +++ b/spring-core/src/main/java/org/springframework/util/package-info.java @@ -3,6 +3,8 @@ * a Log4J configurer, and a state holder for paged lists of objects. */ @NonNullApi +@NonNullFields package org.springframework.util; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/main/java/org/springframework/util/xml/package-info.java b/spring-core/src/main/java/org/springframework/util/xml/package-info.java index 7189bdb565a1..b077891dd66f 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/package-info.java +++ b/spring-core/src/main/java/org/springframework/util/xml/package-info.java @@ -3,6 +3,8 @@ * such as error handlers that log warnings via Commons Logging. */ @NonNullApi +@NonNullFields package org.springframework.util.xml; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-expression/src/main/java/org/springframework/expression/common/package-info.java b/spring-expression/src/main/java/org/springframework/expression/common/package-info.java index c572c5bdd125..080af63ff99b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/package-info.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/package-info.java @@ -2,6 +2,8 @@ * Common utility classes behind the Spring Expression Language. */ @NonNullApi +@NonNullFields package org.springframework.expression.common; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-expression/src/main/java/org/springframework/expression/package-info.java b/spring-expression/src/main/java/org/springframework/expression/package-info.java index b01674cf183b..48a91d155356 100644 --- a/spring-expression/src/main/java/org/springframework/expression/package-info.java +++ b/spring-expression/src/main/java/org/springframework/expression/package-info.java @@ -2,6 +2,8 @@ * Core abstractions behind the Spring Expression Language. */ @NonNullApi +@NonNullFields package org.springframework.expression; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/package-info.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/package-info.java index d7fdffbbaf67..d6c0b5ec6d98 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/package-info.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/package-info.java @@ -2,6 +2,8 @@ * SpEL's abstract syntax tree. */ @NonNullApi +@NonNullFields package org.springframework.expression.spel.ast; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/package-info.java b/spring-expression/src/main/java/org/springframework/expression/spel/package-info.java index 7f1ca0322f2d..81dc5f52c6da 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/package-info.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/package-info.java @@ -2,6 +2,8 @@ * SpEL's central implementation package. */ @NonNullApi +@NonNullFields package org.springframework.expression.spel; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/package-info.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/package-info.java index a33e8e3f66ea..e26fe15427b9 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/package-info.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/package-info.java @@ -2,6 +2,8 @@ * SpEL's standard parser implementation. */ @NonNullApi +@NonNullFields package org.springframework.expression.spel.standard; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/package-info.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/package-info.java index 513c06567260..d77cb741fa54 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/package-info.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/package-info.java @@ -2,6 +2,8 @@ * SpEL's default implementations for various core abstractions. */ @NonNullApi +@NonNullFields package org.springframework.expression.spel.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/package-info.java index 770d44e0a118..83cdb23a5c14 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/package-info.java @@ -2,6 +2,8 @@ * Defines the Spring JDBC configuration namespace. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.config; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java index 41e1f0010bc3..2af03f0ddf75 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/package-info.java @@ -2,6 +2,8 @@ * Context metadata abstraction for the configuration and execution of a stored procedure call. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.core.metadata; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java index 5ea4238dce66..d3fc2928d6d4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java @@ -11,6 +11,8 @@ * work with the returned classic template, or use a JdbcTemplate instance directly. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.core.namedparam; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/package-info.java index 5591e5419e2e..2d79acddb044 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/package-info.java @@ -3,6 +3,8 @@ * and its associated callback interfaces and helper objects. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.core; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java index c70d9d97d209..f5723ffdf8e8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java @@ -6,6 +6,8 @@ * parameter specification becomes unnecessary since it can be looked up in the metadata. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.core.simple; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java index 44b556fee4fc..7e0621e7740b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java @@ -3,6 +3,8 @@ * Contains a DAO base class for JdbcTemplate usage. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.core.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java index 18e1a703379d..2f9576f22e3f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/package-info.java @@ -2,6 +2,8 @@ * Provides extensible support for creating embedded database instances. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.datasource.embedded; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java index ffe50577379d..1e1d53e3a6c9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/package-info.java @@ -2,6 +2,8 @@ * Provides extensible support for initializing databases through scripts. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.datasource.init; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java index 2c20a49426e4..e5dd2ecb8616 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/package-info.java @@ -2,6 +2,8 @@ * Provides a strategy for looking up JDBC DataSources by name. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.datasource.lookup; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java index 6dce266ab408..baa79a5f8656 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java @@ -4,6 +4,8 @@ * and various simple DataSource implementations. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.datasource; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java index 8a511307bf98..61bac017c4cf 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java @@ -15,6 +15,8 @@ * by Rod Johnson (Wrox, 2002). */ @NonNullApi +@NonNullFields package org.springframework.jdbc.object; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java index ec5e65fd6af8..027932fc5f5f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java @@ -18,6 +18,8 @@ * by Rod Johnson (Wrox, 2002). */ @NonNullApi +@NonNullFields package org.springframework.jdbc; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java index 6b2fa4169888..a07f8dac5d02 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java @@ -3,6 +3,8 @@ * as well as a customizable default implementation. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.support.lob; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java index 6814d37a5958..bd868877a9af 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java @@ -7,6 +7,8 @@ * or in JDBC-based O/R mapping layers. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java index 4d18ce41d751..d38a51b1c694 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/package-info.java @@ -3,6 +3,8 @@ * Supported by JdbcTemplate, but can be used independently too. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.support.rowset; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java index 14bfdee577b3..24e863bfd6ae 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/package-info.java @@ -2,6 +2,8 @@ * Abstraction for handling fields of SQLXML data type. */ @NonNullApi +@NonNullFields package org.springframework.jdbc.support.xml; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/package-info.java b/spring-jms/src/main/java/org/springframework/jms/annotation/package-info.java index 665ecd621a78..7aca3605b61c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/annotation/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/annotation/package-info.java @@ -2,6 +2,8 @@ * Annotations and support classes for declarative JMS listener endpoints. */ @NonNullApi +@NonNullFields package org.springframework.jms.annotation; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/config/package-info.java b/spring-jms/src/main/java/org/springframework/jms/config/package-info.java index 9ef34e73c451..615ba9a71df1 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/package-info.java @@ -3,6 +3,8 @@ * with Java configuration and XML schema support. */ @NonNullApi +@NonNullFields package org.springframework.jms.config; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/package-info.java b/spring-jms/src/main/java/org/springframework/jms/connection/package-info.java index 24f972498a20..f075ee2297cc 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/package-info.java @@ -3,6 +3,8 @@ * JMS ConnectionFactory, and a SingleConnectionFactory adapter. */ @NonNullApi +@NonNullFields package org.springframework.jms.connection; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/core/package-info.java b/spring-jms/src/main/java/org/springframework/jms/core/package-info.java index 48276a94b537..4beb013c5759 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/package-info.java @@ -3,6 +3,8 @@ * Provides a JmsTemplate class and various callback interfaces. */ @NonNullApi +@NonNullFields package org.springframework.jms.core; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java b/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java index 443ae9fa9ca4..55535f37a3b4 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java @@ -3,6 +3,8 @@ * Contains a base class for JmsTemplate usage. */ @NonNullApi +@NonNullFields package org.springframework.jms.core.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java index 0d5bfba59f83..57f5b0228924 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/package-info.java @@ -4,6 +4,8 @@ * (such as String or byte array) that get passed into listener methods. */ @NonNullApi +@NonNullFields package org.springframework.jms.listener.adapter; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java index c0723c40e43d..23a0e183cd40 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/package-info.java @@ -2,6 +2,8 @@ * This package provides JCA-based endpoint management for JMS message listeners. */ @NonNullApi +@NonNullFields package org.springframework.jms.listener.endpoint; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/package-info.java b/spring-jms/src/main/java/org/springframework/jms/listener/package-info.java index 99bf952e6895..2652ddc6f189 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/package-info.java @@ -4,6 +4,8 @@ * implementations, based on the plain JMS client API. */ @NonNullApi +@NonNullFields package org.springframework.jms.listener; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/package-info.java b/spring-jms/src/main/java/org/springframework/jms/package-info.java index 2d3d230d26b0..e114d09c017c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/package-info.java @@ -3,6 +3,8 @@ * allowing for Spring-style JMS access. */ @NonNullApi +@NonNullFields package org.springframework.jms; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java b/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java index 1cb05b0e9fe9..20e030430ca8 100644 --- a/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java @@ -6,6 +6,8 @@ * service: They only need to agree on a queue name and a service interface. */ @NonNullApi +@NonNullFields package org.springframework.jms.remoting; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/package-info.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/package-info.java index bef53603d3dc..53c46520b704 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/package-info.java @@ -3,6 +3,8 @@ * between Java objects and JMS messages. */ @NonNullApi +@NonNullFields package org.springframework.jms.support.converter; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/package-info.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/package-info.java index 3326d0c70409..91b3c3e50211 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/package-info.java @@ -2,6 +2,8 @@ * Support classes for Spring's JMS framework. */ @NonNullApi +@NonNullFields package org.springframework.jms.support.destination; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/package-info.java b/spring-jms/src/main/java/org/springframework/jms/support/package-info.java index b20dce21d83f..34433006917d 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/package-info.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/package-info.java @@ -3,6 +3,8 @@ * to be used by higher-level classes like JmsTemplate. */ @NonNullApi +@NonNullFields package org.springframework.jms.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/package-info.java index 26d62314c252..c5dcb046af75 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/converter/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/package-info.java @@ -2,6 +2,8 @@ * Provides support for message conversion. */ @NonNullApi +@NonNullFields package org.springframework.messaging.converter; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/core/package-info.java index ec6b8ec107c8..ed87d0e45aea 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/package-info.java @@ -2,6 +2,8 @@ * Defines interfaces and implementation classes for messaging templates. */ @NonNullApi +@NonNullFields package org.springframework.messaging.core; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/package-info.java index 0e46b794a67b..3259288c04f6 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/package-info.java @@ -2,6 +2,8 @@ * Annotations and support classes for handling messages. */ @NonNullApi +@NonNullFields package org.springframework.messaging.handler.annotation; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java index b1593a3fdb51..eb05eec33d8e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java @@ -2,6 +2,8 @@ * Common infrastructure for invoking message handler methods. */ @NonNullApi +@NonNullFields package org.springframework.messaging.handler.invocation; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java index e9e183387d30..d4ae3f87b9d2 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java @@ -2,6 +2,8 @@ * Basic abstractions for working with message handler methods. */ @NonNullApi +@NonNullFields package org.springframework.messaging.handler; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/package-info.java index bcf02caca345..875d7b5b727c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/package-info.java @@ -2,6 +2,8 @@ * Support for working with messaging APIs and protocols. */ @NonNullApi +@NonNullFields package org.springframework.messaging; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java index 8081606a16de..0cc7169d445f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java @@ -2,6 +2,8 @@ * Annotations and for handling messages from SImple Messaging Protocols such as STOMP. */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp.annotation; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/package-info.java index c195345070c6..bc4b50f166d1 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/package-info.java @@ -3,6 +3,8 @@ * (like STOMP). */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp.annotation.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/package-info.java index 177abfe7a560..afc2f7016ca5 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/package-info.java @@ -3,6 +3,8 @@ * class and other supporting types such as a registry for subscriptions. */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp.broker; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/package-info.java index 856966dc0ed9..09947fad0c32 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/package-info.java @@ -2,6 +2,8 @@ * Configuration support for WebSocket messaging using higher level messaging protocols. */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp.config; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/package-info.java index b9f3ef39bda2..61c18eae449d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/package-info.java @@ -2,6 +2,8 @@ * Generic support for SImple Messaging Protocols including protocols such as STOMP. */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/package-info.java index 44ea22128b81..6b42fa754c88 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/package-info.java @@ -2,6 +2,8 @@ * Generic support for simple messaging protocols (like STOMP). */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp.stomp; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/package-info.java index cea4c996bb37..bd59b706f119 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/package-info.java @@ -7,6 +7,8 @@ * for keeping track of connected user sessions. */ @NonNullApi +@NonNullFields package org.springframework.messaging.simp.user; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/support/package-info.java index 4b3967dccfe4..b2213f6a1634 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/package-info.java @@ -5,6 +5,8 @@ * implementations and channel interceptor support. */ @NonNullApi +@NonNullFields package org.springframework.messaging.support; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/package-info.java index 736265af227a..2b940f2170cf 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/package-info.java @@ -7,6 +7,8 @@ * {@link org.springframework.messaging.tcp.TcpConnection TcpConnection}. */ @NonNullApi +@NonNullFields package org.springframework.messaging.tcp; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/package-info.java index 0d7ef61f3f0d..0fbf6c5be757 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/package-info.java @@ -2,6 +2,8 @@ * Contains support for TCP messaging based on Reactor. */ @NonNullApi +@NonNullFields package org.springframework.messaging.tcp.reactor; import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/package-info.java index 1aa35f6d9c13..9324cfa2e653 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/package-info.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/package-info.java @@ -11,6 +11,8 @@ *
This package supports Hibernate 5.x only.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm.hibernate5;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/package-info.java
index 1b458ddb7bf5..8eb94296292a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/package-info.java
@@ -2,6 +2,8 @@
* Classes supporting the {@code org.springframework.orm.hibernate5} package.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm.hibernate5.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java
index 9d1058b4a551..ae73e43ba2c9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java
@@ -4,6 +4,8 @@
* and an implementation of Spring's transaction SPI for local JPA transactions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm.jpa;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java
index 3f6597093f23..e27e279a1c13 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java
@@ -2,6 +2,8 @@
* Internal support for managing JPA persistence units.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm.jpa.persistenceunit;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
index 81c5526ba35f..b2b1b32ba47c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
@@ -2,6 +2,8 @@
* Classes supporting the {@code org.springframework.orm.jpa} package.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm.jpa.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java
index 9a73ca973835..b14f429ab986 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java
@@ -2,6 +2,8 @@
* Support classes for adapting to specific JPA vendors.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm.jpa.vendor;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-orm/src/main/java/org/springframework/orm/package-info.java b/spring-orm/src/main/java/org/springframework/orm/package-info.java
index 54db68c89513..2b6a01a34ffd 100644
--- a/spring-orm/src/main/java/org/springframework/orm/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/package-info.java
@@ -3,6 +3,8 @@
* Contains generic DataAccessExceptions related to O/R Mapping.
*/
@NonNullApi
+@NonNullFields
package org.springframework.orm;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
index e923e079bb97..fe20e279135b 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
@@ -3,6 +3,8 @@
* within Spring's O/X Mapping support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.castor;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java
index b91bda602bfa..9907718e49ee 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java
@@ -2,6 +2,8 @@
* Provides an namespace handler for the Spring Object/XML namespace.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.config;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
index 67aa0c81744b..0767ea4025e7 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
@@ -3,6 +3,8 @@
* with Spring's O/X Mapping support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.jaxb;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
index 2e4f62057082..8f6b47b98ce5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
@@ -3,6 +3,8 @@
* with Spring's O/X Mapping support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.jibx;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java
index edffe672863a..b62881733dea 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java
@@ -2,6 +2,8 @@
* Contains (un)marshallers optimized to store binary data in MIME attachments.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.mime;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/package-info.java
index d85077c13fb1..a9774649b72d 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/package-info.java
@@ -4,6 +4,8 @@
* and XmlMappingExceptions related to O/X Mapping
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java
index d9f01a48c5bc..e97762a891ec 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java
@@ -5,6 +5,8 @@
* MarshallingMessageConverter for use within Spring's JMS support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
index 490e696cfefd..a701bd6d44fd 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
@@ -3,6 +3,8 @@
* with Spring's O/X Mapping support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.oxm.xstream;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/env/package-info.java b/spring-test/src/main/java/org/springframework/mock/env/package-info.java
index b91f00c11b18..5c6e61649064 100644
--- a/spring-test/src/main/java/org/springframework/mock/env/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/env/package-info.java
@@ -8,6 +8,8 @@
* unit tests for code that depends on environment-specific properties.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.env;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java b/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java
index f0b355ea37c1..3feddab58699 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java
@@ -4,6 +4,8 @@
* {@code MockClientHttpResponse}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.http.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/package-info.java b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/package-info.java
index 04b01c2be035..36f5a5bb3950 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/package-info.java
@@ -2,6 +2,8 @@
* Mock implementations of reactive HTTP client contracts.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.http.client.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/http/package-info.java b/spring-test/src/main/java/org/springframework/mock/http/package-info.java
index 62341effdb91..18bda66888a6 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/package-info.java
@@ -4,6 +4,8 @@
* {@code MockHttpOutputMessage}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.http;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/package-info.java b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/package-info.java
index 3b93b279e4f6..b989b2d96b71 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/package-info.java
@@ -2,6 +2,8 @@
* Mock implementations of reactive HTTP server contracts.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.http.server.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
index 5aab8baf9616..95e56da08d47 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
@@ -7,6 +7,8 @@
* configuration can be reused without changes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.jndi;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
index 74414ef05899..599c70774d4c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
@@ -10,6 +10,8 @@
* (MockObjects).
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.web;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/package-info.java
index 2ce9e4c2eb53..91fe0741840d 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/package-info.java
@@ -5,6 +5,8 @@
*
*/
@NonNullApi
+@NonNullFields
package org.springframework.mock.web.reactive.function.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/package-info.java b/spring-test/src/main/java/org/springframework/test/annotation/package-info.java
index b2ab125dc2c7..0e93e33cbd7f 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/package-info.java
@@ -2,6 +2,8 @@
* Support classes for annotation-driven tests.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/package-info.java b/spring-test/src/main/java/org/springframework/test/context/cache/package-info.java
index 5529d083ba78..e015cbf75881 100644
--- a/spring-test/src/main/java/org/springframework/test/context/cache/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/cache/package-info.java
@@ -2,6 +2,8 @@
* Support for context caching within the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.cache;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/package-info.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/package-info.java
index 3f3151110b63..fe01ea1dc52b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/jdbc/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/package-info.java
@@ -3,6 +3,8 @@
* including support for declarative SQL script execution via {@code @Sql}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.jdbc;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/package-info.java
index d84c10f76972..c9c4800b6a12 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/package-info.java
@@ -3,6 +3,8 @@
* with the JUnit Jupiter extension model in JUnit 5.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.junit.jupiter;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/web/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/web/package-info.java
index 38f765a30da4..2f48593acb46 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/web/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/web/package-info.java
@@ -3,6 +3,8 @@
* with the JUnit Jupiter extension model in JUnit 5.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.junit.jupiter.web;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java
index 5eb3afdf5400..b4b5883467f7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java
@@ -3,6 +3,8 @@
* with JUnit 4.12 or higher.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.junit4;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/package-info.java
index f942e9cdfc8e..ae0b7dc6e0ee 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/package-info.java
@@ -2,6 +2,8 @@
* Custom JUnit {@code Rules} used in the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.junit4.rules;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
index 38a80d3186cf..7d9c4af53899 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
@@ -2,6 +2,8 @@
* Custom JUnit {@code Statements} used in the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.junit4.statements;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/package-info.java b/spring-test/src/main/java/org/springframework/test/context/package-info.java
index 4b83127f83cd..af3710b4b2dc 100644
--- a/spring-test/src/main/java/org/springframework/test/context/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/package-info.java
@@ -12,6 +12,8 @@
* management with default rollback semantics.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/package-info.java b/spring-test/src/main/java/org/springframework/test/context/support/package-info.java
index 769862c129f6..66f278fde8a9 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/package-info.java
@@ -2,6 +2,8 @@
* Support classes for the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/testng/package-info.java b/spring-test/src/main/java/org/springframework/test/context/testng/package-info.java
index 92208b9e20e4..db87bf63535f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/testng/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/testng/package-info.java
@@ -3,6 +3,8 @@
* tests run with TestNG and the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.testng;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java b/spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java
index 0828438a381e..51a8296e4527 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java
@@ -2,6 +2,8 @@
* Transactional support classes for the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.transaction;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/util/package-info.java b/spring-test/src/main/java/org/springframework/test/context/util/package-info.java
index 15b97c3d3834..f4addd2e9e50 100644
--- a/spring-test/src/main/java/org/springframework/test/context/util/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/util/package-info.java
@@ -2,6 +2,8 @@
* Common utilities used within the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.util;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/package-info.java b/spring-test/src/main/java/org/springframework/test/context/web/package-info.java
index b45e51670ec7..e4f9b40942b2 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/package-info.java
@@ -2,6 +2,8 @@
* Web support classes for the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.web;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java
index ca6a5942b2cb..8aa1072223a6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java
@@ -2,6 +2,8 @@
* WebSocket support classes for the Spring TestContext Framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.context.web.socket;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/jdbc/package-info.java b/spring-test/src/main/java/org/springframework/test/jdbc/package-info.java
index d35317061f1a..e382f904625f 100644
--- a/spring-test/src/main/java/org/springframework/test/jdbc/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/jdbc/package-info.java
@@ -2,6 +2,8 @@
* Support classes for tests based on JDBC.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.jdbc;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/util/package-info.java b/spring-test/src/main/java/org/springframework/test/util/package-info.java
index 4794d8b0a67f..aa08fffb7904 100644
--- a/spring-test/src/main/java/org/springframework/test/util/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/util/package-info.java
@@ -2,6 +2,8 @@
* General utility classes for use in unit and integration tests.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.util;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java b/spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java
index c76ae812073b..cb8a23d931aa 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java
@@ -5,6 +5,8 @@
* to gain access to instances of those implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.client.match;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/package-info.java b/spring-test/src/main/java/org/springframework/test/web/client/package-info.java
index 615f706a8a09..ecfaf0c4a6c1 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/package-info.java
@@ -3,6 +3,8 @@
* @see org.springframework.test.web.client.MockRestServiceServer
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java b/spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java
index 4efaa2c5c0fa..242530cd1436 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java
@@ -5,6 +5,8 @@
* to gain access to instances of those implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.client.response;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/package-info.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/package-info.java
index 47a3a4b6ad78..681359421451 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.test.web.reactive.server.WebTestClient}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.reactive.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/package-info.java
index 0165229d6fee..9219e76328df 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/package-info.java
@@ -4,6 +4,8 @@
* @see org.springframework.test.web.servlet.MockMvc
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.servlet.htmlunit;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/package-info.java
index 4290abe4473a..e314c09e6f5f 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/package-info.java
@@ -5,6 +5,8 @@
* @see org.openqa.selenium.htmlunit.HtmlUnitDriver
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.servlet.htmlunit.webdriver;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java
index d95efa17eeb7..63a7fb0faa3d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java
@@ -3,6 +3,8 @@
* @see org.springframework.test.web.servlet.MockMvc
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.servlet;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java
index 7d1c36814d82..35a802a763d6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java
@@ -5,6 +5,8 @@
* to gain access to instances of those implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.servlet.request;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java
index 26cf583b0c18..67057faef948 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java
@@ -5,6 +5,8 @@
* to access instances of those implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.servlet.result;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/package-info.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
index 562c7e7f6fb6..f030410ea827 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/package-info.java
@@ -4,6 +4,8 @@
* to access to instances of those implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.test.web.servlet.setup;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/package-info.java b/spring-tx/src/main/java/org/springframework/dao/annotation/package-info.java
index 85b1ce0cdad7..17d23ed157a1 100644
--- a/spring-tx/src/main/java/org/springframework/dao/annotation/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/dao/annotation/package-info.java
@@ -3,6 +3,8 @@
* persistence exceptions based on a repository stereotype annotation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.dao.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/dao/package-info.java b/spring-tx/src/main/java/org/springframework/dao/package-info.java
index 68478e7d8bb7..8ed5a8ade970 100644
--- a/spring-tx/src/main/java/org/springframework/dao/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/dao/package-info.java
@@ -14,6 +14,8 @@
* by Rod Johnson (Wrox, 2002).
*/
@NonNullApi
+@NonNullFields
package org.springframework.dao;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/package-info.java b/spring-tx/src/main/java/org/springframework/dao/support/package-info.java
index 25f757ab8789..1efd755dd17c 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/package-info.java
@@ -3,6 +3,8 @@
* providing miscellaneous utility methods.
*/
@NonNullApi
+@NonNullFields
package org.springframework.dao.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
index 6e101b417b02..b90d61e6211c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
@@ -4,6 +4,8 @@
* and various simple ConnectionFactory proxies/adapters.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.cci.connection;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
index df593e88c527..33d36edf29d8 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
@@ -3,6 +3,8 @@
* and its associated callback interfaces.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.cci.core;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
index 46d9e5f6e452..d7bfd6bc0f22 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
@@ -3,6 +3,8 @@
* Contains a DAO base class for CciTemplate usage.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.cci.core.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
index 9369900c21a0..2c51b175d105 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
@@ -6,6 +6,8 @@
* meaning that code using this package does not need to worry about error handling.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.cci.object;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
index 7c1fd13c791a..469cdc926b3b 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
@@ -5,6 +5,8 @@
* levels of data access abstraction.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.cci;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/package-info.java b/spring-tx/src/main/java/org/springframework/jca/context/package-info.java
index bb4dc6fdfd37..172bca88efe2 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/package-info.java
@@ -3,6 +3,8 @@
* as a JCA 1.7 compliant RAR file.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.context;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java
index fe6beaa826c4..45f3610a9e7f 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/package-info.java
@@ -2,6 +2,8 @@
* This package provides a facility for generic JCA message endpoint management.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.endpoint;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/package-info.java b/spring-tx/src/main/java/org/springframework/jca/support/package-info.java
index 9abe8fb34a9e..547844092eb0 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/package-info.java
@@ -3,6 +3,8 @@
* mainly for local setup of a JCA ResourceAdapter and/or ConnectionFactory.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/package-info.java b/spring-tx/src/main/java/org/springframework/jca/work/package-info.java
index 4a0eb0ca87b3..a797e7215078 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/package-info.java
@@ -3,6 +3,8 @@
* as supported within ResourceAdapters.
*/
@NonNullApi
+@NonNullFields
package org.springframework.jca.work;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java
index 77626fb012bb..fdef1fa4b563 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/package-info.java
@@ -4,6 +4,8 @@
* via a special TransactionAttributeSource implementation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/config/package-info.java
index 4b3b82bdf5b5..120413df0a66 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/package-info.java
@@ -3,6 +3,8 @@
* with XML schema being the primary configuration format.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction.config;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java
index a5fcfd7131b3..507a1af2e8b0 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/event/package-info.java
@@ -2,6 +2,8 @@
* Spring's support for listening to transaction events.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction.event;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
index 70cf07abf9e7..44e8ff8b6ce0 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
@@ -12,6 +12,8 @@
* even without JTA if an application uses only a single database.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction.interceptor;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java
index 457655376ff0..677749eb0a4c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/package-info.java
@@ -2,6 +2,8 @@
* Transaction SPI implementation for JTA.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction.jta;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/package-info.java
index c8303416d44f..c6f2ed6104a1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/package-info.java
@@ -4,6 +4,8 @@
* Contains transaction manager, definition, and status interfaces.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/support/package-info.java
index 7a6d172a4f29..59a310edf0a6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/package-info.java
@@ -4,6 +4,8 @@
* and a template plus callback for transaction demarcation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.transaction.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/client/package-info.java b/spring-web/src/main/java/org/springframework/http/client/package-info.java
index ce85f7f341ca..9c9935e3e9af 100644
--- a/spring-web/src/main/java/org/springframework/http/client/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/client/package-info.java
@@ -4,6 +4,8 @@
* as well as a basic implementation of these interfaces.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/package-info.java b/spring-web/src/main/java/org/springframework/http/client/reactive/package-info.java
index 57af2c3ceeca..b17f099cdb86 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/package-info.java
@@ -5,6 +5,8 @@
* {@link org.springframework.http.client.reactive.ClientHttpConnector}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.client.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/package-info.java b/spring-web/src/main/java/org/springframework/http/client/support/package-info.java
index eb74fbcb036c..0308cb51a3d1 100644
--- a/spring-web/src/main/java/org/springframework/http/client/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/client/support/package-info.java
@@ -3,6 +3,8 @@
* to be used by higher-level classes like RestTemplate.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.client.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/package-info.java b/spring-web/src/main/java/org/springframework/http/codec/json/package-info.java
index 5039cba4062e..710d9c02512e 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/package-info.java
@@ -2,6 +2,8 @@
* JSON encoder and decoder support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.codec.json;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/package-info.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/package-info.java
index c84c6711225e..44dad3697d6e 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/package-info.java
@@ -2,6 +2,8 @@
* Multipart support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.codec.multipart;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/package-info.java b/spring-web/src/main/java/org/springframework/http/codec/package-info.java
index c52dbb555b3d..a4c6b8505b20 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/package-info.java
@@ -8,6 +8,8 @@
* writing the body of HTTP requests and responses.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.codec;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/package-info.java b/spring-web/src/main/java/org/springframework/http/codec/xml/package-info.java
index 28ac6bcd3145..2af5e7773e7f 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/package-info.java
@@ -2,6 +2,8 @@
* XML encoder and decoder support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.codec.xml;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/cbor/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/cbor/package-info.java
index 62a839ae8835..c8ffa9781801 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/cbor/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/cbor/package-info.java
@@ -2,6 +2,8 @@
* Provides an HttpMessageConverter for the CBOR data format.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.cbor;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
index 3c4843aa187c..74d0e0656a35 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
@@ -3,6 +3,8 @@
* Based on the ROME tools project.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.feed;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/json/package-info.java
index c786dae179d5..5290f00a1c2e 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/package-info.java
@@ -2,6 +2,8 @@
* Provides HttpMessageConverter implementations for handling JSON.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.json;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/package-info.java
index e225736697f0..82ddae975e23 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/package-info.java
@@ -2,6 +2,8 @@
* Provides an HttpMessageConverter abstraction to convert between Java objects and HTTP input/output messages.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/package-info.java
index 863c73c5ae91..313e9089c382 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/package-info.java
@@ -3,6 +3,8 @@
* Google Protocol Buffers.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.protobuf;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/smile/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/smile/package-info.java
index 1728559634d9..fee55e553be7 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/smile/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/smile/package-info.java
@@ -2,6 +2,8 @@
* Provides an HttpMessageConverter for the Smile data format ("binary JSON").
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.smile;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/support/package-info.java
index 33f91a24cf6f..4dbf1c570a43 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/support/package-info.java
@@ -2,6 +2,8 @@
* Provides a comprehensive HttpMessageConverter variant for form handling.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/xml/package-info.java
index f3a33401d1d7..34734d540353 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/package-info.java
@@ -2,6 +2,8 @@
* Provides HttpMessageConverter implementations for handling XML.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.converter.xml;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/package-info.java b/spring-web/src/main/java/org/springframework/http/package-info.java
index 04fddd7d6e7b..8c8e6c19f41b 100644
--- a/spring-web/src/main/java/org/springframework/http/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/package-info.java
@@ -3,6 +3,8 @@
* the {@code HttpInputMessage} and {@code HttpOutputMessage} interfaces.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/server/package-info.java b/spring-web/src/main/java/org/springframework/http/server/package-info.java
index 76ef93911b44..8c7e71cd98ec 100644
--- a/spring-web/src/main/java/org/springframework/http/server/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/server/package-info.java
@@ -4,6 +4,8 @@
* as well as a Servlet-based implementation of these interfaces.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java b/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java
index dcc0eb8f2d89..f2025bc49324 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java
@@ -8,6 +8,8 @@
* including Servlet 3.1 containers, Netty + Reactor IO, and Undertow.
*/
@NonNullApi
+@NonNullFields
package org.springframework.http.server.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
index bdb8b0e9d028..2ed8a37dab47 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
@@ -8,6 +8,8 @@
* Hessian website
*/
@NonNullApi
+@NonNullFields
package org.springframework.remoting.caucho;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
index 1409b7b04997..e0dfd03aa651 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
@@ -9,6 +9,8 @@
* which is its main advantage compared to RMI.
*/
@NonNullApi
+@NonNullFields
package org.springframework.remoting.httpinvoker;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
index e8f54f881020..6dc1423ab67d 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
@@ -4,6 +4,8 @@
* factories for accessing JAX-WS services and ports.
*/
@NonNullApi
+@NonNullFields
package org.springframework.remoting.jaxws;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/accept/package-info.java b/spring-web/src/main/java/org/springframework/web/accept/package-info.java
index 111a11ed3e32..928dca73b775 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/package-info.java
@@ -13,6 +13,8 @@
* ore more of the above strategies in a specific order.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.accept;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/package-info.java
index 73ccba5ce4a8..fb7e6cc76f61 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/package-info.java
@@ -3,6 +3,8 @@
* as well as for binding request parameters to method arguments.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.bind.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/package-info.java
index c0b9c54c8121..7b87239b23ca 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/package-info.java
@@ -2,6 +2,8 @@
* Provides web-specific data binding functionality.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.bind;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/package-info.java b/spring-web/src/main/java/org/springframework/web/bind/support/package-info.java
index 2731b4f63864..c55741fc04f2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/package-info.java
@@ -2,6 +2,8 @@
* Support classes for web data binding.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.bind.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/client/package-info.java b/spring-web/src/main/java/org/springframework/web/client/package-info.java
index 56cccb4c7e66..0b20179c445f 100644
--- a/spring-web/src/main/java/org/springframework/web/client/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/client/package-info.java
@@ -3,6 +3,8 @@
* Provides a RestTemplate class and various callback interfaces.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/client/support/package-info.java b/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
index b617229b2d04..ba9c45a63fe6 100644
--- a/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
@@ -3,6 +3,8 @@
* Contains a base class for RestTemplate usage.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.client.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/context/annotation/package-info.java b/spring-web/src/main/java/org/springframework/web/context/annotation/package-info.java
index b56cc70a480f..a339a8b0e5ff 100644
--- a/spring-web/src/main/java/org/springframework/web/context/annotation/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/context/annotation/package-info.java
@@ -2,6 +2,8 @@
* Provides convenience annotations for web scopes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.context.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/context/package-info.java b/spring-web/src/main/java/org/springframework/web/context/package-info.java
index b00b31383a79..01aa3900014a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/context/package-info.java
@@ -3,6 +3,8 @@
* and the ContextLoaderListener that bootstraps a root web application context.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.context;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/package-info.java b/spring-web/src/main/java/org/springframework/web/context/request/package-info.java
index 260664380863..ed3aae5f0b76 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/package-info.java
@@ -3,6 +3,8 @@
* scoping of application objects per HTTP request or HTTP session.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.context.request;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/package-info.java b/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
index 7090f6542952..78999b0c42be 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
@@ -3,6 +3,8 @@
* such as WebApplicationContext implementations and various utility classes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.context.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/cors/package-info.java b/spring-web/src/main/java/org/springframework/web/cors/package-info.java
index 0fb2394c1d75..3c92402aed24 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/package-info.java
@@ -3,6 +3,8 @@
* based on a common {@code CorsProcessor} strategy.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.cors;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/package-info.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/package-info.java
index 4f9bbeacf298..0cca26c2a03d 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/reactive/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/package-info.java
@@ -3,6 +3,8 @@
* based on a common {@code CorsProcessor} strategy.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.cors.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/package-info.java b/spring-web/src/main/java/org/springframework/web/filter/package-info.java
index e48b8b4445e6..d54e7e3d3fd8 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/package-info.java
@@ -2,6 +2,8 @@
* Provides generic filter base classes allowing for bean-style configuration.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.filter;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/package-info.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/package-info.java
index 5dfc7049b6df..23a7beb13a24 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/reactive/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/package-info.java
@@ -3,6 +3,8 @@
* reactive web applications.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.filter.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java b/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
index 82afe98ca20d..2ce617b9ae81 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
@@ -3,6 +3,8 @@
* which is hosted in a Spring root WebApplicationContext.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.jsf.el;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/package-info.java b/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
index 5063eaef05e4..53bfeb3e1af4 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
@@ -6,6 +6,8 @@
* from JSF EL expressions, for example in property values of JSF-managed beans.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.jsf;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/package-info.java b/spring-web/src/main/java/org/springframework/web/method/annotation/package-info.java
index 46582f234871..0a15dd473fb2 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/package-info.java
@@ -2,6 +2,8 @@
* Support classes for annotation-based handler method processing.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.method.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/method/package-info.java b/spring-web/src/main/java/org/springframework/web/method/package-info.java
index 6e13a6e5e667..772e1ec8a093 100644
--- a/spring-web/src/main/java/org/springframework/web/method/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/method/package-info.java
@@ -3,6 +3,8 @@
* Spring MVC's {@code org.springframework.web.servlet.mvc.method} package.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.method;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/package-info.java b/spring-web/src/main/java/org/springframework/web/method/support/package-info.java
index 379e75e05300..4d4de4a0572e 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/package-info.java
@@ -2,6 +2,8 @@
* Generic support classes for handler method processing.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.method.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
index 3021c8c629b7..15ca91677785 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
@@ -3,6 +3,8 @@
* Apache Commons FileUpload.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.multipart.commons;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/package-info.java
index 906d5c8585ca..8620295ce9bc 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/package-info.java
@@ -5,6 +5,8 @@
* for accessing multipart files in web application code.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.multipart;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/support/package-info.java
index 234f6b44535c..776fdfcf0b0e 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/package-info.java
@@ -4,6 +4,8 @@
* for multipart handling without Spring's Web MVC.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.multipart.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/package-info.java b/spring-web/src/main/java/org/springframework/web/package-info.java
index 4780c3f8896e..dd944f1f0a72 100644
--- a/spring-web/src/main/java/org/springframework/web/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/package-info.java
@@ -3,6 +3,8 @@
* between Spring's web infrastructure and other framework modules.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/package-info.java b/spring-web/src/main/java/org/springframework/web/server/adapter/package-info.java
index 51c295df38e3..13828629a520 100644
--- a/spring-web/src/main/java/org/springframework/web/server/adapter/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/server/adapter/package-info.java
@@ -4,6 +4,8 @@
* and {@link org.springframework.http.server.reactive.HttpHandler}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.server.adapter;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/package-info.java b/spring-web/src/main/java/org/springframework/web/server/handler/package-info.java
index 091e1784db21..25dc942f1e76 100644
--- a/spring-web/src/main/java/org/springframework/web/server/handler/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/server/handler/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.web.server.handler.WebHandlerDecorator}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.server.handler;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/server/i18n/package-info.java b/spring-web/src/main/java/org/springframework/web/server/i18n/package-info.java
index ae3a98af0441..c7724d0e0b2d 100644
--- a/spring-web/src/main/java/org/springframework/web/server/i18n/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/server/i18n/package-info.java
@@ -3,6 +3,8 @@
* Provides standard LocaleContextResolver implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.server.i18n;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/server/package-info.java b/spring-web/src/main/java/org/springframework/web/server/package-info.java
index fbe43f7b5226..603079df2562 100644
--- a/spring-web/src/main/java/org/springframework/web/server/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/server/package-info.java
@@ -5,6 +5,8 @@
* WebHandler, WebFilter, WebSession among others.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/server/session/package-info.java b/spring-web/src/main/java/org/springframework/web/server/session/package-info.java
index 46fdc33681bc..9df7670c7013 100644
--- a/spring-web/src/main/java/org/springframework/web/server/session/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/server/session/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.web.server.WebSession} support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.server.session;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/util/package-info.java b/spring-web/src/main/java/org/springframework/web/util/package-info.java
index 58b929516317..1f9c37a7a52d 100644
--- a/spring-web/src/main/java/org/springframework/web/util/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/util/package-info.java
@@ -3,6 +3,8 @@
* Log4j initialization, and cookie handling.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.util;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/package-info.java b/spring-web/src/main/java/org/springframework/web/util/pattern/package-info.java
index 3238a590cf69..2f593e383f5b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/package-info.java
@@ -7,6 +7,8 @@
* used for matching purposes at request time.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.util.pattern;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/package-info.java
index 498eca8b8cc4..a9693904f158 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/package-info.java
@@ -4,6 +4,8 @@
* given request.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.accept;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java
index 03cf147d9c62..9722fd8a1448 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java
@@ -2,6 +2,8 @@
* Spring WebFlux configuration infrastructure.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.config;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/package-info.java
index 807c9ef4535c..7c67791d7c17 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/package-info.java
@@ -4,6 +4,8 @@
* {@code org.springframework.http.client.reactive} reactive HTTP adapter layer.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.function.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/package-info.java
index 7a6dd1f8e12d..b7ef8b31baa6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/package-info.java
@@ -2,6 +2,8 @@
* Provides a foundation for both the reactive client and server subpackages.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.function;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
index fefa00347803..f790316d7269 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
@@ -2,6 +2,8 @@
* Provides the types that make up Spring's functional web framework.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.function.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
index fa7cd76c9225..e37801240503 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
@@ -5,6 +5,8 @@
* a {@code ServerRequest} wrapper to adapt a request.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.function.server.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/package-info.java
index 94524fb6652d..061a4179c41f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/package-info.java
@@ -2,6 +2,8 @@
* Provides HandlerMapping implementations including abstract base classes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.handler;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java
index 55bd9d94b994..549793e0e97b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java
@@ -10,6 +10,8 @@
* {@code WebClient} as well as client and server, reactive WebSocket support.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/package-info.java
index 1b4c914d2c4c..b5baa18e0aea 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/package-info.java
@@ -2,6 +2,8 @@
* Support classes for serving static resources.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.resource;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java
index 658110927d0c..01e8df69bd5b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java
@@ -2,6 +2,8 @@
* Infrastructure for annotation-based handler method processing.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.result.method.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/package-info.java
index 7f281fd83dc9..e5bbb0c70375 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/package-info.java
@@ -2,6 +2,8 @@
* Infrastructure for handler method processing.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.result.method;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/package-info.java
index ad053e24e198..49f08e4f4319 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/package-info.java
@@ -5,6 +5,8 @@
* resolution, and so on.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.result;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/package-info.java
index b932889b6f97..311ce0092484 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/package-info.java
@@ -5,6 +5,8 @@
* Contains a View implementation for FreeMarker templates.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.result.view.freemarker;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/package-info.java
index 238f9cbbb071..bb7678f221ed 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/package-info.java
@@ -2,6 +2,8 @@
* Support for result handling through view resolution.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.result.view;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java
index 6f155192aea3..268b1dbe7351 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java
@@ -4,6 +4,8 @@
* Contains a View implementation for scripted templates.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.result.view.script;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java
index 47a1bd6aa2fa..825473c9bbd7 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java
@@ -2,6 +2,8 @@
* Classes adapting Spring's Reactive WebSocket API to and from WebSocket runtimes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.socket.adapter;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/package-info.java
index 4ad4dbea74a7..e6087f8b245e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/package-info.java
@@ -2,6 +2,8 @@
* Client support for WebSocket interactions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.socket.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/package-info.java
index 38e53ece1ee8..d45db5f96c4a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/package-info.java
@@ -2,6 +2,8 @@
* Abstractions and support classes for reactive WebSocket interactions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.socket;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/package-info.java
index 7c53cdd73b08..3e9b796483fd 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/package-info.java
@@ -2,6 +2,8 @@
* Server support for WebSocket interactions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.socket.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java
index 17e4ed81f1f6..e9455e38ec4b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java
@@ -2,6 +2,8 @@
* Server-side support classes for WebSocket requests.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.socket.server.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java
index 0b1cc54e8afe..13b172cb23a8 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.web.reactive.socket.server.RequestUpgradeStrategy}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.socket.server.upgrade;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java
index d979bd71a1f9..c053fc388a58 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java
@@ -2,6 +2,8 @@
* Support classes for Spring WebFlux setup.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.reactive.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java
index 9c99c473833d..8d9339ca555e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java
@@ -2,6 +2,8 @@
* Annotation-based setup for Spring MVC.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.config.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/package-info.java
index 29c110b010fa..45180017f3ad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/package-info.java
@@ -2,6 +2,8 @@
* Defines the XML configuration namespace for Spring MVC.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.config;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/package-info.java
index b4eec2d094f6..6574f474fd64 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/package-info.java
@@ -3,6 +3,8 @@
* including abstract base classes for custom implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.handler;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/package-info.java
index 7ba5d0ca41c4..5a2290e8bec3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/package-info.java
@@ -4,6 +4,8 @@
* and a HandlerInterceptor for locale changes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.i18n;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java
index a1572226f989..54698d04e4a0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/package-info.java
@@ -2,6 +2,8 @@
* Support package for annotation-based Servlet MVC controllers.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.mvc.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
index d8e5ccdd7fab..28d35d952e9c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
@@ -2,6 +2,8 @@
* Common MVC logic for matching incoming requests based on conditions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.mvc.condition;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
index 54c61e6a9eab..90c9c46fb5d4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
@@ -5,6 +5,8 @@
* and {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.mvc.method.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
index 8ba7aa6f1261..372a55d33fa2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
@@ -3,6 +3,8 @@
* building on the {@code org.springframework.web.method} package.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.mvc.method;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
index 0bfa4e40d10a..b6ceb3946373 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
@@ -3,6 +3,8 @@
* Spring. Provides various controller styles, including an annotation-based model.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.mvc;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java
index 07460be108bc..e9c3ee71b8de 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/package-info.java
@@ -3,6 +3,8 @@
* Contains a special HandlerMapping for controller conventions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.mvc.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
index 359de4aa57b6..fc75176abe8d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
@@ -8,6 +8,8 @@
* by Rod Johnson (Wrox, 2002).
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/package-info.java
index 89c174b3c622..720ebf1338f0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/package-info.java
@@ -2,6 +2,8 @@
* Support classes for serving static resources.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.resource;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
index ac384bde84dc..39d4c2153f4b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
@@ -4,6 +4,8 @@
* and miscellaneous HandlerInterceptor implementations.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
index 467feafe30c5..3641692c5e30 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
@@ -4,6 +4,8 @@
* See {@code spring.tld} for descriptions of the various tags.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.tags;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
index b4ff12b15d6e..5db3592c65d4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
@@ -18,6 +18,8 @@
*
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.theme;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/package-info.java
index c074a1f04bac..be5aa37be713 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/package-info.java
@@ -3,6 +3,8 @@
* providing View implementations for PDF and Excel.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.document;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
index 6ac449575feb..201a5ef92582 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
@@ -3,6 +3,8 @@
* Based on the ROME tools project.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.feed;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
index e7cfa6f28a02..b1638eb79625 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
@@ -5,6 +5,8 @@
* Contains a View implementation for FreeMarker templates.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.freemarker;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/package-info.java
index 48600573def6..b7277bc3433a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/package-info.java
@@ -5,6 +5,8 @@
* Contains a View implementation for Groovy templates.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.groovy;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/package-info.java
index f3a8077e506e..6475174e4fdc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/package-info.java
@@ -2,6 +2,8 @@
* Support classes for providing a View implementation based on JSON serialization.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.json;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
index 63a3bb554d22..d165c4726abb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
@@ -9,6 +9,8 @@
* very helpful if an application has unusual view requirements.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/package-info.java
index 4d01c8d4ced9..c03f16104e8b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/package-info.java
@@ -4,6 +4,8 @@
* Contains a View implementation for scripted templates.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.script;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
index 9905c3fe0ad1..c948a0562d3c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
@@ -5,6 +5,8 @@
* Contains a View implementation for Tiles definitions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.tiles3;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/package-info.java
index fe2e02812696..75ddc3c6facb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/package-info.java
@@ -2,6 +2,8 @@
* Support classes for providing a View implementation based on XML Marshalling.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.xml;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java
index aad6d7708390..5b70d34413ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/package-info.java
@@ -3,6 +3,8 @@
* providing a View implementation for XSLT stylesheets.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.servlet.view.xslt;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/package-info.java
index 8d4d0c71b98d..b86296e05ae4 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/package-info.java
@@ -2,6 +2,8 @@
* Adapter classes for the Jetty WebSocket API.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.adapter.jetty;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/package-info.java
index b049cd800519..624d7092d038 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/package-info.java
@@ -2,6 +2,8 @@
* Classes adapting Spring's WebSocket API to and from WebSocket providers.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.adapter;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/package-info.java
index 752d7f9b5ac3..26d1c4b67bf2 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/package-info.java
@@ -2,6 +2,8 @@
* Adapter classes for the standard Java WebSocket API.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.adapter.standard;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/package-info.java
index 6aeae7bd114c..c970db9920c6 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/package-info.java
@@ -2,6 +2,8 @@
* Client-side support for the Jetty WebSocket API.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.client.jetty;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/package-info.java
index 7c946ac39537..9cd4a9a1eaad 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/package-info.java
@@ -2,6 +2,8 @@
* Client-side abstractions for WebSocket applications.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/package-info.java
index 90ceabc8bbad..6bfe258f8b9c 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/package-info.java
@@ -2,6 +2,8 @@
* Client-side classes for use with standard Java WebSocket endpoints.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.client.standard;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/package-info.java
index bf6f75ff811e..ff5b8d4df384 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/package-info.java
@@ -2,6 +2,8 @@
* Support for annotation-based WebSocket setup in configuration classes.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.config.annotation;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java
index aa058da84d91..cd75a81bd0af 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java
@@ -2,6 +2,8 @@
* Configuration support for WebSocket request handling.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.config;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/package-info.java
index 59c0a5f1c680..75a9f0b11b76 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/package-info.java
@@ -3,6 +3,8 @@
* implementations and decorators.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.handler;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/package-info.java
index 32c467490447..c3577b38adb8 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/package-info.java
@@ -2,6 +2,8 @@
* WebSocket integration for Spring's messaging module.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.messaging;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/package-info.java
index 43f91f240ad1..b722de650c43 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/package-info.java
@@ -2,6 +2,8 @@
* Common abstractions and Spring configuration support for WebSocket applications.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/package-info.java
index 661a229943e5..2d31c5d00a7a 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/package-info.java
@@ -2,6 +2,8 @@
* Server-side abstractions for WebSocket interactions.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.server;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/package-info.java
index c3a89fe2b54a..543b82e31a5a 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/package-info.java
@@ -2,6 +2,8 @@
* Server-side classes for use with standard JSR-356 WebSocket endpoints.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.server.standard;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/package-info.java
index 571d87ca514a..a934a4ce68e0 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/package-info.java
@@ -3,6 +3,8 @@
* for upgrading a request.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.server.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/package-info.java
index b47686b0ed05..98649863b9de 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.web.socket.client.WebSocketClient}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs.client;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/package-info.java
index ed627794e741..2a9ee16f3724 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/package-info.java
@@ -3,6 +3,8 @@
* of SockJS message frames.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs.frame;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/package-info.java
index 319738f50edc..747b03a82309 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/package-info.java
@@ -2,6 +2,8 @@
* Top-level SockJS types.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/package-info.java
index 4bed57e4d64c..32ffbaa41cc3 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/package-info.java
@@ -4,6 +4,8 @@
* implementation.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs.support;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/package-info.java
index 4063304df4b3..89c181fc1cc7 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/package-info.java
@@ -4,6 +4,8 @@
* {@link org.springframework.web.socket.sockjs.SockJsService}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs.transport.handler;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/package-info.java
index 75f119156460..71ac15182e45 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/package-info.java
@@ -7,6 +7,8 @@
* {@link org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs.transport;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/package-info.java
index 7aeb37495c8f..4db0aaa2c110 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/package-info.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/package-info.java
@@ -3,6 +3,8 @@
* {@link org.springframework.web.socket.WebSocketSession}.
*/
@NonNullApi
+@NonNullFields
package org.springframework.web.socket.sockjs.transport.session;
import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/src/docs/asciidoc/core.adoc b/src/docs/asciidoc/core.adoc
index 79d264038385..212ee519b9e2 100644
--- a/src/docs/asciidoc/core.adoc
+++ b/src/docs/asciidoc/core.adoc
@@ -31,3 +31,5 @@ include::core/core-aop.adoc[leveloffset=+1]
include::core/core-aop-api.adoc[leveloffset=+1]
+include::core/core-null-safety.adoc[leveloffset=+1]
+
diff --git a/src/docs/asciidoc/core/core-null-safety.adoc b/src/docs/asciidoc/core/core-null-safety.adoc
new file mode 100644
index 000000000000..ec502101258e
--- /dev/null
+++ b/src/docs/asciidoc/core/core-null-safety.adoc
@@ -0,0 +1,53 @@
+[[null-safety]]
+= Null-safety
+
+Although Java does not allow to express null-safety with its type system, Spring Framework
+now provides annotations declared in the `org.springframework.lang` package to declare
+nullability of APIs and fields.
+
+Spring Framework leverages these annotations, but they can also be used in any Spring based
+Java project to declare null-safe APIs and optionally null-safe fields. Nullability of
+types used inside method bodies is outside of the scope of this feature.
+
+These annotations are meta-annotated with https://jcp.org/en/jsr/detail?id=305[JSR 305]
+annotations (a dormant JSR but supported by tools like IntelliJ IDEA) to provide useful
+warnings to Java developers related to null-safety in order to avoid `NullPointerException`
+at runtime. JSR 305 meta-annotations allows tooling vendors to provide null-safety support
+in a generic way, without having to hard-code support for Spring annotations.
+
+They are also used by Kotlin which supports natively
+https://kotlinlang.org/docs/reference/null-safety.html[null-safety]. By default, types from
+Java APIs used in Kotlin are recognized as
+https://kotlinlang.org/docs/reference/java-interop.html#null-safety-and-platform-types[platform types]
+for which null-checks are relaxed.
+https://github.com/Kotlin/KEEP/blob/jsr-305/proposals/jsr-305-custom-nullability-qualifiers.md[Kotlin support for JSR 305 annotations]
++ Spring nullability annotations provide null-safety for the whole Spring Framework API to Kotlin developers,
+with the advantage of dealing with `null` related issues at compile time rather than bumping into the famous
+`NullPointerException` at runtime. More details are available in <