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

SPR-17074 Replace iteration over Map::ketSet with Map::entrySet

Browse Source
This commit is contained in:
stsypanov
2018-07-21 13:35:29 +03:00
committed by Juergen Hoeller
parent 3c65c17053
commit 5051850fa9
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1344,11 +1344,12 @@ public abstract class AnnotationUtils {
}
// Replace any remaining placeholders with actual default values
for (String attributeName : attributes.keySet()) {
for (Map.Entry<String, Object> attributeEntry : attributes.entrySet()) {
String attributeName = attributeEntry.getKey();
if (valuesAlreadyReplaced.contains(attributeName)) {
continue;
}
Object value = attributes.get(attributeName);
Object value = attributeEntry.getValue();
if (value instanceof DefaultValueHolder) {
value = ((DefaultValueHolder) value).defaultValue;
attributes.put(attributeName,