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 2015/05/21 20:03:30 UTC
logging-log4j2 git commit: Refactor populating maps through methods
which could be made public later to help [LOG4J2-1025]: Custom
java.util.logging.Level gives null Log4j Level.
Repository: logging-log4j2
Updated Branches:
refs/heads/master bbba1fadb -> 0e4f89163
Refactor populating maps through methods which could be made public
later to help [LOG4J2-1025]: Custom java.util.logging.Level gives null
Log4j Level.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0e4f8916
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0e4f8916
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0e4f8916
Branch: refs/heads/master
Commit: 0e4f891634e4ed6f0e4f1e96b7ac2fcde0d040b9
Parents: bbba1fa
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu May 21 11:03:24 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu May 21 11:03:24 2015 -0700
----------------------------------------------------------------------
.../log4j/jul/DefaultLevelConverter.java | 60 ++++++++++++--------
1 file changed, 37 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0e4f8916/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
----------------------------------------------------------------------
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
index e2783cb..49d97b6 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/DefaultLevelConverter.java
@@ -36,35 +36,49 @@ public class DefaultLevelConverter implements LevelConverter {
public DefaultLevelConverter() {
// Map JUL to Log4j
- julToLog4j.put(java.util.logging.Level.OFF, Level.OFF);
- julToLog4j.put(java.util.logging.Level.FINEST, LevelTranslator.FINEST);
- julToLog4j.put(java.util.logging.Level.FINER, Level.TRACE);
- julToLog4j.put(java.util.logging.Level.FINE, Level.DEBUG);
- julToLog4j.put(java.util.logging.Level.CONFIG, LevelTranslator.CONFIG);
- julToLog4j.put(java.util.logging.Level.INFO, Level.INFO);
- julToLog4j.put(java.util.logging.Level.WARNING, Level.WARN);
- julToLog4j.put(java.util.logging.Level.SEVERE, Level.ERROR);
- julToLog4j.put(java.util.logging.Level.ALL, Level.ALL);
+ mapJulToLog4j(java.util.logging.Level.OFF, Level.OFF);
+ mapJulToLog4j(java.util.logging.Level.FINEST, LevelTranslator.FINEST);
+ mapJulToLog4j(java.util.logging.Level.FINER, Level.TRACE);
+ mapJulToLog4j(java.util.logging.Level.FINE, Level.DEBUG);
+ mapJulToLog4j(java.util.logging.Level.CONFIG, LevelTranslator.CONFIG);
+ mapJulToLog4j(java.util.logging.Level.INFO, Level.INFO);
+ mapJulToLog4j(java.util.logging.Level.WARNING, Level.WARN);
+ mapJulToLog4j(java.util.logging.Level.SEVERE, Level.ERROR);
+ mapJulToLog4j(java.util.logging.Level.ALL, Level.ALL);
// Map Log4j to JUL
- log4jToJul.put(Level.OFF, java.util.logging.Level.OFF);
- log4jToJul.put(LevelTranslator.FINEST, java.util.logging.Level.FINEST);
- log4jToJul.put(Level.TRACE, java.util.logging.Level.FINER);
- log4jToJul.put(Level.DEBUG, java.util.logging.Level.FINE);
- log4jToJul.put(LevelTranslator.CONFIG, java.util.logging.Level.CONFIG);
- log4jToJul.put(Level.INFO, java.util.logging.Level.INFO);
- log4jToJul.put(Level.WARN, java.util.logging.Level.WARNING);
- log4jToJul.put(Level.ERROR, java.util.logging.Level.SEVERE);
- log4jToJul.put(Level.FATAL, java.util.logging.Level.SEVERE);
- log4jToJul.put(Level.ALL, java.util.logging.Level.ALL);
+ mapLog4jToJul(Level.OFF, java.util.logging.Level.OFF);
+ mapLog4jToJul(LevelTranslator.FINEST, java.util.logging.Level.FINEST);
+ mapLog4jToJul(Level.TRACE, java.util.logging.Level.FINER);
+ mapLog4jToJul(Level.DEBUG, java.util.logging.Level.FINE);
+ mapLog4jToJul(LevelTranslator.CONFIG, java.util.logging.Level.CONFIG);
+ mapLog4jToJul(Level.INFO, java.util.logging.Level.INFO);
+ mapLog4jToJul(Level.WARN, java.util.logging.Level.WARNING);
+ mapLog4jToJul(Level.ERROR, java.util.logging.Level.SEVERE);
+ mapLog4jToJul(Level.FATAL, java.util.logging.Level.SEVERE);
+ mapLog4jToJul(Level.ALL, java.util.logging.Level.ALL);
}
-
- @Override
- public Level toLevel(final java.util.logging.Level javaLevel) {
- return julToLog4j.get(javaLevel);
+
+ /*
+ * TODO consider making public.
+ */
+ private void mapJulToLog4j(java.util.logging.Level julLevel, Level level) {
+ julToLog4j.put(julLevel, level);
+ }
+
+ /*
+ * TODO consider making public.
+ */
+ private void mapLog4jToJul(Level level, java.util.logging.Level julLevel) {
+ log4jToJul.put(level, julLevel);
}
@Override
public java.util.logging.Level toJavaLevel(final Level level) {
return log4jToJul.get(level);
}
+
+ @Override
+ public Level toLevel(final java.util.logging.Level javaLevel) {
+ return julToLog4j.get(javaLevel);
+ }
}