You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2022/01/07 15:39:53 UTC

[logging-log4j2] branch master updated: Log4j 1.2 bridge fixes to structure and behave like 1.2.17.

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 680daf2  Log4j 1.2 bridge fixes to structure and behave like 1.2.17.
680daf2 is described below

commit 680daf221a1ffe65052f40dce6006a4c51f9984f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jan 7 10:22:41 2022 -0500

    Log4j 1.2 bridge fixes to structure and behave like 1.2.17.
    
    - The instance methods isTraceEnabled(). trace(Object), and
    trace(Object, Throwable) should be in Logger, not Category.
    - Logger.getLogger(*) methods now forward to LogManager.
    - LogManager.getCurrentLoggers() forward to LoggerRepository but still
    return a NullEnumeration, real implementation is TODO.
    - CategoryUtil use final and sort methods.
---
 .../src/main/java/org/apache/log4j/Category.java   | 14 +------
 .../src/main/java/org/apache/log4j/LogManager.java |  4 +-
 .../src/main/java/org/apache/log4j/Logger.java     | 37 +++++++++--------
 .../org/apache/log4j/legacy/core/CategoryUtil.java | 34 ++++++++--------
 .../test/java/org/apache/log4j/LogManagerTest.java | 46 ++++++++++++++++++++++
 5 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
index 1d3a442..f359d02 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
@@ -367,18 +367,6 @@ public class Category implements AppenderAttachable {
         return logger.isInfoEnabled();
     }
 
-    public void trace(final Object message) {
-        maybeLog(FQCN, org.apache.logging.log4j.Level.TRACE, message, null);
-    }
-
-    public void trace(final Object message, final Throwable t) {
-        maybeLog(FQCN, org.apache.logging.log4j.Level.TRACE, message, t);
-    }
-
-    public boolean isTraceEnabled() {
-        return logger.isTraceEnabled();
-    }
-
     public boolean isEnabledFor(final Priority level) {
         final org.apache.logging.log4j.Level lvl = org.apache.logging.log4j.Level.toLevel(level.toString());
         return isEnabledFor(lvl);
@@ -609,7 +597,7 @@ public class Category implements AppenderAttachable {
         }
     }
 
-    private void maybeLog(
+    void maybeLog(
             final String fqcn,
             final org.apache.logging.log4j.Level level,
             final Object message,
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java b/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
index 5ef657e..bdb8a2d 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
@@ -17,8 +17,6 @@
 package org.apache.log4j;
 
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.apache.log4j.helpers.NullEnumeration;
 import org.apache.log4j.legacy.core.ContextUtil;
@@ -109,7 +107,7 @@ public final class LogManager {
 
     @SuppressWarnings("rawtypes")
     public static Enumeration getCurrentLoggers() {
-        return NullEnumeration.getInstance();
+        return getLoggerRepository().getCurrentLoggers();
     }
 
     static void reconfigure() {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
index fe1f26a..674a0c1 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Logger.java
@@ -16,7 +16,6 @@
  */
 package org.apache.log4j;
 
-
 import org.apache.log4j.spi.LoggerFactory;
 import org.apache.logging.log4j.spi.LoggerContext;
 
@@ -25,8 +24,13 @@ import org.apache.logging.log4j.spi.LoggerContext;
  */
 public class Logger extends Category {
 
+    /**
+     * The fully qualified name of the Logger class.
+     */
+    private static final String FQCN = Logger.class.getName();
+ 
     protected Logger(final String name) {
-        super(PrivateManager.getContext(), name);
+        super(name);
     }
 
     Logger(final LoggerContext context, final String name) {
@@ -34,33 +38,32 @@ public class Logger extends Category {
     }
 
     public static Logger getLogger(final String name) {
-        return Category.getInstance(PrivateManager.getContext(), name);
+        return LogManager.getLogger(name);
     }
 
     public static Logger getLogger(final Class<?> clazz) {
-        return Category.getInstance(PrivateManager.getContext(), clazz);
+        return LogManager.getLogger(clazz);
     }
 
     public static Logger getRootLogger() {
-        return Category.getRoot(PrivateManager.getContext());
+        return LogManager.getRootLogger();
     }
 
     public static Logger getLogger(final String name, final LoggerFactory factory) {
-        return Category.getInstance(PrivateManager.getContext(), name, factory);
+        return LogManager.getLogger(name, factory);
     }
 
-    /**
-     * Internal Log Manager.
-     */
-    private static class PrivateManager extends org.apache.logging.log4j.LogManager {
-        private static final String FQCN = Logger.class.getName();
+    public boolean isTraceEnabled() {
+        return getLogger().isTraceEnabled();
+    }
 
-        public static LoggerContext getContext() {
-            return getContext(FQCN, false);
-        }
+    public void trace(final Object message) {
+        maybeLog(FQCN, org.apache.logging.log4j.Level.TRACE, message, null);
+    }
 
-        public static org.apache.logging.log4j.Logger getLogger(final String name) {
-            return getLogger(FQCN, name);
-        }
+    public void trace(final Object message, final Throwable t) {
+        maybeLog(FQCN, org.apache.logging.log4j.Level.TRACE, message, t);
     }
+
+
 }
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java b/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
index f9e9f7c..6649324 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
@@ -25,41 +25,41 @@ import org.apache.logging.log4j.spi.LoggerContext;
  */
 public final class CategoryUtil {
 
-    private CategoryUtil() {
-    }
-
-    public static boolean isAdditive(Logger logger) {
-        if (logger instanceof org.apache.logging.log4j.core.Logger) {
-            return ((org.apache.logging.log4j.core.Logger) logger).isAdditive();
-        }
-        return false;
-    }
-
-    public static void setAdditivity(Logger logger, boolean additivity) {
+    public static LoggerContext getLoggerContext(final Logger logger) {
         if (logger instanceof org.apache.logging.log4j.core.Logger) {
-            ((org.apache.logging.log4j.core.Logger) logger).setAdditive(additivity);
+            return ((org.apache.logging.log4j.core.Logger) logger).getContext();
         }
+        return null;
     }
 
-    public static Logger getParent(Logger logger) {
+    public static Logger getParent(final Logger logger) {
         if (logger instanceof org.apache.logging.log4j.core.Logger) {
             return ((org.apache.logging.log4j.core.Logger) logger).getParent();
 
         }
         return null;
     }
+    
+    public static boolean isAdditive(final Logger logger) {
+        if (logger instanceof org.apache.logging.log4j.core.Logger) {
+            return ((org.apache.logging.log4j.core.Logger) logger).isAdditive();
+        }
+        return false;
+    }
 
-    public static LoggerContext getLoggerContext(Logger logger) {
+    public static void setAdditivity(final Logger logger, final boolean additivity) {
         if (logger instanceof org.apache.logging.log4j.core.Logger) {
-            return ((org.apache.logging.log4j.core.Logger) logger).getContext();
+            ((org.apache.logging.log4j.core.Logger) logger).setAdditive(additivity);
         }
-        return null;
     }
 
-    public static void setLevel(Logger logger, Level level) {
+    public static void setLevel(final Logger logger, final Level level) {
         if (logger instanceof org.apache.logging.log4j.core.Logger) {
             ((org.apache.logging.log4j.core.Logger) logger).setLevel(level);
 
         }
     }
+
+    private CategoryUtil() {
+    }
 }
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LogManagerTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LogManagerTest.java
new file mode 100644
index 0000000..d8fcd16
--- /dev/null
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LogManagerTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package org.apache.log4j;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class LogManagerTest {
+
+    private static final String SIMPLE_NAME = LogManagerTest.class.getSimpleName();
+
+    @Test
+    @Ignore("WIP")
+    public void testGetCurrentLoggers() {
+        Logger.getLogger(SIMPLE_NAME);
+        Logger.getLogger(SIMPLE_NAME + ".foo");
+        Logger.getLogger(SIMPLE_NAME + ".foo.bar");
+        final List<String> names = Collections.list((Enumeration<Logger>) LogManager.getCurrentLoggers()).stream().map(Logger::getName)
+            .collect(Collectors.toList());
+        assertTrue(names.contains(SIMPLE_NAME));
+        assertTrue(names.contains(SIMPLE_NAME + ".foo"));
+        assertTrue(names.contains(SIMPLE_NAME + ".foo.bar"));
+    }
+}