This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5398f7c759ad7adba9d35c48ee3de99c9ac46508 Author: Matt Sicker <[email protected]> AuthorDate: Sun May 22 13:44:59 2022 -0500 Teach Keys::getNamespace about stereotypes Signed-off-by: Matt Sicker <[email protected]> --- .../main/java/org/apache/logging/log4j/plugins/di/Keys.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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 806911563e..cffc67cc7d 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 @@ -17,8 +17,8 @@ package org.apache.logging.log4j.plugins.di; -import org.apache.logging.log4j.plugins.Namespace; import org.apache.logging.log4j.plugins.Named; +import org.apache.logging.log4j.plugins.Namespace; import org.apache.logging.log4j.plugins.internal.util.BeanUtils; import org.apache.logging.log4j.plugins.name.AliasesProvider; import org.apache.logging.log4j.plugins.name.AnnotatedElementAliasesProvider; @@ -37,10 +37,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.Collection; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.function.Function; -import java.util.stream.Stream; public final class Keys { private Keys() { @@ -54,14 +52,9 @@ public final class Keys { public static final Key<List<String>> PLUGIN_PACKAGES_KEY = new @Named(PLUGIN_PACKAGES_NAME) Key<>() {}; public static String getNamespace(final AnnotatedElement element) { - return Optional.ofNullable(element.getAnnotation(Namespace.class)) + return Optional.ofNullable(AnnotationUtil.getLogicalAnnotation(element, Namespace.class)) .map(Namespace::value) - .orElseGet(() -> Stream.of(element.getAnnotations()) - .map(annotation -> annotation.annotationType().getAnnotation(Namespace.class)) - .filter(Objects::nonNull) - .findFirst() - .map(Namespace::value) - .orElse(Strings.EMPTY)); + .orElse(Strings.EMPTY); } /**
