You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/04/07 17:42:33 UTC

[04/13] logging-log4j2 git commit: LOG4J2-1326 add methods to AbstractLogger that explicitly accept a CharSequence message

LOG4J2-1326 add methods to AbstractLogger that explicitly accept a CharSequence message


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9107a043
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9107a043
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9107a043

Branch: refs/heads/master
Commit: 9107a0434f17b6f86fc0c91c744b342d8b1f15d5
Parents: 348e522
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 7 22:11:29 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 7 22:11:29 2016 +0900

----------------------------------------------------------------------
 .../logging/log4j/spi/AbstractLogger.java       | 155 +++++++++++++++++++
 1 file changed, 155 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9107a043/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 9edd513..8707595 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -247,6 +247,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void debug(final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, Level.DEBUG, marker, message, null);
+    }
+
+    @Override
+    public void debug(final Marker marker, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.DEBUG, marker, message, t);
+    }
+
+    @Override
     public void debug(final Marker marker, final Message msg) {
         logIfEnabled(FQCN, Level.DEBUG, marker, msg, null);
     }
@@ -292,6 +302,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void debug(final CharSequence message) {
+        logIfEnabled(FQCN, Level.DEBUG, null, message, null);
+    }
+
+    @Override
+    public void debug(final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.DEBUG, null, message, t);
+    }
+
+    @Override
     public void debug(final Object message) {
         logIfEnabled(FQCN, Level.DEBUG, null, message, null);
     }
@@ -649,6 +669,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void error(final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, Level.ERROR, marker, message, null);
+    }
+
+    @Override
+    public void error(final Marker marker, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.ERROR, marker, message, t);
+    }
+
+    @Override
     public void error(final Marker marker, final Object message) {
         logIfEnabled(FQCN, Level.ERROR, marker, message, null);
     }
@@ -684,6 +714,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void error(final CharSequence message) {
+        logIfEnabled(FQCN, Level.ERROR, null, message, null);
+    }
+
+    @Override
+    public void error(final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.ERROR, null, message, t);
+    }
+
+    @Override
     public void error(final Object message) {
         logIfEnabled(FQCN, Level.ERROR, null, message, null);
     }
@@ -936,6 +976,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void fatal(final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, Level.FATAL, marker, message, null);
+    }
+
+    @Override
+    public void fatal(final Marker marker, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.FATAL, marker, message, t);
+    }
+
+    @Override
     public void fatal(final Marker marker, final Object message) {
         logIfEnabled(FQCN, Level.FATAL, marker, message, null);
     }
@@ -971,6 +1021,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void fatal(final CharSequence message) {
+        logIfEnabled(FQCN, Level.FATAL, null, message, null);
+    }
+
+    @Override
+    public void fatal(final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.FATAL, null, message, t);
+    }
+
+    @Override
     public void fatal(final Object message) {
         logIfEnabled(FQCN, Level.FATAL, null, message, null);
     }
@@ -1182,6 +1242,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void info(final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, Level.INFO, marker, message, null);
+    }
+
+    @Override
+    public void info(final Marker marker, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.INFO, marker, message, t);
+    }
+
+    @Override
     public void info(final Marker marker, final Object message) {
         logIfEnabled(FQCN, Level.INFO, marker, message, null);
     }
@@ -1217,6 +1287,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void info(final CharSequence message) {
+        logIfEnabled(FQCN, Level.INFO, null, message, null);
+    }
+
+    @Override
+    public void info(final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.INFO, null, message, t);
+    }
+
+    @Override
     public void info(final Object message) {
         logIfEnabled(FQCN, Level.INFO, null, message, null);
     }
@@ -1490,6 +1570,18 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void log(final Level level, final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, level, marker, message, (Throwable) null);
+    }
+
+    @Override
+    public void log(final Level level, final Marker marker, final CharSequence message, final Throwable t) {
+        if (isEnabled(level, marker, message, t)) {
+            logMessage(FQCN, level, marker, message, t);
+        }
+    }
+
+    @Override
     public void log(final Level level, final Marker marker, final Object message) {
         logIfEnabled(FQCN, level, marker, message, (Throwable) null);
     }
@@ -1527,6 +1619,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void log(final Level level, final CharSequence message) {
+        logIfEnabled(FQCN, level, null, message, null);
+    }
+
+    @Override
+    public void log(final Level level, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, level, null, message, t);
+    }
+
+    @Override
     public void log(final Level level, final Object message) {
         logIfEnabled(FQCN, level, null, message, null);
     }
@@ -1743,6 +1845,14 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final CharSequence message,
+            final Throwable t) {
+        if (isEnabled(level, marker, message, t)) {
+            logMessage(fqcn, level, marker, message, t);
+        }
+    }
+
+    @Override
     public void logIfEnabled(final String fqcn, final Level level, final Marker marker, final Supplier<?> msgSupplier,
             final Throwable t) {
         if (isEnabled(level, marker, msgSupplier, t)) {
@@ -1865,6 +1975,11 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
         }
     }
 
+    protected void logMessage(final String fqcn, final Level level, final Marker marker, final CharSequence message,
+            final Throwable t) {
+        logMessage(fqcn, level, marker, messageFactory.newMessage(message), t);
+    }
+
     protected void logMessage(final String fqcn, final Level level, final Marker marker, final Object message,
             final Throwable t) {
         logMessage(fqcn, level, marker, messageFactory.newMessage(message), t);
@@ -2025,6 +2140,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void trace(final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, Level.TRACE, marker, message, null);
+    }
+
+    @Override
+    public void trace(final Marker marker, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.TRACE, marker, message, t);
+    }
+
+    @Override
     public void trace(final Marker marker, final Object message) {
         logIfEnabled(FQCN, Level.TRACE, marker, message, null);
     }
@@ -2060,6 +2185,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void trace(final CharSequence message) {
+        logIfEnabled(FQCN, Level.TRACE, null, message, null);
+    }
+
+    @Override
+    public void trace(final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.TRACE, null, message, t);
+    }
+
+    @Override
     public void trace(final Object message) {
         logIfEnabled(FQCN, Level.TRACE, null, message, null);
     }
@@ -2326,6 +2461,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void warn(final Marker marker, final CharSequence message) {
+        logIfEnabled(FQCN, Level.WARN, marker, message, null);
+    }
+
+    @Override
+    public void warn(final Marker marker, final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.WARN, marker, message, t);
+    }
+
+    @Override
     public void warn(final Marker marker, final Object message) {
         logIfEnabled(FQCN, Level.WARN, marker, message, null);
     }
@@ -2361,6 +2506,16 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
     }
 
     @Override
+    public void warn(final CharSequence message) {
+        logIfEnabled(FQCN, Level.WARN, null, message, null);
+    }
+
+    @Override
+    public void warn(final CharSequence message, final Throwable t) {
+        logIfEnabled(FQCN, Level.WARN, null, message, t);
+    }
+
+    @Override
     public void warn(final Object message) {
         logIfEnabled(FQCN, Level.WARN, null, message, null);
     }