Simplify name and alias annotation processing

Author: jvz

log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/Named.java

@@ -16,17 +16,12 @@
  */
 package org.apache.logging.log4j.core.test.junit;
 
-import static java.util.Optional.ofNullable;
-import static org.apache.logging.log4j.util.Strings.trimToNull;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Optional;
-import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider;
-import org.apache.logging.log4j.plugins.name.NameProvider;
+import org.apache.logging.log4j.plugins.NameProvider;
 
 /**
  * Specifies the name of an {@link org.apache.logging.log4j.core.Appender} to inject into JUnit 5 tests from the specified
@@ -38,17 +33,10 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)
 @Documented
-@NameProvider(Named.Provider.class)
+@NameProvider
 public @interface Named {
     /**
      * Specifies the name of the configuration item to inject. If blank, uses the name of the annotated parameter.
      */
     String value() default "";
-
-    class Provider implements AnnotatedElementNameProvider<Named> {
-        @Override
-        public Optional<String> getSpecifiedName(final Named annotation) {
-            return ofNullable(trimToNull(annotation.value()));
-        }
-    }
 }

log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAliases.java

@@ -21,8 +21,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.logging.log4j.core.config.plugins.util.PluginAliasesProvider;
-import org.apache.logging.log4j.plugins.name.AliasesProvider;
+import org.apache.logging.log4j.plugins.AliasesProvider;
 
 /**
  * Identifies a list of aliases for a Plugin, PluginAttribute, or PluginBuilderAttribute.
@@ -31,7 +30,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER, ElementType.TYPE, ElementType.FIELD})
-@AliasesProvider(PluginAliasesProvider.class)
+@AliasesProvider
 @Deprecated(since = "3.0", forRemoval = true)
 @SuppressWarnings("removal")
 public @interface PluginAliases {

log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java

@@ -21,9 +21,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.logging.log4j.core.config.plugins.util.PluginAttributeNameProvider;
+import org.apache.logging.log4j.plugins.NameProvider;
 import org.apache.logging.log4j.plugins.QualifierType;
-import org.apache.logging.log4j.plugins.name.NameProvider;
 import org.apache.logging.log4j.util.Strings;
 
 /**
@@ -37,7 +36,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER, ElementType.FIELD})
-@NameProvider(PluginAttributeNameProvider.class)
+@NameProvider
 @QualifierType
 @Deprecated(since = "3.0", forRemoval = true)
 @SuppressWarnings("removal")

log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java

@@ -21,9 +21,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.logging.log4j.core.config.plugins.util.PluginBuilderAttributeNameProvider;
+import org.apache.logging.log4j.plugins.NameProvider;
 import org.apache.logging.log4j.plugins.QualifierType;
-import org.apache.logging.log4j.plugins.name.NameProvider;
 import org.apache.logging.log4j.util.Strings;
 
 /**
@@ -33,7 +32,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER, ElementType.FIELD})
-@NameProvider(PluginBuilderAttributeNameProvider.class)
+@NameProvider
 @QualifierType
 @Deprecated(since = "3.0", forRemoval = true)
 @SuppressWarnings("removal")

log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginElement.java

@@ -21,9 +21,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.logging.log4j.core.config.plugins.util.PluginElementNameProvider;
+import org.apache.logging.log4j.plugins.NameProvider;
 import org.apache.logging.log4j.plugins.QualifierType;
-import org.apache.logging.log4j.plugins.name.NameProvider;
 
 /**
  * Identifies a parameter as a Plugin and corresponds with an XML element (or equivalent) in configuration files.
@@ -32,7 +31,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER, ElementType.FIELD})
-@NameProvider(PluginElementNameProvider.class)
+@NameProvider
 @QualifierType
 @Deprecated(since = "3.0", forRemoval = true)
 @SuppressWarnings("removal")

log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginValue.java

@@ -21,9 +21,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.logging.log4j.core.config.plugins.util.PluginValueNameProvider;
+import org.apache.logging.log4j.plugins.NameProvider;
 import org.apache.logging.log4j.plugins.QualifierType;
-import org.apache.logging.log4j.plugins.name.NameProvider;
 
 /**
  * Identifies a parameter as a value. These correspond with property values generally, but are meant as values to be
@@ -35,7 +34,7 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER, ElementType.FIELD})
-@NameProvider(PluginValueNameProvider.class)
+@NameProvider
 @QualifierType
 @Deprecated(since = "3.0", forRemoval = true)
 @SuppressWarnings("removal")