Oops, got the FilterWriter class name backwards. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9c878544 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9c878544 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9c878544
Branch: refs/heads/LOG4J2-608 Commit: 9c878544b754d31b231a44a48fe96bf979d94e6f Parents: 327d432 Author: Gary Gregory <[email protected]> Authored: Tue Sep 2 20:51:28 2014 -0400 Committer: Gary Gregory <[email protected]> Committed: Tue Sep 2 20:51:28 2014 -0400 ---------------------------------------------------------------------- .../log4j/streams/LoggerFilterWriter.java | 99 ++++++++++++++++++++ .../log4j/streams/LoggerPrintWriter.java | 2 +- .../logging/log4j/streams/LoggerStreams.java | 4 +- .../log4j/streams/LoggerWriterFilter.java | 99 -------------------- .../log4j/streams/LoggerFilterWriterTest.java | 18 ++++ .../log4j/streams/LoggerWriterFilterTest.java | 18 ---- 6 files changed, 120 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c878544/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerFilterWriter.java ---------------------------------------------------------------------- diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerFilterWriter.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerFilterWriter.java new file mode 100644 index 0000000..2735d89 --- /dev/null +++ b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerFilterWriter.java @@ -0,0 +1,99 @@ +/* + * 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.logging.log4j.streams; + +import java.io.FilterWriter; +import java.io.IOException; +import java.io.Writer; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.spi.ExtendedLogger; +import org.apache.logging.log4j.streams.util.CharStreamLogger; + +/** + * Logs each line written to a pre-defined level. Can also be configured with a Marker. This class provides an interface + * that follows the {@link java.io.Writer} methods in spirit, but doesn't require output to any external out. + */ +public class LoggerFilterWriter extends FilterWriter { + private static final String FQCN = LoggerFilterWriter.class.getName(); + + private final CharStreamLogger logger; + private final String fqcn; + + public LoggerFilterWriter(final Writer out, final ExtendedLogger logger, final String fqcn, final Level level, + final Marker marker) { + super(out); + this.logger = new CharStreamLogger(logger, level, marker); + this.fqcn = fqcn; + } + + public LoggerFilterWriter(final Writer out, final ExtendedLogger logger, final Level level) { + this(out, logger, FQCN, level, null); + } + + public LoggerFilterWriter(final Writer out, final ExtendedLogger logger, final Level level, final Marker marker) { + this(out, logger, FQCN, level, marker); + } + + @Override + public void close() throws IOException { + this.out.close(); + this.logger.close(this.fqcn); + } + + @Override + public void flush() throws IOException { + this.out.flush(); + } + + @Override + public String toString() { + return LoggerFilterWriter.class.getSimpleName() + "{writer=" + this.out + '}'; + } + + @Override + public void write(final char[] cbuf) throws IOException { + this.out.write(cbuf); + this.logger.put(this.fqcn, cbuf, 0, cbuf.length); + } + + @Override + public void write(final char[] cbuf, final int off, final int len) throws IOException { + this.out.write(cbuf, off, len); + this.logger.put(this.fqcn, cbuf, off, len); + } + + @Override + public void write(final int c) throws IOException { + this.out.write(c); + this.logger.put(this.fqcn, (char) c); + } + + @Override + public void write(final String str) throws IOException { + this.out.write(str); + this.logger.put(this.fqcn, str, 0, str.length()); + } + + @Override + public void write(final String str, final int off, final int len) throws IOException { + this.out.write(str, off, len); + this.logger.put(this.fqcn, str, off, len); + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c878544/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 cb9b350..2a6b02a 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 @@ -54,7 +54,7 @@ public class LoggerPrintWriter extends PrintWriter { @SuppressWarnings("resource") public LoggerPrintWriter(final Writer writer, final boolean autoFlush, final ExtendedLogger logger, final String fqcn, final Level level, final Marker marker) { - super(new LoggerWriterFilter(writer, logger, fqcn, level, marker), autoFlush); + super(new LoggerFilterWriter(writer, logger, fqcn, level, marker), autoFlush); } public LoggerPrintWriter(final Writer writer, final boolean autoFlush, final ExtendedLogger logger, final Level level) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c878544/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 3a99c28..bef87b5 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 @@ -88,8 +88,8 @@ public class LoggerStreams { return new BufferedBuilder(this.logger, this.level, this.marker, 0); } - public LoggerWriterFilter create(final Writer writer) { - return new LoggerWriterFilter(writer, this.logger, this.level, this.marker); + public LoggerFilterWriter create(final Writer writer) { + return new LoggerFilterWriter(writer, this.logger, this.level, this.marker); } public Builder marker(final Marker marker) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c878544/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 deleted file mode 100644 index 0ecc719..0000000 --- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/LoggerWriterFilter.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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.logging.log4j.streams; - -import java.io.FilterWriter; -import java.io.IOException; -import java.io.Writer; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.spi.ExtendedLogger; -import org.apache.logging.log4j.streams.util.CharStreamLogger; - -/** - * Logs each line written to a pre-defined level. Can also be configured with a Marker. This class provides an interface - * that follows the {@link java.io.Writer} methods in spirit, but doesn't require output to any external out. - */ -public class LoggerWriterFilter extends FilterWriter { - private static final String FQCN = LoggerWriterFilter.class.getName(); - - private final CharStreamLogger logger; - private final String fqcn; - - public LoggerWriterFilter(final Writer out, final ExtendedLogger logger, final String fqcn, final Level level, - final Marker marker) { - super(out); - this.logger = new CharStreamLogger(logger, level, marker); - this.fqcn = fqcn; - } - - public LoggerWriterFilter(final Writer out, final ExtendedLogger logger, final Level level) { - this(out, logger, FQCN, level, null); - } - - public LoggerWriterFilter(final Writer out, final ExtendedLogger logger, final Level level, final Marker marker) { - this(out, logger, FQCN, level, marker); - } - - @Override - public void close() throws IOException { - this.out.close(); - this.logger.close(this.fqcn); - } - - @Override - public void flush() throws IOException { - this.out.flush(); - } - - @Override - public String toString() { - return LoggerWriterFilter.class.getSimpleName() + "{writer=" + this.out + '}'; - } - - @Override - public void write(final char[] cbuf) throws IOException { - this.out.write(cbuf); - this.logger.put(this.fqcn, cbuf, 0, cbuf.length); - } - - @Override - public void write(final char[] cbuf, final int off, final int len) throws IOException { - this.out.write(cbuf, off, len); - this.logger.put(this.fqcn, cbuf, off, len); - } - - @Override - public void write(final int c) throws IOException { - this.out.write(c); - this.logger.put(this.fqcn, (char) c); - } - - @Override - public void write(final String str) throws IOException { - this.out.write(str); - this.logger.put(this.fqcn, str, 0, str.length()); - } - - @Override - public void write(final String str, final int off, final int len) throws IOException { - this.out.write(str, off, len); - this.logger.put(this.fqcn, str, off, len); - } -} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c878544/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerFilterWriterTest.java ---------------------------------------------------------------------- diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerFilterWriterTest.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerFilterWriterTest.java new file mode 100644 index 0000000..99a1207 --- /dev/null +++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerFilterWriterTest.java @@ -0,0 +1,18 @@ +package org.apache.logging.log4j.streams; + +import java.io.StringWriter; +import java.io.Writer; + +public class LoggerFilterWriterTest extends AbstractLoggerWriterTest { + + @Override + protected StringWriter createWriter() { + return new StringWriter(); + } + + @Override + protected Writer createWriterWrapper() { + return new LoggerFilterWriter(this.wrapped, getExtendedLogger(), LEVEL); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c878544/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 deleted file mode 100644 index 93827b1..0000000 --- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerWriterFilterTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.apache.logging.log4j.streams; - -import java.io.StringWriter; -import java.io.Writer; - -public class LoggerWriterFilterTest extends AbstractLoggerWriterTest { - - @Override - protected StringWriter createWriter() { - return new StringWriter(); - } - - @Override - protected Writer createWriterWrapper() { - return new LoggerWriterFilter(this.wrapped, getExtendedLogger(), LEVEL); - } - -}
