This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/apply-property-environment in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3432f4c7598f8a6da337307bdb2b613767194016 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Mar 15 17:44:08 2024 +0100 Other small fixes --- .../logging/log4j/jctools/JCToolsRecyclerFactoryProvider.java | 4 ++-- .../logging/log4j/plugins/condition/OnPropertyConditionTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/log4j-jctools/src/main/java/org/apache/logging/log4j/jctools/JCToolsRecyclerFactoryProvider.java b/log4j-jctools/src/main/java/org/apache/logging/log4j/jctools/JCToolsRecyclerFactoryProvider.java index b5671d2fa7..9c830453bf 100644 --- a/log4j-jctools/src/main/java/org/apache/logging/log4j/jctools/JCToolsRecyclerFactoryProvider.java +++ b/log4j-jctools/src/main/java/org/apache/logging/log4j/jctools/JCToolsRecyclerFactoryProvider.java @@ -24,10 +24,10 @@ import java.util.Queue; import java.util.function.Consumer; import java.util.function.Supplier; import org.apache.logging.log4j.kit.env.PropertyEnvironment; -import org.apache.logging.log4j.kit.recycler.PropertyKeys; import org.apache.logging.log4j.kit.recycler.Recycler; import org.apache.logging.log4j.kit.recycler.RecyclerFactory; import org.apache.logging.log4j.kit.recycler.RecyclerFactoryProvider; +import org.apache.logging.log4j.kit.recycler.RecyclerKeys; import org.apache.logging.log4j.kit.recycler.support.AbstractRecycler; import org.jctools.queues.MpmcArrayQueue; @@ -53,7 +53,7 @@ public final class JCToolsRecyclerFactoryProvider implements RecyclerFactoryProv public RecyclerFactory createForEnvironment(final PropertyEnvironment environment) { requireNonNull(environment, "environment"); final Integer capacity = - environment.getProperty(PropertyKeys.Recycler.class).capacity(); + environment.getProperty(RecyclerKeys.Recycler.class).capacity(); if (capacity != null && capacity < 1) { throw new IllegalArgumentException("was expecting a `capacity` greater than 1, found: " + capacity); } diff --git a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/condition/OnPropertyConditionTest.java b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/condition/OnPropertyConditionTest.java index ce0181ec37..83c51b8e96 100644 --- a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/condition/OnPropertyConditionTest.java +++ b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/condition/OnPropertyConditionTest.java @@ -74,7 +74,7 @@ class OnPropertyConditionTest { } @Test - @SetTestProperty(key = "OnPropertyConditionTest", value = "first") + @SetTestProperty(key = "log4j.OnPropertyConditionTest", value = "first") void whenPropertyMatchesFirst() { instanceFactory.registerBundle(Fixture.class); final String value = instanceFactory.getInstance(String.class); @@ -82,7 +82,7 @@ class OnPropertyConditionTest { } @Test - @SetTestProperty(key = "OnPropertyConditionTest", value = "second") + @SetTestProperty(key = "log4j.OnPropertyConditionTest", value = "second") void whenPropertyMatchesSecond() { instanceFactory.registerBundle(Fixture.class); final String value = instanceFactory.getInstance(String.class); @@ -90,7 +90,7 @@ class OnPropertyConditionTest { } @Test - @SetTestProperty(key = "PropertyThree", value = "") + @SetTestProperty(key = "log4j.PropertyThree", value = "") void whenPropertyPresent() { instanceFactory.registerBundle(Fixture.class); final String value = instanceFactory.getInstance(String.class); @@ -98,7 +98,7 @@ class OnPropertyConditionTest { } @Test - @SetTestProperty(key = "Applied", value = "") + @SetTestProperty(key = "log4j.Applied", value = "") void whenPropertyPresentForConditionalClass() { instanceFactory.registerBundle(AppliedToMethods.class); instanceFactory.registerBundle(Fixture.class);
