Apply suggestions from review #2396

apache · Mar 27, 2024 · ec77306 · ec77306
1 parent bfddf70
commit ec77306
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 40 deletions.
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfigurationFactory.java
@@ -63,8 +63,7 @@ protected String[] getSupportedTypes() {
 
     @Override
     public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
-        final int interval =
-                PropertyEnvironment.getGlobal().getIntegerProperty(Log4j1Configuration.MONITOR_INTERVAL, 0);
+        final int interval = loggerContext.getEnvironment().getIntegerProperty(Log4j1Configuration.MONITOR_INTERVAL, 0);
         return new PropertiesConfiguration(loggerContext, source, interval);
     }
 

diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java
@@ -64,8 +64,7 @@ protected String[] getSupportedTypes() {
 
     @Override
     public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
-        final int interval =
-                PropertyEnvironment.getGlobal().getIntegerProperty(Log4j1Configuration.MONITOR_INTERVAL, 0);
+        final int interval = loggerContext.getEnvironment().getIntegerProperty(Log4j1Configuration.MONITOR_INTERVAL, 0);
         return new XmlConfiguration(loggerContext, source, interval);
     }
 

diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/AutoConfigTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/AutoConfigTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.log4j.config;
 
+import static org.apache.logging.log4j.core.config.ConfigurationFactory.LOG4J1_CONFIGURATION_FILE_PROPERTY;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -38,7 +39,7 @@
 public class AutoConfigTest {
 
     @Test
-    @SetSystemProperty(key = "log4j.configuration", value = "log4j.xml")
+    @SetSystemProperty(key = LOG4J1_CONFIGURATION_FILE_PROPERTY, value = "log4j.xml")
     public void testListAppender() {
         final Logger logger = LogManager.getLogger("test");
         final LoggerContext context = LoggerContext.getContext(false);

diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
diff --git a/...st/src/test/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactoryTest.java b/...st/src/test/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactoryTest.java
@@ -22,14 +22,13 @@
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.impl.CoreKeys;
-import org.apache.logging.log4j.test.junit.Tags;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 /**
  * Tests the AsyncQueueFullPolicyFactory class.
  */
-@Tag(Tags.PARALLEL)
+@Tag("parallel")
 public class AsyncQueueFullPolicyFactoryTest {
 
     private static final CoreKeys.AsyncQueueFullPolicy DEFAULT = CoreKeys.AsyncQueueFullPolicy.defaultValue();