From 4a7c24d90f25bae4df97f06e8fc39ed1b479a3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 5 Apr 2024 14:11:33 +0200 Subject: [PATCH] Refine null-safety See gh-32475 --- .../org/springframework/aop/target/LazyInitTargetSource.java | 1 - .../beans/factory/config/AbstractFactoryBean.java | 1 - .../org/springframework/expression/ExpressionException.java | 4 ---- 3 files changed, 6 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 index 746a317f5771..e69a01842e00 100644 --- 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 index 4550843e3654..7715f33faa6b 100644 --- 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,6 @@ public void afterPropertiesSet() throws Exception { * @see #getEarlySingletonInterfaces() */ @Override - @Nullable public final T getObject() throws Exception { if (isSingleton()) { return (this.initialized ? this.singletonInstance : getEarlySingletonInstance()); diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java index 42f8ffa47146..0b63adb694c6 100644 --- 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,6 @@ public String toDetailedString() { * that caused the failure. * @since 4.0 */ - @Nullable public String getSimpleMessage() { return super.getMessage(); }