From 57f961e36beaf69951d7e92af5db1f4edae11d93 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 14 Jul 2017 15:10:20 +0200 Subject: [PATCH] No nullability declarations in AOP Alliance sources Issue: SPR-15720 --- .../src/main/java/org/aopalliance/aop/AspectException.java | 4 +--- .../java/org/aopalliance/intercept/MethodInterceptor.java | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java b/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java index 3dd556656e..c634d51a06 100644 --- a/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java +++ b/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java @@ -16,8 +16,6 @@ package org.aopalliance.aop; -import org.springframework.lang.Nullable; - /** * Superclass for all AOP infrastructure exceptions. * Unchecked, as such exceptions are fatal and end user @@ -43,7 +41,7 @@ public class AspectException extends RuntimeException { * @param message the exception message * @param cause the root cause, if any */ - public AspectException(String message, @Nullable Throwable cause) { + public AspectException(String message, Throwable cause) { super(message, cause); } diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java index a0b2be2a4d..8239b0e63b 100644 --- a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java +++ b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java @@ -16,8 +16,6 @@ package org.aopalliance.intercept; -import org.springframework.lang.Nullable; - /** * Intercepts calls on an interface on its way to the target. These * are nested "on top" of the target. @@ -54,7 +52,6 @@ public interface MethodInterceptor extends Interceptor { * @throws Throwable if the interceptors or the target object * throws an exception */ - @Nullable Object invoke(MethodInvocation invocation) throws Throwable; }