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 2014/09/03 02:30:43 UTC
git commit: Remove type casts to the ExtendedLogger interface from
the public Logger interface. This means that the ExtendedLogger must be
pushed up to all log4j-streams APIs. With this change,
there are no casts to ExtendedLogger, just like in the rest
Repository: logging-log4j2
Updated Branches:
refs/heads/master 41af200e6 -> c682ad5d5
Remove type casts to the ExtendedLogger interface from the public Logger
interface. This means that the ExtendedLogger must be pushed up to all
log4j-streams APIs. With this change, there are no casts to
ExtendedLogger, just like in the rest of Log4j. The only cast needed,
unless we change LogManager is
"(ExtendedLogger)LogManager.getLogger(...)". See the example in the
class comment for LoggerPrintWriter.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c682ad5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c682ad5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c682ad5d
Branch: refs/heads/master
Commit: c682ad5d5168b2e82e392dc15b9a6e24a51a7744
Parents: 41af200
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Sep 2 20:30:29 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Sep 2 20:30:29 2014 -0400
----------------------------------------------------------------------
.../streams/LoggerBufferedInputStream.java | 33 +++++++------
.../log4j/streams/LoggerBufferedReader.java | 17 ++++---
.../log4j/streams/LoggerInputStream.java | 17 ++++---
.../log4j/streams/LoggerOutputStream.java | 32 ++++++-------
.../log4j/streams/LoggerPrintStream.java | 49 ++++++++++----------
.../log4j/streams/LoggerPrintWriter.java | 27 ++++++-----
.../logging/log4j/streams/LoggerReader.java | 9 ++--
.../logging/log4j/streams/LoggerStreams.java | 26 +++++------
.../logging/log4j/streams/LoggerWriter.java | 9 ++--
.../log4j/streams/LoggerWriterFilter.java | 9 ++--
.../log4j/streams/AbstractLoggerWriterTest.java | 2 +-
.../log4j/streams/AbstractStreamTest.java | 7 +++
.../streams/LoggerBufferedInputStreamTest.java | 2 +-
.../log4j/streams/LoggerBufferedReaderTest.java | 2 +-
.../log4j/streams/LoggerInputStreamTest.java | 6 +--
.../log4j/streams/LoggerOutputStreamTest.java | 4 +-
.../log4j/streams/LoggerPrintStreamTest.java | 2 +-
.../log4j/streams/LoggerPrintWriterTest.java | 2 +-
.../logging/log4j/streams/LoggerReaderTest.java | 2 +-
.../log4j/streams/LoggerWriterFilterTest.java | 2 +-
.../logging/log4j/streams/LoggerWriterTest.java | 2 +-
21 files changed, 130 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedInputStream.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedInputStream.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedInputStream.java
index 1ffeaac..90c7cea 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedInputStream.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedInputStream.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
@@ -38,20 +37,20 @@ public class LoggerBufferedInputStream extends BufferedInputStream {
super(new LoggerInputStream(in, charset, logger, fqcn, level, marker), size);
}
- public LoggerBufferedInputStream(final InputStream in, final Charset charset, final int size, final Logger logger, final Level level) {
- this(in, charset, size, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerBufferedInputStream(final InputStream in, final Charset charset, final int size, final ExtendedLogger logger, final Level level) {
+ this(in, charset, size, logger, FQCN, level, null);
}
- public LoggerBufferedInputStream(final InputStream in, final Charset charset, final int size, final Logger logger, final Level level, final Marker marker) {
- this(in, charset, size, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerBufferedInputStream(final InputStream in, final Charset charset, final int size, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(in, charset, size, logger, FQCN, level, marker);
}
- public LoggerBufferedInputStream(final InputStream in, final Charset charset, final Logger logger, final Level level) {
- this(in, charset, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerBufferedInputStream(final InputStream in, final Charset charset, final ExtendedLogger logger, final Level level) {
+ this(in, charset, logger, FQCN, level, null);
}
- public LoggerBufferedInputStream(final InputStream in, final Charset charset, final Logger logger, final Level level, final Marker marker) {
- this(in, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerBufferedInputStream(final InputStream in, final Charset charset, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(in, charset, logger, FQCN, level, marker);
}
public LoggerBufferedInputStream(final InputStream in, final ExtendedLogger logger, final String fqcn, final Level level, final Marker marker) {
@@ -62,20 +61,20 @@ public class LoggerBufferedInputStream extends BufferedInputStream {
this(in, Charset.defaultCharset(), size, logger, fqcn, level, marker);
}
- public LoggerBufferedInputStream(final InputStream in, final int size, final Logger logger, final Level level) {
- this(in, size, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerBufferedInputStream(final InputStream in, final int size, final ExtendedLogger logger, final Level level) {
+ this(in, size, logger, FQCN, level, null);
}
- public LoggerBufferedInputStream(final InputStream in, final int size, final Logger logger, final Level level, final Marker marker) {
- this(in, size, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerBufferedInputStream(final InputStream in, final int size, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(in, size, logger, FQCN, level, marker);
}
- public LoggerBufferedInputStream(final InputStream in, final Logger logger, final Level level) {
- this(in, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerBufferedInputStream(final InputStream in, final ExtendedLogger logger, final Level level) {
+ this(in, logger, FQCN, level, null);
}
- public LoggerBufferedInputStream(final InputStream in, final Logger logger, final Level level, final Marker marker) {
- this(in, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerBufferedInputStream(final InputStream in, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(in, logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedReader.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedReader.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedReader.java
index db89101..2db1c8d 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedReader.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerBufferedReader.java
@@ -23,7 +23,6 @@ import java.io.Reader;
import java.nio.CharBuffer;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
@@ -38,20 +37,20 @@ public class LoggerBufferedReader extends BufferedReader {
super(new LoggerReader(reader, logger, FQCN, level, marker), size);
}
- public LoggerBufferedReader(final Reader reader, final int size, final Logger logger, final Level level) {
- this(reader, size, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerBufferedReader(final Reader reader, final int size, final ExtendedLogger logger, final Level level) {
+ this(reader, size, logger, FQCN, level, null);
}
- public LoggerBufferedReader(final Reader reader, final int size, final Logger logger, final Level level, final Marker marker) {
- this(reader, size, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerBufferedReader(final Reader reader, final int size, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(reader, size, logger, FQCN, level, marker);
}
- public LoggerBufferedReader(final Reader reader, final Logger logger, final Level level) {
- this(reader, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerBufferedReader(final Reader reader, final ExtendedLogger logger, final Level level) {
+ this(reader, logger, FQCN, level, null);
}
- public LoggerBufferedReader(final Reader reader, final Logger logger, final Level level, final Marker marker) {
- this(reader, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerBufferedReader(final Reader reader, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(reader, logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerInputStream.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerInputStream.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerInputStream.java
index 8fcb567..b4d242f 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerInputStream.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerInputStream.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.streams.util.ByteStreamLogger;
@@ -44,21 +43,21 @@ public class LoggerInputStream extends FilterInputStream {
this.fqcn = fqcn;
}
- public LoggerInputStream(final InputStream in, final Charset charset, final Logger logger, final Level level) {
- this(in, charset, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerInputStream(final InputStream in, final Charset charset, final ExtendedLogger logger, final Level level) {
+ this(in, charset, logger, FQCN, level, null);
}
- public LoggerInputStream(final InputStream in, final Charset charset, final Logger logger, final Level level,
+ public LoggerInputStream(final InputStream in, final Charset charset, final ExtendedLogger logger, final Level level,
final Marker marker) {
- this(in, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ this(in, charset, logger, FQCN, level, marker);
}
- public LoggerInputStream(final InputStream in, final Logger logger, final Level level) {
- this(in, Charset.defaultCharset(), (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerInputStream(final InputStream in, final ExtendedLogger logger, final Level level) {
+ this(in, Charset.defaultCharset(), logger, FQCN, level, null);
}
- public LoggerInputStream(final InputStream in, final Logger logger, final Level level, final Marker marker) {
- this(in, Charset.defaultCharset(), (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerInputStream(final InputStream in, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(in, Charset.defaultCharset(), logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerOutputStream.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerOutputStream.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerOutputStream.java
index 391fd01..1bfc857 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerOutputStream.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerOutputStream.java
@@ -40,20 +40,20 @@ public class LoggerOutputStream extends OutputStream {
private final ByteStreamLogger logger;
private final String fqcn;
- public LoggerOutputStream(final Charset charset, final Logger logger, final Level level) {
- this(null, charset, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerOutputStream(final Charset charset, final ExtendedLogger logger, final Level level) {
+ this(null, charset, logger, FQCN, level, null);
}
- public LoggerOutputStream(final Charset charset, final Logger logger, final Level level, final Marker marker) {
- this(null, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerOutputStream(final Charset charset, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(null, charset, logger, FQCN, level, marker);
}
- public LoggerOutputStream(final Logger logger, final Level level) {
- this(null, Charset.defaultCharset(), (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerOutputStream(final ExtendedLogger logger, final Level level) {
+ this(null, Charset.defaultCharset(), logger, FQCN, level, null);
}
- public LoggerOutputStream(final Logger logger, final Level level, final Marker marker) {
- this(null, Charset.defaultCharset(), (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerOutputStream(final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(null, Charset.defaultCharset(), logger, FQCN, level, marker);
}
public LoggerOutputStream(final OutputStream out, final Charset charset, final ExtendedLogger logger,
@@ -63,21 +63,21 @@ public class LoggerOutputStream extends OutputStream {
this.fqcn = fqcn;
}
- public LoggerOutputStream(final OutputStream out, final Charset charset, final Logger logger, final Level level) {
- this(out, charset, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerOutputStream(final OutputStream out, final Charset charset, final ExtendedLogger logger, final Level level) {
+ this(out, charset, logger, FQCN, level, null);
}
- public LoggerOutputStream(final OutputStream out, final Charset charset, final Logger logger, final Level level,
+ public LoggerOutputStream(final OutputStream out, final Charset charset, final ExtendedLogger logger, final Level level,
final Marker marker) {
- this(out, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ this(out, charset, logger, FQCN, level, marker);
}
- public LoggerOutputStream(final OutputStream out, final Logger logger, final Level level) {
- this(out, Charset.defaultCharset(), (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerOutputStream(final OutputStream out, final ExtendedLogger logger, final Level level) {
+ this(out, Charset.defaultCharset(), logger, FQCN, level, null);
}
- public LoggerOutputStream(final OutputStream out, final Logger logger, final Level level, final Marker marker) {
- this(out, Charset.defaultCharset(), (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerOutputStream(final OutputStream out, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(out, Charset.defaultCharset(), logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintStream.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintStream.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintStream.java
index 6792502..a407b49 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintStream.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintStream.java
@@ -25,7 +25,6 @@ import java.nio.charset.Charset;
import java.util.Locale;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
@@ -38,22 +37,22 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
public class LoggerPrintStream extends PrintStream {
private static final String FQCN = LoggerPrintStream.class.getName();
- public LoggerPrintStream(final Charset charset, final Logger logger, final Level level)
+ public LoggerPrintStream(final Charset charset, final ExtendedLogger logger, final Level level)
throws UnsupportedEncodingException {
- this(null, false, charset, (ExtendedLogger) logger, FQCN, level, null);
+ this(null, false, charset, logger, FQCN, level, null);
}
- public LoggerPrintStream(final Charset charset, final Logger logger, final Level level, final Marker marker)
+ public LoggerPrintStream(final Charset charset, final ExtendedLogger logger, final Level level, final Marker marker)
throws UnsupportedEncodingException {
- this(null, false, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ this(null, false, charset, logger, FQCN, level, marker);
}
- public LoggerPrintStream(final Logger logger, final Level level) {
- this(null, false, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerPrintStream(final ExtendedLogger logger, final Level level) {
+ this(null, false, logger, FQCN, level, null);
}
- public LoggerPrintStream(final Logger logger, final Level level, final Marker marker) {
- this(null, false, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerPrintStream(final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(null, false, logger, FQCN, level, marker);
}
public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final Charset charset,
@@ -63,13 +62,13 @@ public class LoggerPrintStream extends PrintStream {
}
public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final Charset charset,
- final Logger logger, final Level level) throws UnsupportedEncodingException {
- this(out, autoFlush, charset, (ExtendedLogger) logger, FQCN, level, null);
+ final ExtendedLogger logger, final Level level) throws UnsupportedEncodingException {
+ this(out, autoFlush, charset, logger, FQCN, level, null);
}
public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final Charset charset,
- final Logger logger, final Level level, final Marker marker) throws UnsupportedEncodingException {
- this(out, autoFlush, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ final ExtendedLogger logger, final Level level, final Marker marker) throws UnsupportedEncodingException {
+ this(out, autoFlush, charset, logger, FQCN, level, marker);
}
public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final ExtendedLogger logger,
@@ -77,31 +76,31 @@ public class LoggerPrintStream extends PrintStream {
super(new LoggerOutputStream(out, Charset.defaultCharset(), logger, fqcn, level, marker), autoFlush);
}
- public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final Logger logger, final Level level) {
- this(out, autoFlush, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final ExtendedLogger logger, final Level level) {
+ this(out, autoFlush, logger, FQCN, level, null);
}
- public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final Logger logger, final Level level,
+ public LoggerPrintStream(final OutputStream out, final boolean autoFlush, final ExtendedLogger logger, final Level level,
final Marker marker) {
- this(out, autoFlush, (ExtendedLogger) logger, FQCN, level, marker);
+ this(out, autoFlush, logger, FQCN, level, marker);
}
- public LoggerPrintStream(final OutputStream out, final Charset charset, final Logger logger, final Level level)
+ public LoggerPrintStream(final OutputStream out, final Charset charset, final ExtendedLogger logger, final Level level)
throws UnsupportedEncodingException {
- this(out, false, charset, (ExtendedLogger) logger, FQCN, level, null);
+ this(out, false, charset, logger, FQCN, level, null);
}
- public LoggerPrintStream(final OutputStream out, final Charset charset, final Logger logger, final Level level,
+ public LoggerPrintStream(final OutputStream out, final Charset charset, final ExtendedLogger logger, final Level level,
final Marker marker) throws UnsupportedEncodingException {
- this(out, false, charset, (ExtendedLogger) logger, FQCN, level, marker);
+ this(out, false, charset, logger, FQCN, level, marker);
}
- public LoggerPrintStream(final OutputStream out, final Logger logger, final Level level) {
- this(out, false, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerPrintStream(final OutputStream out, final ExtendedLogger logger, final Level level) {
+ this(out, false, logger, FQCN, level, null);
}
- public LoggerPrintStream(final OutputStream out, final Logger logger, final Level level, final Marker marker) {
- this(out, false, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerPrintStream(final OutputStream out, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(out, false, logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintWriter.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintWriter.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintWriter.java
index 4e014c8..cb9b350 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintWriter.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerPrintWriter.java
@@ -22,7 +22,6 @@ import java.io.Writer;
import java.util.Locale;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
@@ -32,7 +31,7 @@ import org.apache.logging.log4j.spi.ExtendedLogger;
* <p>
* Integration with JDBC logging can be as simple as:
* </p>
- * <pre>DriverManager.setLogWriter(new LoggerPrintWriter(LogManager.getLogger(), Level.DEBUG));
+ * <pre>DriverManager.setLogWriter(new LoggerPrintWriter((ExtendedLogger) LogManager.getLogger(), Level.DEBUG));
* </pre>
*/
public class LoggerPrintWriter extends PrintWriter {
@@ -44,12 +43,12 @@ public class LoggerPrintWriter extends PrintWriter {
super(new LoggerWriter(logger, fqcn, level, marker), autoFlush);
}
- public LoggerPrintWriter(final Logger logger, final Level level) {
- this((ExtendedLogger) logger, false, FQCN, level, null);
+ public LoggerPrintWriter(final ExtendedLogger logger, final Level level) {
+ this(logger, false, FQCN, level, null);
}
- public LoggerPrintWriter(final Logger logger, final Level level, final Marker marker) {
- this((ExtendedLogger) logger, false, FQCN, level, marker);
+ public LoggerPrintWriter(final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(logger, false, FQCN, level, marker);
}
@SuppressWarnings("resource")
@@ -58,21 +57,21 @@ public class LoggerPrintWriter extends PrintWriter {
super(new LoggerWriterFilter(writer, logger, fqcn, level, marker), autoFlush);
}
- public LoggerPrintWriter(final Writer writer, final boolean autoFlush, final Logger logger, final Level level) {
- this(writer, autoFlush, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerPrintWriter(final Writer writer, final boolean autoFlush, final ExtendedLogger logger, final Level level) {
+ this(writer, autoFlush, logger, FQCN, level, null);
}
- public LoggerPrintWriter(final Writer writer, final boolean autoFlush, final Logger logger, final Level level,
+ public LoggerPrintWriter(final Writer writer, final boolean autoFlush, final ExtendedLogger logger, final Level level,
final Marker marker) {
- this(writer, autoFlush, (ExtendedLogger) logger, FQCN, level, marker);
+ this(writer, autoFlush, logger, FQCN, level, marker);
}
- public LoggerPrintWriter(final Writer writer, final Logger logger, final Level level) {
- this(writer, false, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerPrintWriter(final Writer writer, final ExtendedLogger logger, final Level level) {
+ this(writer, false, logger, FQCN, level, null);
}
- public LoggerPrintWriter(final Writer writer, final Logger logger, final Level level, final Marker marker) {
- this(writer, false, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerPrintWriter(final Writer writer, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(writer, false, logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerReader.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerReader.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerReader.java
index f364c46..33a36de 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerReader.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerReader.java
@@ -23,7 +23,6 @@ import java.io.Reader;
import java.nio.CharBuffer;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.streams.util.CharStreamLogger;
@@ -45,12 +44,12 @@ public class LoggerReader extends FilterReader {
this.fqcn = fqcn;
}
- public LoggerReader(final Reader reader, final Logger logger, final Level level) {
- this(reader, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerReader(final Reader reader, final ExtendedLogger logger, final Level level) {
+ this(reader, logger, FQCN, level, null);
}
- public LoggerReader(final Reader reader, final Logger logger, final Level level, final Marker marker) {
- this(reader, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerReader(final Reader reader, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(reader, logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerStreams.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerStreams.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerStreams.java
index 2adbeb8..3a99c28 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerStreams.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerStreams.java
@@ -25,18 +25,18 @@ import java.io.Writer;
import java.nio.charset.Charset;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.spi.ExtendedLogger;
public class LoggerStreams {
public static class BufferedBuilder {
- private final Logger logger;
+ private final ExtendedLogger logger;
private final Level level;
private final Marker marker;
private final int size;
- BufferedBuilder(final Logger logger, final Level level, final Marker marker, final int size) {
+ BufferedBuilder(final ExtendedLogger logger, final Level level, final Marker marker, final int size) {
this.logger = logger;
this.level = level;
this.marker = marker;
@@ -74,11 +74,11 @@ public class LoggerStreams {
}
public static class Builder {
- private final Logger logger;
+ private final ExtendedLogger logger;
private final Level level;
private final Marker marker;
- Builder(final Logger logger, final Level level, final Marker marker) {
+ Builder(final ExtendedLogger logger, final Level level, final Marker marker) {
this.logger = logger;
this.level = level;
this.marker = marker;
@@ -102,12 +102,12 @@ public class LoggerStreams {
}
public static class PrintingBuilder {
- private final Logger logger;
+ private final ExtendedLogger logger;
private final Level level;
private final Marker marker;
private final boolean autoFlush;
- PrintingBuilder(final Logger logger, final Level level, final Marker marker, final boolean autoFlush) {
+ PrintingBuilder(final ExtendedLogger logger, final Level level, final Marker marker, final boolean autoFlush) {
this.logger = logger;
this.level = level;
this.marker = marker;
@@ -144,27 +144,27 @@ public class LoggerStreams {
}
}
- public static Builder debug(final Logger logger) {
+ public static Builder debug(final ExtendedLogger logger) {
return new Builder(logger, Level.DEBUG, null);
}
- public static Builder error(final Logger logger) {
+ public static Builder error(final ExtendedLogger logger) {
return new Builder(logger, Level.ERROR, null);
}
- public static Builder fatal(final Logger logger) {
+ public static Builder fatal(final ExtendedLogger logger) {
return new Builder(logger, Level.FATAL, null);
}
- public static Builder info(final Logger logger) {
+ public static Builder info(final ExtendedLogger logger) {
return new Builder(logger, Level.INFO, null);
}
- public static Builder trace(final Logger logger) {
+ public static Builder trace(final ExtendedLogger logger) {
return new Builder(logger, Level.TRACE, null);
}
- public static Builder warn(final Logger logger) {
+ public static Builder warn(final ExtendedLogger logger) {
return new Builder(logger, Level.WARN, null);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriter.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriter.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriter.java
index 22bac96..53d9324 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriter.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriter.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.Writer;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.streams.util.CharStreamLogger;
@@ -41,12 +40,12 @@ public class LoggerWriter extends Writer {
this.fqcn = fqcn;
}
- public LoggerWriter(final Logger logger, final Level level) {
- this((ExtendedLogger) logger, FQCN, level, null);
+ public LoggerWriter(final ExtendedLogger logger, final Level level) {
+ this(logger, FQCN, level, null);
}
- public LoggerWriter(final Logger logger, final Level level, final Marker marker) {
- this((ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerWriter(final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriterFilter.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriterFilter.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriterFilter.java
index a219ba5..0ecc719 100644
--- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriterFilter.java
+++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriterFilter.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.Writer;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.streams.util.CharStreamLogger;
@@ -44,12 +43,12 @@ public class LoggerWriterFilter extends FilterWriter {
this.fqcn = fqcn;
}
- public LoggerWriterFilter(final Writer out, final Logger logger, final Level level) {
- this(out, (ExtendedLogger) logger, FQCN, level, null);
+ public LoggerWriterFilter(final Writer out, final ExtendedLogger logger, final Level level) {
+ this(out, logger, FQCN, level, null);
}
- public LoggerWriterFilter(final Writer out, final Logger logger, final Level level, final Marker marker) {
- this(out, (ExtendedLogger) logger, FQCN, level, marker);
+ public LoggerWriterFilter(final Writer out, final ExtendedLogger logger, final Level level, final Marker marker) {
+ this(out, logger, FQCN, level, marker);
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractLoggerWriterTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractLoggerWriterTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractLoggerWriterTest.java
index 46535ab..78b13fd 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractLoggerWriterTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractLoggerWriterTest.java
@@ -70,7 +70,7 @@ public abstract class AbstractLoggerWriterTest extends AbstractStreamTest {
out.close();
replay(out);
- final LoggerOutputStream los = new LoggerOutputStream(out, getLogger(), LEVEL);
+ final LoggerOutputStream los = new LoggerOutputStream(out, getExtendedLogger(), LEVEL);
los.flush();
los.close();
verify(out);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractStreamTest.java
index 17d5c72..3fd6658 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/AbstractStreamTest.java
@@ -26,14 +26,21 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.InitialLoggerContext;
+import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Before;
import org.junit.ClassRule;
public abstract class AbstractStreamTest {
+
protected static Logger getLogger() {
+ return getExtendedLogger();
+ }
+
+ protected static ExtendedLogger getExtendedLogger() {
return ctx.getLogger("UnitTestLogger");
}
+
protected final static String NEWLINE = System.getProperty("line.separator");
protected final static Level LEVEL = Level.ERROR;
protected final static String FIRST = "first";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedInputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedInputStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedInputStreamTest.java
index 8c18243..b11a31a 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedInputStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedInputStreamTest.java
@@ -24,6 +24,6 @@ public class LoggerBufferedInputStreamTest extends LoggerInputStreamTest {
@Override
protected InputStream createInputStream() {
- return new LoggerBufferedInputStream(this.wrapped, getLogger(), Level.ERROR);
+ return new LoggerBufferedInputStream(this.wrapped, getExtendedLogger(), Level.ERROR);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedReaderTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedReaderTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedReaderTest.java
index 5765d4e..1e4ecc8 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedReaderTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerBufferedReaderTest.java
@@ -28,7 +28,7 @@ public class LoggerBufferedReaderTest extends LoggerReaderTest {
@Override
protected Reader createReader() {
- return this.bufferedReader = new LoggerBufferedReader(this.wrapped, getLogger(), LEVEL);
+ return this.bufferedReader = new LoggerBufferedReader(this.wrapped, getExtendedLogger(), LEVEL);
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
index 602601b..30ec88a 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerInputStreamTest.java
@@ -33,7 +33,7 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
protected InputStream in;
protected InputStream createInputStream() {
- return new LoggerInputStream(this.wrapped, getLogger(), LEVEL);
+ return new LoggerInputStream(this.wrapped, getExtendedLogger(), LEVEL);
}
@Before
@@ -55,7 +55,7 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
@Test
public void testClose_NoRemainingData() throws IOException {
this.wrapped = new ByteArrayInputStream((FIRST + '\n').getBytes());
- this.in = new LoggerInputStream(this.wrapped, getLogger(), LEVEL);
+ this.in = new LoggerInputStream(this.wrapped, getExtendedLogger(), LEVEL);
final byte[] bytes = new byte[1024];
this.in.read(bytes);
@@ -116,7 +116,7 @@ public class LoggerInputStreamTest extends AbstractStreamTest {
@Test
public void testRead_MultipleLines() throws IOException {
this.wrapped = new ByteArrayInputStream((FIRST + "\n" + LAST + '\n').getBytes());
- this.in = new LoggerInputStream(this.wrapped, getLogger(), LEVEL);
+ this.in = new LoggerInputStream(this.wrapped, getExtendedLogger(), LEVEL);
final byte[] bytes = new byte[1024];
final int len = this.in.read(bytes);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
index a42c5bb..115d57e 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerOutputStreamTest.java
@@ -34,7 +34,7 @@ public class LoggerOutputStreamTest extends AbstractStreamTest {
protected OutputStream out;
protected OutputStream createOutputStream() {
- return new LoggerOutputStream(this.wrapped, getLogger(), Level.ERROR);
+ return new LoggerOutputStream(this.wrapped, getExtendedLogger(), Level.ERROR);
}
@Before
@@ -66,7 +66,7 @@ public class LoggerOutputStreamTest extends AbstractStreamTest {
out.close();
replay(out);
- final LoggerOutputStream los = new LoggerOutputStream(out, getLogger(), LEVEL);
+ final LoggerOutputStream los = new LoggerOutputStream(out, getExtendedLogger(), LEVEL);
los.flush();
los.close();
verify(out);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
index 399738d..812043a 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintStreamTest.java
@@ -28,7 +28,7 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
@Override
protected OutputStream createOutputStream() {
- return this.print = new LoggerPrintStream(this.wrapped, getLogger(), LEVEL);
+ return this.print = new LoggerPrintStream(this.wrapped, getExtendedLogger(), LEVEL);
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
index 5e46e65..d10b962 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerPrintWriterTest.java
@@ -35,7 +35,7 @@ public class LoggerPrintWriterTest extends AbstractLoggerWriterTest {
@Override
protected Writer createWriterWrapper() {
- this.print = new LoggerPrintWriter(this.wrapped, getLogger(), LEVEL);
+ this.print = new LoggerPrintWriter(this.wrapped, getExtendedLogger(), LEVEL);
return this.print;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
index 6ca45a9..662c8be 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerReaderTest.java
@@ -34,7 +34,7 @@ public class LoggerReaderTest extends AbstractStreamTest {
protected Reader reader;
protected Reader createReader() {
- return new LoggerReader(this.wrapped, getLogger(), LEVEL);
+ return new LoggerReader(this.wrapped, getExtendedLogger(), LEVEL);
}
@Before
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterFilterTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterFilterTest.java
index d55bf66..93827b1 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterFilterTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterFilterTest.java
@@ -12,7 +12,7 @@ public class LoggerWriterFilterTest extends AbstractLoggerWriterTest {
@Override
protected Writer createWriterWrapper() {
- return new LoggerWriterFilter(this.wrapped, getLogger(), LEVEL);
+ return new LoggerWriterFilter(this.wrapped, getExtendedLogger(), LEVEL);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c682ad5d/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterTest.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterTest.java
index 42a474b..8378348 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterTest.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterTest.java
@@ -28,7 +28,7 @@ public class LoggerWriterTest extends AbstractLoggerWriterTest {
@Override
protected Writer createWriterWrapper() {
- return new LoggerWriter(getLogger(), LEVEL);
+ return new LoggerWriter(getExtendedLogger(), LEVEL);
}
}