You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/03 03:37:25 UTC
[04/29] git commit: Add final modifier to private fields Add final
modifier to method parameters Add final modifier to local variables
Add final modifier to private fields
Add final modifier to method parameters
Add final modifier to local variables
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f25c5392
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f25c5392
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f25c5392
Branch: refs/heads/LOG4J2-608
Commit: f25c5392ab61534203826329d3cdf02a1143ae19
Parents: c6f88b6
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Sep 2 09:22:23 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Sep 2 09:22:23 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/streams/LoggerStreams.java | 2 +-
.../apache/logging/log4j/streams/LoggerInputStreamTest.java | 4 ++--
.../apache/logging/log4j/streams/LoggerOutputStreamTest.java | 6 +++---
.../apache/logging/log4j/streams/LoggerPrintStreamTest.java | 2 +-
.../apache/logging/log4j/streams/LoggerPrintWriterTest.java | 2 +-
.../org/apache/logging/log4j/streams/LoggerReaderTest.java | 4 ++--
.../logging/log4j/streams/LoggerStreamsCallerInfoTesting.java | 4 ++--
.../org/apache/logging/log4j/streams/LoggerWriterTest.java | 6 +++---
.../java/org/apache/logging/log4j/streams/StreamTesting.java | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 f74ce7e..1ad59d9 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
@@ -114,7 +114,7 @@ public class LoggerStreams {
public LoggerPrintStream create(final OutputStream out, final Charset charset) {
try {
return new LoggerPrintStream(out, autoFlush, charset, logger, level, marker);
- } catch (UnsupportedEncodingException e) {
+ } catch (final UnsupportedEncodingException e) {
// Should never occur because the constructor must throw this
throw new IllegalArgumentException("Invalid charset", e);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 919449b..3d11e02 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
@@ -84,7 +84,7 @@ public class LoggerInputStreamTest extends StreamTesting {
@Test
public void testRead_IgnoresWindowsNewline() throws IOException {
final byte[] bytes = new byte[1024];
- int len = in.read(bytes);
+ final int len = in.read(bytes);
read.write(bytes, 0, len);
assertMessages(FIRST);
assertEquals(FIRST + "\r\n" + LAST, read.toString());
@@ -98,7 +98,7 @@ public class LoggerInputStreamTest extends StreamTesting {
in = new LoggerInputStream(wrapped, getLogger(), LEVEL);
final byte[] bytes = new byte[1024];
- int len = in.read(bytes);
+ final int len = in.read(bytes);
read.write(bytes, 0, len);
assertMessages(FIRST, LAST);
assertEquals(FIRST + '\n' + LAST + '\n', read.toString());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 94c4c55..21ebef1 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
@@ -45,7 +45,7 @@ public class LoggerOutputStreamTest extends StreamTesting {
@Test
public void testWrite_Int() throws Exception {
- for (byte b : "int".getBytes()) {
+ for (final byte b : "int".getBytes()) {
out.write(b);
assertMessages();
}
@@ -67,8 +67,8 @@ public class LoggerOutputStreamTest extends StreamTesting {
@Test
public void testWrite_ByteArray_Offset_Length() throws Exception {
final byte[] bytes = "byte[]".getBytes();
- int middle = bytes.length/2;
- int length = bytes.length - middle;
+ final int middle = bytes.length/2;
+ final int length = bytes.length - middle;
final String right = new String(bytes, middle, length);
out.write(bytes, middle, length);
assertMessages();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 9cae0dc..b793910 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
@@ -42,7 +42,7 @@ public class LoggerPrintStreamTest extends LoggerOutputStreamTest {
@Test
public void testPrint_char() throws Exception {
- for (char c : FIRST.toCharArray()) {
+ for (final char c : FIRST.toCharArray()) {
print.print(c);
assertMessages();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 e8d2996..2e33a37 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
@@ -44,7 +44,7 @@ public class LoggerPrintWriterTest extends LoggerWriterTest {
@Test
public void testPrint_char() throws Exception {
- for (char c : FIRST.toCharArray()) {
+ for (final char c : FIRST.toCharArray()) {
print.print(c);
assertMessages();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 f94c96c..b41b9c6 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
@@ -94,7 +94,7 @@ public class LoggerReaderTest extends StreamTesting {
@Test
public void testRead_IgnoresWindowsNewline() throws IOException {
final char[] chars = new char[1024];
- int len = reader.read(chars);
+ final int len = reader.read(chars);
read.write(chars, 0, len);
if (!(reader instanceof BufferedReader)) {
assertMessages(FIRST);
@@ -110,7 +110,7 @@ public class LoggerReaderTest extends StreamTesting {
reader = createReader();
final char[] chars = new char[1024];
- int len = reader.read(chars);
+ final int len = reader.read(chars);
read.write(chars, 0, len);
assertMessages(FIRST, LAST);
assertEquals(FIRST + '\n' + LAST + '\n', read.toString());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
index 430d4b7..5d81380 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/LoggerStreamsCallerInfoTesting.java
@@ -41,8 +41,8 @@ public class LoggerStreamsCallerInfoTesting {
((ListAppender) ctx.getAppender("ClassAndMethod")).clear();
}
- public void assertMessages(final String msg, int size, String methodName) {
- ListAppender appender = (ListAppender) ctx.getAppender("ClassAndMethod");
+ public void assertMessages(final String msg, final int size, final String methodName) {
+ final ListAppender appender = (ListAppender) ctx.getAppender("ClassAndMethod");
assertEquals(msg + ".size", size, appender.getMessages().size());
for (final String message : appender.getMessages()) {
assertEquals(msg + " has incorrect caller info", this.getClass().getName() + '.' + methodName, message);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/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 b14fdc0..ea188af 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
@@ -56,8 +56,8 @@ public class LoggerWriterTest extends StreamTesting {
@Test
public void testWrite_CharArray_Offset_Length() throws Exception {
final char[] chars = FIRST.toCharArray();
- int middle = chars.length / 2;
- int length = chars.length - middle;
+ final int middle = chars.length / 2;
+ final int length = chars.length - middle;
final String right = new String(chars, middle, length);
writer.write(chars, middle, length);
assertMessages();
@@ -68,7 +68,7 @@ public class LoggerWriterTest extends StreamTesting {
@Test
public void testWrite_Character() throws Exception {
- for (char c : FIRST.toCharArray()) {
+ for (final char c : FIRST.toCharArray()) {
writer.write(c);
assertMessages();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f25c5392/log4j-streams/src/test/java/org/apache/logging/log4j/streams/StreamTesting.java
----------------------------------------------------------------------
diff --git a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/StreamTesting.java b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/StreamTesting.java
index 80adf20..c2d9a61 100644
--- a/log4j-streams/src/test/java/org/apache/logging/log4j/streams/StreamTesting.java
+++ b/log4j-streams/src/test/java/org/apache/logging/log4j/streams/StreamTesting.java
@@ -51,7 +51,7 @@ public class StreamTesting {
}
protected void assertMessages(final String... messages) {
- List<String> actualMsgs = ((ListAppender) ctx.getAppender("UnitTest")).getMessages();
+ final List<String> actualMsgs = ((ListAppender) ctx.getAppender("UnitTest")).getMessages();
assertEquals("Unexpected number of results.", messages.length, actualMsgs.size());
for (int i = 0; i < messages.length; i++) {
final String start = LEVEL.name() + ' ' + messages[i];