From 9cedcd65ef9db17fdc1e1a02a2296f42d98647f2 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 11 Mar 2026 16:34:46 +0100 Subject: [PATCH] Polishing --- .../ClassFileAnnotationDelegate.java | 2 +- .../ClassFileAnnotationMetadata.java | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationDelegate.java b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationDelegate.java index 79c56155697..edc25f6937c 100644 --- a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationDelegate.java +++ b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationDelegate.java @@ -171,7 +171,7 @@ abstract class ClassFileAnnotationDelegate { } - record Source(Annotation entryName) { + record Source(Annotation annotation) { } } diff --git a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java index 95d3981d84c..929535f6fbe 100644 --- a/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java +++ b/spring-core/src/main/java24/org/springframework/core/type/classreading/ClassFileAnnotationMetadata.java @@ -145,8 +145,7 @@ final class ClassFileAnnotationMetadata implements AnnotationMetadata { public Set getAnnotationTypes() { Set annotationTypes = this.annotationTypes; if (annotationTypes == null) { - annotationTypes = Collections.unmodifiableSet( - AnnotationMetadata.super.getAnnotationTypes()); + annotationTypes = Collections.unmodifiableSet(AnnotationMetadata.super.getAnnotationTypes()); this.annotationTypes = annotationTypes; } return annotationTypes; @@ -171,7 +170,8 @@ final class ClassFileAnnotationMetadata implements AnnotationMetadata { @Override public boolean equals(@Nullable Object other) { - return (this == other || (other instanceof ClassFileAnnotationMetadata that && this.className.equals(that.className))); + return (this == other || (other instanceof ClassFileAnnotationMetadata that && + this.className.equals(that.className))); } @Override @@ -259,11 +259,13 @@ final class ClassFileAnnotationMetadata implements AnnotationMetadata { void enclosingClass(ClassEntry thisClass) { String thisClassName = thisClass.name().stringValue(); int currentClassIndex = thisClassName.lastIndexOf('$'); - this.enclosingClassName = ClassUtils.convertResourcePathToClassName(thisClassName.substring(0, currentClassIndex)); + this.enclosingClassName = ClassUtils.convertResourcePathToClassName( + thisClassName.substring(0, currentClassIndex)); } void superClass(Superclass superClass) { - this.superClassName = ClassUtils.convertResourcePathToClassName(superClass.superclassEntry().name().stringValue()); + this.superClassName = ClassUtils.convertResourcePathToClassName( + superClass.superclassEntry().name().stringValue()); } void interfaces(Interfaces interfaces) { @@ -300,9 +302,11 @@ final class ClassFileAnnotationMetadata implements AnnotationMetadata { } ClassFileAnnotationMetadata build() { - boolean independentInnerClass = (this.enclosingClassName != null) && this.innerAccessFlags.contains(AccessFlag.STATIC); - return new ClassFileAnnotationMetadata(this.className, this.accessFlags, this.enclosingClassName, this.superClassName, - independentInnerClass, this.interfaceNames, this.memberClassNames, this.declaredMethods, this.mergedAnnotations); + boolean independentInnerClass = (this.enclosingClassName != null) && + this.innerAccessFlags.contains(AccessFlag.STATIC); + return new ClassFileAnnotationMetadata(this.className, this.accessFlags, this.enclosingClassName, + this.superClassName, independentInnerClass, this.interfaceNames, this.memberClassNames, + this.declaredMethods, this.mergedAnnotations); } }