This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 67e29b9808f5009102544449710d3d58f20879ee Author: Matt Sicker <[email protected]> AuthorDate: Tue Jan 2 16:30:07 2024 -0600 Make AnnotatedAnnotation a record --- .../log4j/plugins/di/ConfigurableInstanceFactory.java | 4 ++-- .../java/org/apache/logging/log4j/plugins/di/Key.java | 2 +- .../java/org/apache/logging/log4j/plugins/di/Keys.java | 8 ++++---- .../log4j/plugins/util/AnnotatedAnnotation.java | 18 +----------------- .../logging/log4j/plugins/util/AnnotationUtil.java | 2 +- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactory.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactory.java index da7f8bb4ba..fd165fa091 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactory.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactory.java @@ -170,9 +170,9 @@ public interface ConfigurableInstanceFactory extends InstanceFactory { private <A extends Annotation> ConstraintValidator<A> initialize( final AnnotatedAnnotation<A, Constraint> constraint) { final Class<? extends ConstraintValidator<A>> validatorType = - Cast.cast(constraint.getMetaAnnotation().value()); + Cast.cast(constraint.metaAnnotation().value()); final ConstraintValidator<A> validator = getInstance(validatorType); - validator.initialize(constraint.getAnnotation()); + validator.initialize(constraint.annotation()); return validator; } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Key.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Key.java index 6c39d42ff4..3e3f8ac1a4 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Key.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Key.java @@ -375,7 +375,7 @@ public class Key<T> implements StringBuilderFormattable, Comparable<Key<T>> { private static @Nullable Class<? extends Annotation> getQualifierType(final AnnotatedElement element) { return AnnotationUtil.findAnnotatedAnnotations(element, QualifierType.class) - .map(annotatedAnnotation -> annotatedAnnotation.getAnnotation().annotationType()) + .map(annotatedAnnotation -> annotatedAnnotation.annotation().annotationType()) .findFirst() .orElse(null); } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Keys.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Keys.java index 7e363c4b17..eae50f183b 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Keys.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Keys.java @@ -155,9 +155,9 @@ public final class Keys { private static <A extends Annotation> Optional<String> getSpecifiedName( final AnnotatedAnnotation<A, NameProvider> annotatedAnnotation) { final Class<? extends AnnotatedElementNameProvider<A>> providerType = - Cast.cast(annotatedAnnotation.getMetaAnnotation().value()); + Cast.cast(annotatedAnnotation.metaAnnotation().value()); final AnnotatedElementNameProvider<A> provider = ReflectionUtil.instantiate(providerType); - return provider.getSpecifiedName(annotatedAnnotation.getAnnotation()); + return provider.getSpecifiedName(annotatedAnnotation.annotation()); } public static Collection<String> getAliases(final AnnotatedElement element) { @@ -170,8 +170,8 @@ public final class Keys { private static <A extends Annotation> Collection<String> getAliases( final AnnotatedAnnotation<A, AliasesProvider> annotatedAnnotation) { final Class<? extends AnnotatedElementAliasesProvider<A>> providerType = - Cast.cast(annotatedAnnotation.getMetaAnnotation().value()); + Cast.cast(annotatedAnnotation.metaAnnotation().value()); final AnnotatedElementAliasesProvider<A> provider = ReflectionUtil.instantiate(providerType); - return provider.getAliases(annotatedAnnotation.getAnnotation()); + return provider.getAliases(annotatedAnnotation.annotation()); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotatedAnnotation.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotatedAnnotation.java index 746dfc625c..31ba92aa29 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotatedAnnotation.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotatedAnnotation.java @@ -25,20 +25,4 @@ import java.lang.annotation.Annotation; * @param <A> annotation type * @param <M> meta-annotation type */ -public class AnnotatedAnnotation<A extends Annotation, M extends Annotation> { - private final A annotation; - private final M metaAnnotation; - - public AnnotatedAnnotation(final A annotation, final M metaAnnotation) { - this.annotation = annotation; - this.metaAnnotation = metaAnnotation; - } - - public A getAnnotation() { - return annotation; - } - - public M getMetaAnnotation() { - return metaAnnotation; - } -} +public record AnnotatedAnnotation<A extends Annotation, M extends Annotation>(A annotation, M metaAnnotation) {} diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotationUtil.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotationUtil.java index 832650df0a..0199eed57d 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotationUtil.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotationUtil.java @@ -56,7 +56,7 @@ public final class AnnotationUtil { public static Annotation getElementAnnotationHavingMetaAnnotation( final AnnotatedElement element, final Class<? extends Annotation> metaAnnotation) { return findAnnotatedAnnotations(element, metaAnnotation) - .map(AnnotatedAnnotation::getAnnotation) + .map(AnnotatedAnnotation::annotation) .findFirst() .orElse(null); }
