You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2019/09/15 16:30:30 UTC
[logging-log4j2] 02/02: Rename PluginInjectionBuilder to
ConfigurationInjectionBuilder
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 8f018a66f8e721c933de042df80263ce5b7e592c
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sun Sep 15 11:28:12 2019 -0500
Rename PluginInjectionBuilder to ConfigurationInjectionBuilder
This more accurately reflects the purpose of the class and should
match better with later refactoring.
Signed-off-by: Matt Sicker <bo...@gmail.com>
---
.../log4j/core/config/AbstractConfiguration.java | 4 +--
.../core/config/plugins/util/PluginBuilder.java | 6 ++---
.../plugins/visitors/AbstractPluginVisitor.java | 4 +--
.../core/config/plugins/visitors/package-info.java | 2 +-
... => AbstractConfigurationInjectionBuilder.java} | 22 ++++++++--------
...der.java => ConfigurationInjectionBuilder.java} | 30 +++++++++++-----------
.../log4j/plugins/inject/InjectionStrategy.java | 8 +++---
.../plugins/inject/PluginAttributeBuilder.java | 4 +--
.../inject/PluginBuilderAttributeBuilder.java | 6 ++---
.../log4j/plugins/inject/PluginElementBuilder.java | 4 +--
.../log4j/plugins/inject/PluginNodeBuilder.java | 4 +--
.../log4j/plugins/inject/PluginValueBuilder.java | 4 +--
.../logging/log4j/plugins/inject/package-info.java | 2 +-
src/changes/changes.xml | 2 +-
14 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index b3e1e7d..371ceb9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -63,7 +63,7 @@ import org.apache.logging.log4j.core.script.ScriptRef;
import org.apache.logging.log4j.core.util.Constants;
import org.apache.logging.log4j.core.time.internal.DummyNanoClock;
import org.apache.logging.log4j.core.util.Loader;
-import org.apache.logging.log4j.plugins.inject.PluginInjectionBuilder;
+import org.apache.logging.log4j.plugins.inject.ConfigurationInjectionBuilder;
import org.apache.logging.log4j.util.NameUtil;
import org.apache.logging.log4j.core.util.Source;
import org.apache.logging.log4j.core.time.NanoClock;
@@ -971,7 +971,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
* @param event the LogEvent that spurred the creation of this plugin
* @return the created plugin object or {@code null} if there was an error setting it up.
* @see org.apache.logging.log4j.core.config.plugins.util.PluginBuilder
- * @see org.apache.logging.log4j.plugins.inject.PluginInjectionBuilder
+ * @see ConfigurationInjectionBuilder
* @see org.apache.logging.log4j.plugins.convert.TypeConverter
*/
private Object createPluginObject(final PluginType<?> type, final Node node, final LogEvent event) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
index 877c537..b59c538 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.plugins.Node;
import org.apache.logging.log4j.plugins.PluginAliases;
import org.apache.logging.log4j.plugins.PluginBuilderFactory;
import org.apache.logging.log4j.plugins.PluginFactory;
-import org.apache.logging.log4j.plugins.inject.PluginInjectionBuilder;
+import org.apache.logging.log4j.plugins.inject.ConfigurationInjectionBuilder;
import org.apache.logging.log4j.plugins.util.Builder;
import org.apache.logging.log4j.plugins.util.PluginType;
import org.apache.logging.log4j.plugins.util.TypeUtil;
@@ -189,7 +189,7 @@ public class PluginBuilder implements Builder<Object> {
a instanceof org.apache.logging.log4j.core.config.plugins.PluginAliases) {
continue; // already processed
}
- final Object value = PluginInjectionBuilder.findBuilderForInjectionStrategy(a.annotationType())
+ final Object value = ConfigurationInjectionBuilder.findBuilderForInjectionStrategy(a.annotationType())
.flatMap(b -> Optional.ofNullable(b
.withAliases(aliases)
.withAnnotation(a)
@@ -270,7 +270,7 @@ public class PluginBuilder implements Builder<Object> {
a instanceof org.apache.logging.log4j.core.config.plugins.PluginAliases) {
continue; // already processed
}
- final Object value = PluginInjectionBuilder.findBuilderForInjectionStrategy(a.annotationType())
+ final Object value = ConfigurationInjectionBuilder.findBuilderForInjectionStrategy(a.annotationType())
.flatMap(b -> Optional.ofNullable(b
.withAliases(aliases)
.withAnnotation(a)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
index 266a3e0..b812459 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
@@ -1,13 +1,13 @@
package org.apache.logging.log4j.core.config.plugins.visitors;
import org.apache.logging.log4j.plugins.Node;
-import org.apache.logging.log4j.plugins.inject.AbstractPluginInjectionBuilder;
+import org.apache.logging.log4j.plugins.inject.AbstractConfigurationInjectionBuilder;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.util.function.Function;
-abstract class AbstractPluginVisitor<Ann extends Annotation, Cfg> extends AbstractPluginInjectionBuilder<Ann, Cfg> {
+abstract class AbstractPluginVisitor<Ann extends Annotation, Cfg> extends AbstractConfigurationInjectionBuilder<Ann, Cfg> {
AbstractPluginVisitor(final Class<Ann> clazz) {
super(clazz);
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/package-info.java
index 04badd1..276ec0c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/package-info.java
@@ -17,7 +17,7 @@
/**
* Visitor classes for extracting values from a Configuration or Node corresponding to a plugin annotation.
- * Visitor implementations must implement {@link org.apache.logging.log4j.plugins.inject.PluginInjectionBuilder},
+ * Visitor implementations must implement {@link org.apache.logging.log4j.plugins.inject.ConfigurationInjectionBuilder},
* and the corresponding annotation must be annotated with
* {@link org.apache.logging.log4j.plugins.inject.InjectionStrategy}.
*/
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/AbstractPluginInjectionBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/AbstractConfigurationInjectionBuilder.java
similarity index 82%
rename from log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/AbstractPluginInjectionBuilder.java
rename to log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/AbstractConfigurationInjectionBuilder.java
index 569dcef..2039947 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/AbstractPluginInjectionBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/AbstractConfigurationInjectionBuilder.java
@@ -31,11 +31,11 @@ import java.util.function.Function;
/**
* Base class for InjectionStrategyBuilder implementations. Provides fields and setters for the builder leaving only
- * {@link PluginInjectionBuilder#build()} to be implemented.
+ * {@link ConfigurationInjectionBuilder#build()} to be implemented.
*
* @param <Ann> the Plugin annotation type.
*/
-public abstract class AbstractPluginInjectionBuilder<Ann extends Annotation, Cfg> implements PluginInjectionBuilder<Ann, Cfg> {
+public abstract class AbstractConfigurationInjectionBuilder<Ann extends Annotation, Cfg> implements ConfigurationInjectionBuilder<Ann, Cfg> {
/** Status logger. */
protected static final Logger LOGGER = StatusLogger.getLogger();
@@ -74,12 +74,12 @@ public abstract class AbstractPluginInjectionBuilder<Ann extends Annotation, Cfg
*
* @param clazz the annotation class this PluginVisitor is for.
*/
- protected AbstractPluginInjectionBuilder(final Class<Ann> clazz) {
+ protected AbstractConfigurationInjectionBuilder(final Class<Ann> clazz) {
this.clazz = clazz;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withAnnotation(final Annotation anAnnotation) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withAnnotation(final Annotation anAnnotation) {
final Annotation a = Objects.requireNonNull(anAnnotation, "No annotation was provided");
if (this.clazz.isInstance(a)) {
this.annotation = clazz.cast(a);
@@ -88,43 +88,43 @@ public abstract class AbstractPluginInjectionBuilder<Ann extends Annotation, Cfg
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withAliases(final String... someAliases) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withAliases(final String... someAliases) {
this.aliases = someAliases;
return this;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withConversionType(final Class<?> aConversionType) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withConversionType(final Class<?> aConversionType) {
this.conversionType = Objects.requireNonNull(aConversionType, "No conversion type class was provided");
return this;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withMember(final Member aMember) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withMember(final Member aMember) {
this.member = aMember;
return this;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withConfiguration(final Cfg aConfiguration) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withConfiguration(final Cfg aConfiguration) {
this.configuration = aConfiguration;
return this;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withStringSubstitutionStrategy(final Function<String, String> aStringSubstitutionStrategy) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withStringSubstitutionStrategy(final Function<String, String> aStringSubstitutionStrategy) {
this.stringSubstitutionStrategy = aStringSubstitutionStrategy;
return this;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withDebugLog(final StringBuilder aDebugLog) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withDebugLog(final StringBuilder aDebugLog) {
this.debugLog = aDebugLog;
return this;
}
@Override
- public PluginInjectionBuilder<Ann, Cfg> withConfigurationNode(final Node aNode) {
+ public ConfigurationInjectionBuilder<Ann, Cfg> withConfigurationNode(final Node aNode) {
this.node = aNode;
return this;
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginInjectionBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/ConfigurationInjectionBuilder.java
similarity index 70%
rename from log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginInjectionBuilder.java
rename to log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/ConfigurationInjectionBuilder.java
index 6dadc77..bfcfea3 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginInjectionBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/ConfigurationInjectionBuilder.java
@@ -34,22 +34,22 @@ import java.util.function.Function;
* @param <Ann> the Annotation type.
* @param <Cfg> the Configuration type.
*/
-public interface PluginInjectionBuilder<Ann extends Annotation, Cfg> extends Builder<Object> {
+public interface ConfigurationInjectionBuilder<Ann extends Annotation, Cfg> extends Builder<Object> {
/**
- * Creates a PluginInjectionBuilder instance for the given annotation class using metadata provided by the annotation's
+ * Creates a ConfigurationInjectionBuilder instance for the given annotation class using metadata provided by the annotation's
* {@link InjectionStrategy} annotation. This instance must be further populated with
* data before being {@linkplain #build() built} to be useful.
*
- * @param injectorType the Plugin annotation class to find a PluginInjectionBuilder for.
- * @return a PluginInjectionBuilder instance if one could be created or empty.
+ * @param injectorType the Plugin annotation class to find a ConfigurationInjectionBuilder for.
+ * @return a ConfigurationInjectionBuilder instance if one could be created or empty.
*/
@SuppressWarnings("unchecked")
- static <Ann extends Annotation, Cfg> Optional<PluginInjectionBuilder<Ann, Cfg>> findBuilderForInjectionStrategy(final Class<Ann> injectorType) {
+ static <Ann extends Annotation, Cfg> Optional<ConfigurationInjectionBuilder<Ann, Cfg>> findBuilderForInjectionStrategy(final Class<Ann> injectorType) {
return Optional.ofNullable(injectorType.getAnnotation(InjectionStrategy.class))
.flatMap(type -> {
try {
- return Optional.of((PluginInjectionBuilder<Ann, Cfg>) type.value().newInstance());
+ return Optional.of((ConfigurationInjectionBuilder<Ann, Cfg>) type.value().newInstance());
} catch (final Exception e) {
StatusLogger.getLogger().error("Error loading PluginBuilder [{}] for annotation [{}].", type.value(), injectorType, e);
return Optional.empty();
@@ -65,7 +65,7 @@ public interface PluginInjectionBuilder<Ann extends Annotation, Cfg> extends Bui
* @return {@code this}.
* @throws NullPointerException if the argument is {@code null}.
*/
- PluginInjectionBuilder<Ann, Cfg> withAnnotation(Annotation annotation);
+ ConfigurationInjectionBuilder<Ann, Cfg> withAnnotation(Annotation annotation);
/**
* Sets the list of aliases to use for this injection. No aliases are required, however.
@@ -73,17 +73,17 @@ public interface PluginInjectionBuilder<Ann extends Annotation, Cfg> extends Bui
* @param aliases the list of aliases to use.
* @return {@code this}.
*/
- PluginInjectionBuilder<Ann, Cfg> withAliases(String... aliases);
+ ConfigurationInjectionBuilder<Ann, Cfg> withAliases(String... aliases);
/**
* Sets the class to convert the plugin value to for injection. This should correspond with a class obtained from
- * a factory method or builder class field. Not all PluginInjectionBuilder implementations may need this value.
+ * a factory method or builder class field. Not all ConfigurationInjectionBuilder implementations may need this value.
*
* @param conversionType the type to convert the plugin string to (if applicable).
* @return {@code this}.
* @throws NullPointerException if the argument is {@code null}.
*/
- PluginInjectionBuilder<Ann, Cfg> withConversionType(Class<?> conversionType);
+ ConfigurationInjectionBuilder<Ann, Cfg> withConversionType(Class<?> conversionType);
/**
* Sets the Member that this builder is being used for injection upon. For instance, this could be the Field
@@ -93,13 +93,13 @@ public interface PluginInjectionBuilder<Ann extends Annotation, Cfg> extends Bui
* @param member the member this builder is parsing a value for.
* @return {@code this}.
*/
- PluginInjectionBuilder<Ann, Cfg> withMember(Member member);
+ ConfigurationInjectionBuilder<Ann, Cfg> withMember(Member member);
- PluginInjectionBuilder<Ann, Cfg> withStringSubstitutionStrategy(Function<String, String> stringSubstitutionStrategy);
+ ConfigurationInjectionBuilder<Ann, Cfg> withStringSubstitutionStrategy(Function<String, String> stringSubstitutionStrategy);
- PluginInjectionBuilder<Ann, Cfg> withDebugLog(StringBuilder debugLog);
+ ConfigurationInjectionBuilder<Ann, Cfg> withDebugLog(StringBuilder debugLog);
- PluginInjectionBuilder<Ann, Cfg> withConfiguration(Cfg configuration);
+ ConfigurationInjectionBuilder<Ann, Cfg> withConfiguration(Cfg configuration);
- PluginInjectionBuilder<Ann, Cfg> withConfigurationNode(Node node);
+ ConfigurationInjectionBuilder<Ann, Cfg> withConfigurationNode(Node node);
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/InjectionStrategy.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/InjectionStrategy.java
index ac3c633..1a67331 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/InjectionStrategy.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/InjectionStrategy.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
/**
* Meta-annotation to denote the class name to use that implements
- * {@link PluginInjectionBuilder} for the annotated annotation.
+ * {@link ConfigurationInjectionBuilder} for the annotated annotation.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -34,9 +34,9 @@ import java.lang.annotation.Target;
public @interface InjectionStrategy {
/**
- * The class to use that implements {@link PluginInjectionBuilder}
- * for the given annotation. The generic annotation type in {@code PluginInjectionBuilder} should match the
+ * The class to use that implements {@link ConfigurationInjectionBuilder}
+ * for the given annotation. The generic annotation type in {@code ConfigurationInjectionBuilder} should match the
* annotation this annotation is applied to.
*/
- Class<? extends PluginInjectionBuilder<? extends Annotation, ?>> value();
+ Class<? extends ConfigurationInjectionBuilder<? extends Annotation, ?>> value();
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginAttributeBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginAttributeBuilder.java
index 66b2595..733a3a7 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginAttributeBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginAttributeBuilder.java
@@ -27,9 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
/**
- * PluginInjectionBuilder implementation for {@link PluginAttribute}.
+ * ConfigurationInjectionBuilder implementation for {@link PluginAttribute}.
*/
-public class PluginAttributeBuilder extends AbstractPluginInjectionBuilder<PluginAttribute, Object> {
+public class PluginAttributeBuilder extends AbstractConfigurationInjectionBuilder<PluginAttribute, Object> {
private static final Map<Class<?>, Function<PluginAttribute, Object>> DEFAULT_VALUE_EXTRACTORS;
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginBuilderAttributeBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginBuilderAttributeBuilder.java
index 28e6843..8c870db 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginBuilderAttributeBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginBuilderAttributeBuilder.java
@@ -24,11 +24,11 @@ import org.apache.logging.log4j.util.StringBuilders;
import java.util.Map;
/**
- * PluginInjectionBuilder for PluginBuilderAttribute. If {@code null} is returned for the
- * {@link PluginInjectionBuilder#build()}}
+ * ConfigurationInjectionBuilder for PluginBuilderAttribute. If {@code null} is returned for the
+ * {@link ConfigurationInjectionBuilder#build()}}
* method, then the default value of the field should remain untouched.
*/
-public class PluginBuilderAttributeBuilder extends AbstractPluginInjectionBuilder<PluginBuilderAttribute, Object> {
+public class PluginBuilderAttributeBuilder extends AbstractConfigurationInjectionBuilder<PluginBuilderAttribute, Object> {
public PluginBuilderAttributeBuilder() {
super(PluginBuilderAttribute.class);
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginElementBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginElementBuilder.java
index 7f3939a..9dc4aea 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginElementBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginElementBuilder.java
@@ -28,9 +28,9 @@ import java.util.Collection;
import java.util.List;
/**
- * PluginInjectionBuilder implementation for {@link PluginElement}. Supports arrays as well as singular values.
+ * ConfigurationInjectionBuilder implementation for {@link PluginElement}. Supports arrays as well as singular values.
*/
-public class PluginElementBuilder extends AbstractPluginInjectionBuilder<PluginElement, Object> {
+public class PluginElementBuilder extends AbstractConfigurationInjectionBuilder<PluginElement, Object> {
public PluginElementBuilder() {
super(PluginElement.class);
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginNodeBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginNodeBuilder.java
index 3cf2189..06d06f6 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginNodeBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginNodeBuilder.java
@@ -20,9 +20,9 @@ package org.apache.logging.log4j.plugins.inject;
import org.apache.logging.log4j.plugins.PluginNode;
/**
- * PluginInjectionBuilder implementation for {@link PluginNode}.
+ * ConfigurationInjectionBuilder implementation for {@link PluginNode}.
*/
-public class PluginNodeBuilder extends AbstractPluginInjectionBuilder<PluginNode, Object> {
+public class PluginNodeBuilder extends AbstractConfigurationInjectionBuilder<PluginNode, Object> {
public PluginNodeBuilder() {
super(PluginNode.class);
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginValueBuilder.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginValueBuilder.java
index a9e5f0e..2cfe357 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginValueBuilder.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/PluginValueBuilder.java
@@ -22,9 +22,9 @@ import org.apache.logging.log4j.util.StringBuilders;
import org.apache.logging.log4j.util.Strings;
/**
- * PluginInjectionBuilder implementation for {@link PluginValue}.
+ * ConfigurationInjectionBuilder implementation for {@link PluginValue}.
*/
-public class PluginValueBuilder extends AbstractPluginInjectionBuilder<PluginValue, Object> {
+public class PluginValueBuilder extends AbstractConfigurationInjectionBuilder<PluginValue, Object> {
public PluginValueBuilder() {
super(PluginValue.class);
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/package-info.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/package-info.java
index a359ce0..47259e0 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/package-info.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/inject/package-info.java
@@ -18,6 +18,6 @@
/**
* Injection builder classes for parsing data from a {@code Configuration} or {@link org.apache.logging.log4j.plugins.Node}
* corresponding to an {@link org.apache.logging.log4j.plugins.inject.InjectionStrategy}-annotated annotation.
- * Injection strategies must implement {@link org.apache.logging.log4j.plugins.inject.PluginInjectionBuilder}.
+ * Injection strategies must implement {@link org.apache.logging.log4j.plugins.inject.ConfigurationInjectionBuilder}.
*/
package org.apache.logging.log4j.plugins.inject;
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7fa5f8e..5ea25d4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -35,7 +35,7 @@
Fix typo in method MergeStrategy.mergeConfigurations.
</action>
<action issue="LOG4J2-2683" dev="mattsicker" type="update">
- Rename PluginVisitor and related classes to PluginInjectionBuilder.
+ Rename PluginVisitor and related classes to ConfigurationInjectionBuilder.
</action>
<action issue="LOG4J2-2523" dev="rgoers" type="update" due-to="Romain Manni-Bucau">
Allow web lookup to access more information.