Merge branch '6.1.x'

sdeleuze · Apr 5, 2024 · 0c42874 · 0c42874
2 parents 5253af1 + 4a7c24d
commit 0c42874
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -65,7 +65,6 @@ public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource {
 
 
  @Override
- @Nullable
  public synchronized Object getTarget() throws BeansException {
  if (this.target == null) {
  this.target = getBeanFactory().getBean(getTargetBeanName());

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
@@ -151,7 +151,7 @@ public void afterPropertiesSet() throws Exception {
  * @see #getEarlySingletonInterfaces()
  */
  @Override
- @Nullable
+ @SuppressWarnings("NullAway")
  public final T getObject() throws Exception {
  if (isSingleton()) {
  return (this.initialized ? this.singletonInstance : getEarlySingletonInstance());

diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
@@ -1112,7 +1112,6 @@ public void setObjectName(ObjectName objectName) {
  }
 
  @Override
- @Nullable
  public Object getTarget() {
  try {
  return super.getTarget();

diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
@@ -123,8 +123,6 @@ public final int getPosition() {
  * @see #getSimpleMessage()
  * @see java.lang.Throwable#getMessage()
  */
- @Override
- @Nullable
  public String getMessage() {
  return toDetailedString();
  }
@@ -133,7 +131,6 @@ public String getMessage() {
  * Return a detailed description of this exception, including the expression
  * String and position (if available) as well as the actual exception message.
  */
- @Nullable
  public String toDetailedString() {
  if (this.expressionString != null) {
  StringBuilder output = new StringBuilder();
@@ -158,7 +155,7 @@ public String toDetailedString() {
  * that caused the failure.
  * @since 4.0
  */
- @Nullable
+ @SuppressWarnings("NullAway")
  public String getSimpleMessage() {
  return super.getMessage();
  }