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 11097894c80c5a9a0d79902ba1b82d6bc0972bec Author: Matt Sicker <[email protected]> AuthorDate: Mon Jan 1 18:20:07 2024 -0600 Remove unnecessary references to Binding Signed-off-by: Matt Sicker <[email protected]> --- .../test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java | 3 ++- .../org/apache/logging/log4j/plugins/di/DuplicateBindingException.java | 2 +- .../main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java | 2 +- .../apache/logging/log4j/plugins/di/NoQualifiedBindingException.java | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java index bddd982237..af81ecb070 100644 --- a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java +++ b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java @@ -26,6 +26,7 @@ import java.util.function.Supplier; import org.apache.logging.log4j.plugins.ScopeType; import org.apache.logging.log4j.plugins.di.spi.Scope; import org.apache.logging.log4j.util.Cast; +import org.apache.logging.log4j.util.Lazy; import org.junit.jupiter.api.Test; class CustomScopeTest { @@ -41,7 +42,7 @@ class CustomScopeTest { @Override public <T> Supplier<T> get(final Key<T> key, final Supplier<T> unscoped) { - final Binding<T> binding = Binding.from(key).toSingleton(unscoped); + final var binding = Lazy.lazy(unscoped); return Cast.cast(bindings.computeIfAbsent(key, ignored -> binding)); } } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DuplicateBindingException.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DuplicateBindingException.java index 36210547e8..3d5cccf064 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DuplicateBindingException.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DuplicateBindingException.java @@ -17,7 +17,7 @@ package org.apache.logging.log4j.plugins.di; /** - * Thrown when a duplicate {@link Binding} is attempted to be registered in a {@link ConfigurableInstanceFactory}. + * Thrown when a duplicate binding is attempted to be registered from a bundle in a {@link ConfigurableInstanceFactory}. */ public class DuplicateBindingException extends InjectException { public DuplicateBindingException(final Key<?> key) { diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java index 231700d91e..dc17080859 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.plugins.di.spi.ResolvableKey; import org.apache.logging.log4j.plugins.di.spi.Scope; /** - * Manages dependency injection of a set of {@linkplain Binding bindings} between {@link Key}s and {@link Supplier}s + * Manages dependency injection of a set of bindings between {@link Key}s and {@link Supplier}s * lifecycle-bound to {@link Scope}s. Keys describe the type, name, namespace, qualifier type, and order of a binding. * Suppliers are known as <i>factories</i>, and factories may have injectable dependencies on other bindings upon * creation. Scopes control the lifecycle of instances returned by a binding's factory. Factories for keys can be diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NoQualifiedBindingException.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NoQualifiedBindingException.java index de296a4b60..ede272cebe 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NoQualifiedBindingException.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NoQualifiedBindingException.java @@ -22,8 +22,7 @@ import org.apache.logging.log4j.util.StringBuilders; /** * Exception thrown when a {@linkplain org.apache.logging.log4j.plugins.QualifierType qualified} injection point - * is attempted to be {@linkplain ResolvableKey resolved} and no {@linkplain Binding binding} has been registered - * previously. + * is attempted to be {@linkplain ResolvableKey resolved} and no binding has been registered previously. */ public class NoQualifiedBindingException extends InjectException { /**
