diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java index 2bbdf5ca715..1f22b16a3cd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java @@ -344,7 +344,7 @@ public class DefaultPersistenceUnitManager * persistence provider, resolving data source names in {@code persistence.xml} * against Spring-managed DataSource instances. */ - public @Nullable DataSourceLookup getDataSourceLookup() { + public DataSourceLookup getDataSourceLookup() { return this.dataSourceLookup; } diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java index 32cc3645921..b03cf182c63 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java @@ -275,7 +275,7 @@ public abstract class TestContextTransactionUtils { } @Override - public @Nullable String getName() { + public String getName() { return this.name; } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java index 624fd0ce493..62c97b85048 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java @@ -112,9 +112,9 @@ public class RequestContext { /** * Return the model Map that this RequestContext encapsulates, if any. - * @return the populated model Map, or {@code null} if none available + * @return the populated model Map */ - public @Nullable Map getModel() { + public Map getModel() { return this.model; }