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

Missing @Nullable annotations for findAnnotation/getValue/getDefaultValue

Browse Source 
Note that synthesizeAnnotation has an assertion now, keeping its non-null policy.

Issue: SPR-15642
This commit is contained in:
Juergen Hoeller
2017-06-08 10:35:54 +02:00
parent 72cd24446d
commit e6f1950952
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
View File

@@ -531,7 +531,7 @@ public abstract class AnnotationUtils {
*/
@SuppressWarnings("unchecked")
@Nullable
public static <A extends Annotation> A findAnnotation(Method method, Class<A> annotationType) {
public static <A extends Annotation> A findAnnotation(Method method, @Nullable Class<A> annotationType) {
Assert.notNull(method, "Method must not be null");
if (annotationType == null) {
return null;
@@ -656,7 +656,9 @@ public abstract class AnnotationUtils {
*/
@SuppressWarnings("unchecked")
@Nullable
private static <A extends Annotation> A findAnnotation(Class<?> clazz, Class<A> annotationType, boolean synthesize) {
private static <A extends Annotation> A findAnnotation(
Class<?> clazz, @Nullable Class<A> annotationType, boolean synthesize) {
Assert.notNull(clazz, "Class must not be null");
if (annotationType == null) {
return null;
@@ -1316,7 +1318,7 @@ public abstract class AnnotationUtils {
* @see #rethrowAnnotationConfigurationException(Throwable)
*/
@Nullable
public static Object getValue(Annotation annotation, String attributeName) {
public static Object getValue(@Nullable Annotation annotation, @Nullable String attributeName) {
if (annotation == null || !StringUtils.hasText(attributeName)) {
return null;
}
@@ -1356,7 +1358,7 @@ public abstract class AnnotationUtils {
* @see #getDefaultValue(Class, String)
*/
@Nullable
public static Object getDefaultValue(Annotation annotation, String attributeName) {
public static Object getDefaultValue(@Nullable Annotation annotation, @Nullable String attributeName) {
if (annotation == null) {
return null;
}
@@ -1384,7 +1386,9 @@ public abstract class AnnotationUtils {
* @see #getDefaultValue(Annotation, String)
*/
@Nullable
public static Object getDefaultValue(Class<? extends Annotation> annotationType, String attributeName) {
public static Object getDefaultValue(
@Nullable Class<? extends Annotation> annotationType, @Nullable String attributeName) {
if (annotationType == null || !StringUtils.hasText(attributeName)) {
return null;
}
@@ -1440,7 +1444,8 @@ public abstract class AnnotationUtils {
@SuppressWarnings("unchecked")
static <A extends Annotation> A synthesizeAnnotation(A annotation, @Nullable Object annotatedElement) {
if (annotation == null || annotation instanceof SynthesizedAnnotation) {
Assert.notNull(annotation, "Annotation must not be null");
if (annotation instanceof SynthesizedAnnotation) {
return annotation;
}