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

Polishing

This commit is contained in:
Sam Brannen 2022-07-07 17:48:03 +02:00
parent a68f5b1674
commit 9f7cbe1234
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
View File

@ -289,19 +289,15 @@ final class AnnotationTypeMapping {
int mapped = rootAttributes.indexOf(name); int mapped = rootAttributes.indexOf(name);
if (!MergedAnnotation.VALUE.equals(name) && mapped != -1 && !isExplicitAttributeOverride(name)) { if (!MergedAnnotation.VALUE.equals(name) && mapped != -1 && !isExplicitAttributeOverride(name)) {
String rootAnnotationTypeName = this.root.annotationType.getName(); String rootAnnotationTypeName = this.root.annotationType.getName();
// We want to avoid duplicate log warnings as much as possible, without
// fully synchronizing on the cache.
String cacheKey = rootAnnotationTypeName + "." + name; String cacheKey = rootAnnotationTypeName + "." + name;
if (!conventionBasedOverrideCheckCache.contains(cacheKey)) { // We want to avoid duplicate log warnings as much as possible, without full synchronization.
conventionBasedOverrideCheckCache.add(cacheKey); if (conventionBasedOverrideCheckCache.add(cacheKey) && logger.isWarnEnabled()) {
if (logger.isWarnEnabled()) { logger.warn("""
logger.warn(""" Support for convention-based annotation attribute overrides is \
Support for convention-based annotation attribute overrides is \ deprecated and will be removed in Spring Framework 6.1. Please \
deprecated and will be removed in Spring Framework 6.1. Please \ annotate the '%s' attribute in @%s with an appropriate @AliasFor \
annotate the '%s' attribute in @%s with an appropriate @AliasFor \ declaration."""
declaration.""" .formatted(name, rootAnnotationTypeName));
.formatted(name, rootAnnotationTypeName));
}
} }
mappings[i] = mapped; mappings[i] = mapped;
MirrorSet mirrors = getMirrorSets().getAssigned(i); MirrorSet mirrors = getMirrorSets().getAssigned(i);