Browse Source

Refine null-safety

See gh-32475
pull/32864/head
Sébastien Deleuze 2 years ago
parent
commit
4a7c24d90f
  1. 1
      spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
  2. 1
      spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
  3. 4
      spring-expression/src/main/java/org/springframework/expression/ExpressionException.java

1
spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java

@ -65,7 +65,6 @@ public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource { @@ -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());

1
spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java

@ -151,7 +151,6 @@ public abstract class AbstractFactoryBean<T> @@ -151,7 +151,6 @@ public abstract class AbstractFactoryBean<T>
* @see #getEarlySingletonInterfaces()
*/
@Override
@Nullable
public final T getObject() throws Exception {
if (isSingleton()) {
return (this.initialized ? this.singletonInstance : getEarlySingletonInstance());

4
spring-expression/src/main/java/org/springframework/expression/ExpressionException.java

@ -123,8 +123,6 @@ public class ExpressionException extends RuntimeException { @@ -123,8 +123,6 @@ public class ExpressionException extends RuntimeException {
* @see #getSimpleMessage()
* @see java.lang.Throwable#getMessage()
*/
@Override
@Nullable
public String getMessage() {
return toDetailedString();
}
@ -133,7 +131,6 @@ public class ExpressionException extends RuntimeException { @@ -133,7 +131,6 @@ public class ExpressionException extends RuntimeException {
* 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 class ExpressionException extends RuntimeException { @@ -158,7 +155,6 @@ public class ExpressionException extends RuntimeException {
* that caused the failure.
* @since 4.0
*/
@Nullable
public String getSimpleMessage() {
return super.getMessage();
}

Loading…
Cancel
Save