This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch feature/3.x/name-alias-provider in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit bb578646e9553ae0c351a474c9a876e93adb1649 Author: Matt Sicker <[email protected]> AuthorDate: Thu Aug 7 15:08:12 2025 -0500 Avoid use of Keys::getName where unneeded --- .../log4j/plugins/di/ConfigurableInstanceFactoryTest.java | 10 ++++++++-- .../java/org/apache/logging/log4j/plugins/di/KeysTest.java | 9 --------- .../src/main/java/org/apache/logging/log4j/plugins/di/Key.java | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactoryTest.java b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactoryTest.java index 7647c914e4..390958198f 100644 --- a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactoryTest.java +++ b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactoryTest.java @@ -218,9 +218,15 @@ class ConfigurableInstanceFactoryTest { @Test void injectionPointValidationFull() { final ConfigurableInstanceFactory instanceFactory = DI.builder() - .addInitialBindingFrom(new @Named("foo") Key<String>() {}) + .addInitialBindingFrom(Key.builder(String.class) + .setName("foo") + .setQualifierType(Named.class) + .get()) .toInstance("hello") - .addInitialBindingFrom(new @Named("bar") Key<String>() {}) + .addInitialBindingFrom(Key.builder(String.class) + .setName("bar") + .setQualifierType(Named.class) + .get()) .toInstance("world") .build(); final ValidatedInjectionPoints instance = instanceFactory.getInstance(ValidatedInjectionPoints.class); diff --git a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/KeysTest.java b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/KeysTest.java index 190e5c8e06..30428b11b2 100644 --- a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/KeysTest.java +++ b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/KeysTest.java @@ -22,20 +22,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Parameter; -import java.util.function.Function; import org.apache.logging.log4j.plugins.Configurable; -import org.apache.logging.log4j.plugins.Named; import org.apache.logging.log4j.plugins.Node; import org.junit.jupiter.api.Test; class KeysTest { - @Test - void annotatedTypeUsage() { - Key<Function<String, String>> substitutorKey = new @Named("StringSubstitutor") Key<>() {}; - var actualKey = new Key<Function<String, String>>() {}.withName("StringSubstitutor") - .withQualifierType(Named.class); - assertEquals(substitutorKey, actualKey); - } @Test void configurableNamespace() { 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 dda0b9eafb..e2dd4910d7 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 @@ -82,7 +82,7 @@ public class Key<T> implements StringBuilderFormattable, Comparable<Key<T>> { final Annotation qualifier = AnnotationUtil.getElementAnnotationHavingMetaAnnotation(superclass, QualifierType.class); qualifierType = qualifier != null ? qualifier.annotationType() : null; - name = Keys.getName(superclass); + name = Strings.EMPTY; namespace = Keys.getNamespace(superclass); order = AnnotationUtil.getOrder(superclass); hashCode = Objects.hash(type, qualifierType, name.toLowerCase(Locale.ROOT), namespace.toLowerCase(Locale.ROOT));
