[logging-log4j2] 01/02: Log4j 1.2 bridge class PropertyConfigurator should implement Configurator.

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 1896e228bcb9fe158d65e4abd8827a74e4566ac6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 30 09:15:34 2021 -0500

    Log4j 1.2 bridge class PropertyConfigurator should implement
    Configurator.
    
    Log4j 1.2 bridge interface Configurator doConfigure() methods should use
    LoggerRepository, not LoggerContext.
---
 .../src/main/java/org/apache/log4j/PropertyConfigurator.java  |  5 ++++-
 .../src/main/java/org/apache/log4j/spi/Configurator.java      | 11 +++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
index 8f6ead4..808220a 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
@@ -20,12 +20,13 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 
+import org.apache.log4j.spi.Configurator;
 import org.apache.log4j.spi.LoggerRepository;
 
 /**
  * A configurator for properties.
  */
-public class PropertyConfigurator {
+public class PropertyConfigurator implements Configurator {
 
     /**
      * Reads configuration options from an InputStream.
@@ -91,6 +92,7 @@ public class PropertyConfigurator {
      * @param inputStream The input stream
      * @param hierarchy The hierarchy
      */
+    @Override
     public void doConfigure(final InputStream inputStream, final LoggerRepository hierarchy) {
     }
 
@@ -121,6 +123,7 @@ public class PropertyConfigurator {
      * @param configURL The configuration URL
      * @param hierarchy The hierarchy
      */
+    @Override
     public void doConfigure(final URL configURL, final LoggerRepository hierarchy) {
     }
 }
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
index 0305fe4..15b9c6e 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
@@ -19,8 +19,6 @@ package org.apache.log4j.spi;
 import java.io.InputStream;
 import java.net.URL;
 
-import org.apache.logging.log4j.core.LoggerContext;
-
 /**
  * Log4j 1.x Configurator interface.
  */
@@ -38,17 +36,17 @@ public interface Configurator {
      */
     public static final String NULL = "null";
 
-
     /**
      * Interpret a resource pointed by a InputStream and set up log4j accordingly.
      * 
      * The configuration is done relative to the <code>hierarchy</code> parameter.
      * 
      * @param inputStream The InputStream to parse
-     * 
+     * @param loggerRepository The hierarchy to operation upon.
+     *
      * @since 1.2.17
      */
-    void doConfigure(InputStream inputStream, final LoggerContext loggerContext);
+    void doConfigure(InputStream inputStream, final LoggerRepository loggerRepository);
 
     /**
      * Interpret a resource pointed by a URL and set up log4j accordingly.
@@ -56,6 +54,7 @@ public interface Configurator {
      * The configuration is done relative to the <code>hierarchy</code> parameter.
      * 
      * @param url The URL to parse
+     * @param loggerRepository The hierarchy to operation upon.
      */
-    void doConfigure(URL url, final LoggerContext loggerContext);
+    void doConfigure(URL url, final LoggerRepository loggerRepository);
 }