Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check that nullable annotations are from org.springframework.lang

Browse Source 
Fix a few incorrect nullable annotation imports and add a checkstyle
rule to ensure they don't return.

Closes gh-28410
This commit is contained in:
Phillip Webb
2022-05-03 11:09:14 -07:00
parent 68bb4023eb
commit 63b129a3f7
12 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package org.aopalliance.intercept;
import javax.annotation.Nonnull;
import org.springframework.lang.NonNull;
/**
* Intercepts the construction of a new object.
@@ -56,7 +56,7 @@ public interface ConstructorInterceptor extends Interceptor {
* @throws Throwable if the interceptors or the target object
* throws an exception
*/
@Nonnull
@NonNull
Object construct(ConstructorInvocation invocation) throws Throwable;
}

6
spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.aopalliance.intercept;
import java.lang.reflect.Constructor;
import javax.annotation.Nonnull;
import org.springframework.lang.NonNull;
/**
* Description of an invocation to a constructor, given to an
@@ -38,7 +38,7 @@ public interface ConstructorInvocation extends Invocation {
* {@link Joinpoint#getStaticPart()} method (same result).
* @return the constructor being called
*/
@Nonnull
@NonNull
Constructor<?> getConstructor();
}

6
spring-aop/src/main/java/org/aopalliance/intercept/Invocation.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package org.aopalliance.intercept;
import javax.annotation.Nonnull;
import org.springframework.lang.NonNull;
/**
* This interface represents an invocation in the program.
@@ -34,7 +34,7 @@ public interface Invocation extends Joinpoint {
* array to change the arguments.
* @return the argument of the invocation
*/
@Nonnull
@NonNull
Object[] getArguments();
}

8
spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package org.aopalliance.intercept;
import java.lang.reflect.AccessibleObject;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
/**
* This interface represents a generic runtime joinpoint (in the AOP
@@ -65,7 +65,7 @@ public interface Joinpoint {
* <p>The static part is an accessible object on which a chain of
* interceptors are installed.
*/
@Nonnull
@NonNull
AccessibleObject getStaticPart();
}

8
spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
package org.aopalliance.intercept;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
/**
* Intercepts calls on an interface on its way to the target. These
@@ -56,6 +56,6 @@ public interface MethodInterceptor extends Interceptor {
* throws an exception
*/
@Nullable
Object invoke(@Nonnull MethodInvocation invocation) throws Throwable;
Object invoke(@NonNull MethodInvocation invocation) throws Throwable;
}

6
spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.aopalliance.intercept;
import java.lang.reflect.Method;
import javax.annotation.Nonnull;
import org.springframework.lang.NonNull;
/**
* Description of an invocation to a method, given to an interceptor
@@ -38,7 +38,7 @@ public interface MethodInvocation extends Invocation {
* {@link Joinpoint#getStaticPart()} method (same result).
* @return the method being called
*/
@Nonnull
@NonNull
Method getMethod();
}