root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Short circuit if-conditions in AttributeMethods

This commit is contained in:
Sam Brannen 2022-02-11 20:41:23 +01:00
parent eca755ec88
commit 4eaee1e738
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 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.
@ -32,6 +32,7 @@ import org.springframework.util.ReflectionUtils;
* with consistent ordering as well as a few useful utility methods.
*
* @author Phillip Webb
* @author Sam Brannen
* @since 5.2
*/
final class AttributeMethods {
@ -71,10 +72,10 @@ final class AttributeMethods {
for (int i = 0; i < attributeMethods.length; i++) {
Method method = this.attributeMethods[i];
Class<?> type = method.getReturnType();
if (method.getDefaultValue() != null) {
if (!foundDefaultValueMethod && (method.getDefaultValue() != null)) {
foundDefaultValueMethod = true;
}
if (type.isAnnotation() || (type.isArray() && type.getComponentType().isAnnotation())) {
if (!foundNestedAnnotation && (type.isAnnotation() || (type.isArray() && type.getComponentType().isAnnotation()))) {
foundNestedAnnotation = true;
}
ReflectionUtils.makeAccessible(method);