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 2018/10/30 16:53:29 UTC
[02/13] logging-log4j2 git commit: Use final.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
index 8b965b6..01a448a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ClockFactory.java
@@ -68,7 +68,7 @@ public final class ClockFactory {
}
private static Map<String, Supplier<Clock>> aliases() {
- Map<String, Supplier<Clock>> result = new HashMap<>();
+ final Map<String, Supplier<Clock>> result = new HashMap<>();
result.put("SystemClock", new Supplier<Clock>() { @Override public Clock get() { return new SystemClock(); } });
result.put("SystemMillisClock", new Supplier<Clock>() { @Override public Clock get() { return new SystemMillisClock(); } });
result.put("CachedClock", new Supplier<Clock>() { @Override public Clock get() { return CachedClock.instance(); } });
@@ -84,7 +84,7 @@ public final class ClockFactory {
LOGGER.trace("Using default SystemClock for timestamps.");
return logSupportedPrecision(new SystemClock());
}
- Supplier<Clock> specified = aliases().get(userRequest);
+ final Supplier<Clock> specified = aliases().get(userRequest);
if (specified != null) {
LOGGER.trace("Using specified {} for timestamps.", userRequest);
return logSupportedPrecision(specified.get());
@@ -100,8 +100,8 @@ public final class ClockFactory {
}
}
- private static Clock logSupportedPrecision(Clock clock) {
- String support = clock instanceof PreciseClock ? "supports" : "does not support";
+ private static Clock logSupportedPrecision(final Clock clock) {
+ final String support = clock instanceof PreciseClock ? "supports" : "does not support";
LOGGER.debug("{} {} precise timestamps.", clock.getClass().getName(), support);
return clock;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
index 1380b7a..ee36fea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
@@ -276,7 +276,7 @@ public final class Loader {
InstantiationException,
NoSuchMethodException,
InvocationTargetException {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.newInstanceOf(className);
@@ -305,7 +305,7 @@ public final class Loader {
IllegalAccessException,
InvocationTargetException,
InstantiationException {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.newCheckedInstanceOf(className, clazz);
@@ -332,7 +332,7 @@ public final class Loader {
throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException,
IllegalAccessException {
final String className = PropertiesUtil.getProperties().getStringProperty(propertyName);
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.newCheckedInstanceOfProperty(propertyName, clazz);
@@ -348,7 +348,7 @@ public final class Loader {
* @return {@code true} if the class could be found or {@code false} otherwise.
*/
public static boolean isClassAvailable(final String className) {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.isClassAvailable(className);
@@ -371,7 +371,7 @@ public final class Loader {
*/
public static Class<?> loadClass(final String className) throws ClassNotFoundException {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClassLoader());
return LoaderUtil.loadClass(className);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
index f814b62..f58a29b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
@@ -539,11 +539,11 @@ public class FixedDateFormat {
1, // 5
};
- private void formatNanoOfMillisecond(int nanoOfMillisecond, final char[] buffer, int pos) {
+ private void formatNanoOfMillisecond(final int nanoOfMillisecond, final char[] buffer, int pos) {
int temp;
int remain = nanoOfMillisecond;
for (int i = 0; i < secondFractionDigits - FixedFormat.MILLI_FRACTION_DIGITS; i++) {
- int divisor = TABLE[i];
+ final int divisor = TABLE[i];
temp = remain / divisor;
buffer[pos++] = ((char) (temp + '0'));
remain -= divisor * temp; // equivalent of remain % 10
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
index 9996f8b..0205720 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/EventParameterMemoryLeakTest.java
@@ -50,7 +50,7 @@ public class EventParameterMemoryLeakTest {
assertTrue("Deleted old file before test", !file.exists() || file.delete());
final Logger log = LogManager.getLogger("com.foo.Bar");
- CountDownLatch latch = new CountDownLatch(1);
+ final CountDownLatch latch = new CountDownLatch(1);
Object parameter = new ParameterObject("paramValue", latch);
log.info("Message with parameter {}", parameter);
log.info(parameter);
@@ -71,7 +71,7 @@ public class EventParameterMemoryLeakTest {
assertThat(line3, containsString("paramValue"));
assertThat(line4, containsString("paramValue"));
assertNull("Expected only three lines", line5);
- GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
+ final GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
gcHelper.run();
try {
assertTrue("Parameter should have been garbage collected", latch.await(30, TimeUnit.SECONDS));
@@ -83,7 +83,7 @@ public class EventParameterMemoryLeakTest {
private static final class ParameterObject {
private final String value;
private final CountDownLatch latch;
- ParameterObject(String value, CountDownLatch latch) {
+ ParameterObject(final String value, final CountDownLatch latch) {
this.value = value;
this.latch = latch;
}
@@ -103,7 +103,7 @@ public class EventParameterMemoryLeakTest {
private static final class ObjectThrowable extends RuntimeException {
private final Object object;
- ObjectThrowable(Object object) {
+ ObjectThrowable(final Object object) {
super(String.valueOf(object));
this.object = object;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
index 01b9d8a..0e0c9ad 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
@@ -40,7 +40,7 @@ final class GarbageCollectionHelper implements Closeable, Runnable {
try {
// 1mb of heap
sink.write(new byte[1024 * 1024]);
- } catch (IOException ignored) {
+ } catch (final IOException ignored) {
}
// May no-op depending on the jvm configuration
System.gc();
@@ -64,7 +64,7 @@ final class GarbageCollectionHelper implements Closeable, Runnable {
try {
assertTrue("GarbageCollectionHelper did not shut down cleanly",
latch.await(10, TimeUnit.SECONDS));
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
index c08f705..c4d212d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/ReusableParameterizedMessageMemoryLeakTest.java
@@ -30,12 +30,12 @@ public class ReusableParameterizedMessageMemoryLeakTest {
@Test
@SuppressWarnings("UnusedAssignment") // parameter set to null to allow garbage collection
public void testParametersAreNotLeaked() throws Exception {
- CountDownLatch latch = new CountDownLatch(1);
- ReusableMessage message = (ReusableMessage) ReusableMessageFactory.INSTANCE.newMessage(
+ final CountDownLatch latch = new CountDownLatch(1);
+ final ReusableMessage message = (ReusableMessage) ReusableMessageFactory.INSTANCE.newMessage(
"foo {}", new ParameterObject("paramValue", latch));
// Large enough for the parameters, but smaller than the default reusable array size.
message.swapParameters(new Object[5]);
- GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
+ final GarbageCollectionHelper gcHelper = new GarbageCollectionHelper();
gcHelper.run();
try {
assertTrue("Parameter should have been garbage collected", latch.await(30, TimeUnit.SECONDS));
@@ -47,7 +47,7 @@ public class ReusableParameterizedMessageMemoryLeakTest {
private static final class ParameterObject {
private final String value;
private final CountDownLatch latch;
- ParameterObject(String value, CountDownLatch latch) {
+ ParameterObject(final String value, final CountDownLatch latch) {
this.value = value;
this.latch = latch;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
index 5cba8e0..0f6fca9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/TestPatternConverters.java
@@ -44,7 +44,7 @@ public final class TestPatternConverters {
@Override
public void format(final LogEvent event, final StringBuilder toAppendTo) {
toAppendTo.append('[');
- Object[] parameters = event.getMessage().getParameters();
+ final Object[] parameters = event.getMessage().getParameters();
if (parameters != null) {
for (int i = 0; i < parameters.length; i++) {
StringBuilders.appendValue(toAppendTo, parameters[i]);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
index d0ff679..59fc45f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java
@@ -53,7 +53,7 @@ public class ConsoleAppenderBuilderTest {
@Test
public void testSetNullErrorHandlerIsNotAllowed() {
final ConsoleAppender appender = ConsoleAppender.newBuilder().setName("test").build();
- ErrorHandler handler = appender.getHandler();
+ final ErrorHandler handler = appender.getHandler();
Assert.assertNotNull(handler);
// This could likely be allowed to throw, but we're just testing that
// setting null does not actually set a null handler.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
index 5e063ee..bfc6963 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
@@ -41,7 +41,7 @@ public class HangingAppender extends AbstractAppender {
private final long shutdownDelay;
public HangingAppender(final String name, final long delay, final long startupDelay, final long shutdownDelay,
- Property[] properties) {
+ final Property[] properties) {
super(name, null, null, true, Property.EMPTY_ARRAY);
this.delay = delay;
this.startupDelay = startupDelay;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
index 323ca13..1680d16 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
@@ -87,9 +87,9 @@ public class JsonCompleteFileAppenderTest {
logger.error(logMsg, new IllegalArgumentException("badarg"));
this.loggerContextRule.getLoggerContext().stop(); // stops async thread
- List<String> lines = Files.readAllLines(logFile.toPath(), Charset.forName("UTF8"));
+ final List<String> lines = Files.readAllLines(logFile.toPath(), Charset.forName("UTF8"));
- String[] expected = {
+ final String[] expected = {
"[", // equals
"{", // equals
" \"thread\" : \"main\",", //
@@ -104,7 +104,7 @@ public class JsonCompleteFileAppenderTest {
" },", //
};
for (int i = 0; i < expected.length; i++) {
- String line = lines.get(i);
+ final String line = lines.get(i);
assertTrue("line " + i + " incorrect: [" + line + "], does not contain: [" + expected[i] + ']', line.contains(expected[i]));
}
final String location = "testFlushAtEndOfBatch";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
index 91503d3..ccac7e6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderAsyncTest.java
@@ -64,7 +64,7 @@ public class SmtpAppenderAsyncTest {
testSmtpAppender(ctx.getLogger("async"));
}
- private void testSmtpAppender(Logger logger) {
+ private void testSmtpAppender(final Logger logger) {
ThreadContext.put("MDC1", "mdc1");
logger.error("the message");
ctx.getLoggerContext().stop();
@@ -78,7 +78,7 @@ public class SmtpAppenderAsyncTest {
assertEquals("from@example.com", email.getHeaderValue("From"));
assertEquals("[mdc1]", email.getHeaderValue("Subject"));
- String body = email.getBody();
+ final String body = email.getBody();
if (!body.contains("Body:[mdc1]")) {
fail(body);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 08b7f20..a817814 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -294,7 +294,7 @@ public class SocketAppenderTest {
thread.interrupt();
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Unable to stop server");
}
}
@@ -361,7 +361,7 @@ public class SocketAppenderTest {
interrupt();
try {
this.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Unable to stop server");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
index c77b464..fd0859a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
@@ -141,7 +141,7 @@ public class XmlCompleteFileAppenderTest {
logger.info(secondLogMsg);
CoreLoggerContexts.stopLoggerContext(false, logFile); // stop async thread
- int[] indentations = {
+ final int[] indentations = {
0, //"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
0, //"<Events xmlns=\"http://logging.apache.org/log4j/2.0/events\">\n"
-1, // empty
@@ -156,15 +156,15 @@ public class XmlCompleteFileAppenderTest {
2, //" </Event>\n" +
0, //"</Events>\n";
};
- List<String> lines1 = Files.readAllLines(logFile.toPath(), Charset.forName("UTF-8"));
+ final List<String> lines1 = Files.readAllLines(logFile.toPath(), Charset.forName("UTF-8"));
assertEquals("number of lines", indentations.length, lines1.size());
for (int i = 0; i < indentations.length; i++) {
- String line = lines1.get(i);
+ final String line = lines1.get(i);
if (line.trim().isEmpty()) {
assertEquals(-1, indentations[i]);
} else {
- String padding = " ".substring(0, indentations[i]);
+ final String padding = " ".substring(0, indentations[i]);
assertTrue("Expected " + indentations[i] + " leading spaces but got: " + line, line.startsWith(padding));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
index f9cdff3..3fd2f71 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
@@ -56,10 +56,10 @@ public class XmlFileAppenderTest {
log.info(logMsg);
CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread
- List<String> lines = Files.readAllLines(file.toPath(), Charset.forName("UTF8"));
+ final List<String> lines = Files.readAllLines(file.toPath(), Charset.forName("UTF8"));
file.delete();
- String[] expect = {
+ final String[] expect = {
"", // ? unsure why initial empty line...
"<Event ", //
"<Instant epochSecond=", //
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
index 932724d..c042032 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManagerTest.java
@@ -246,7 +246,7 @@ public class AbstractDatabaseManagerTest {
}
@Override
- protected void writeInternal(LogEvent event, Serializable serializable) {
+ protected void writeInternal(final LogEvent event, final Serializable serializable) {
// noop
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
index c6b2de1..b7ad8ac 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSourceTest.java
@@ -28,14 +28,14 @@ public class DriverManagerConnectionSourceTest {
@Test
public void testH2Properties() throws SQLException {
- Property[] properties = new Property[] {
+ final Property[] properties = new Property[] {
// @formatter:off
Property.createProperty("username", JdbcH2TestHelper.USER_NAME),
Property.createProperty("password", JdbcH2TestHelper.PASSWORD),
// @formatter:on
};
// @formatter:off
- DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
+ final DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
.setConnectionString(JdbcH2TestHelper.CONNECTION_STRING_MEM)
.setProperties(properties)
.build();
@@ -48,7 +48,7 @@ public class DriverManagerConnectionSourceTest {
@Test
public void testH2UserAndPassword() throws SQLException {
// @formatter:off
- DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
+ final DriverManagerConnectionSource source = DriverManagerConnectionSource.newBuilder()
.setConnectionString(JdbcH2TestHelper.CONNECTION_STRING_MEM)
.setUserName(JdbcH2TestHelper.USER_NAME.toCharArray())
.setPassword(JdbcH2TestHelper.PASSWORD.toCharArray())
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
index a45139b..027919d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderMapMessageDataSourceTest.java
@@ -97,7 +97,7 @@ public class JdbcAppenderMapMessageDataSourceTest {
writer.close();
final Logger logger = LogManager.getLogger(this.getClass().getName() + ".testDataSourceConfig");
- MapMessage mapMessage = new MapMessage();
+ final MapMessage mapMessage = new MapMessage();
mapMessage.with("Id", 1);
mapMessage.with("ColumnA", "ValueA");
mapMessage.with("ColumnB", "ValueB");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
index f77ef56..1dda3aa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderStringSubstitutionTest.java
@@ -42,11 +42,11 @@ public class JdbcAppenderStringSubstitutionTest {
@Test
public void test() throws Exception {
- JdbcAppender appender = rule.getAppender("databaseAppender", JdbcAppender.class);
+ final JdbcAppender appender = rule.getAppender("databaseAppender", JdbcAppender.class);
Assert.assertNotNull(appender);
- JdbcDatabaseManager manager = appender.getManager();
+ final JdbcDatabaseManager manager = appender.getManager();
Assert.assertNotNull(manager);
- String sqlStatement = manager.getSqlStatement();
+ final String sqlStatement = manager.getSqlStatement();
Assert.assertFalse(sqlStatement, sqlStatement.contains(KEY));
Assert.assertTrue(sqlStatement, sqlStatement.contains(VALUE));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
index a8d3566..aaa5441 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
@@ -39,15 +39,15 @@ public class KafkaAppenderCloseTimeoutTest {
public void close() {
try {
Thread.sleep(3000);
- } catch (InterruptedException ignore) {
+ } catch (final InterruptedException ignore) {
}
}
@Override
- public void close(long timeout, TimeUnit timeUnit) {
+ public void close(final long timeout, final TimeUnit timeUnit) {
try {
Thread.sleep(timeUnit.toMillis(timeout));
- } catch (InterruptedException ignore) {
+ } catch (final InterruptedException ignore) {
}
}
};
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
index 613bd74..80a93a9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderTest.java
@@ -137,8 +137,8 @@ public class KafkaAppenderTest {
final ProducerRecord<byte[], byte[]> item = history.get(0);
assertNotNull(item);
assertEquals(TOPIC_NAME, item.topic());
- String msgKey = item.key().toString();
- byte[] keyValue = "key".getBytes(StandardCharsets.UTF_8);
+ final String msgKey = item.key().toString();
+ final byte[] keyValue = "key".getBytes(StandardCharsets.UTF_8);
assertArrayEquals(item.key(), keyValue);
assertEquals(LOG_MESSAGE, new String(item.value(), StandardCharsets.UTF_8));
}
@@ -147,15 +147,15 @@ public class KafkaAppenderTest {
public void testAppendWithKeyLookup() throws Exception {
final Appender appender = ctx.getRequiredAppender("KafkaAppenderWithKeyLookup");
final LogEvent logEvent = createLogEvent();
- Date date = new Date();
- SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy");
+ final Date date = new Date();
+ final SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy");
appender.append(logEvent);
final List<ProducerRecord<byte[], byte[]>> history = kafka.history();
assertEquals(1, history.size());
final ProducerRecord<byte[], byte[]> item = history.get(0);
assertNotNull(item);
assertEquals(TOPIC_NAME, item.topic());
- byte[] keyValue = format.format(date).getBytes(StandardCharsets.UTF_8);
+ final byte[] keyValue = format.format(date).getBytes(StandardCharsets.UTF_8);
assertArrayEquals(item.key(), keyValue);
assertEquals(LOG_MESSAGE, new String(item.value(), StandardCharsets.UTF_8));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
index 0d8edaf..d1398d3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteWithReconfigureTest.java
@@ -57,7 +57,7 @@ public class RollingAppenderDirectWriteWithReconfigureTest {
@SuppressWarnings("resource") // managed by the rule.
final LoggerContext context = loggerContextRule.getLoggerContext();
- Configuration config = context.getConfiguration();
+ final Configuration config = context.getConfiguration();
context.setConfigLocation(new URI(CONFIG));
context.reconfigure();
logger.debug("Force a rollover");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
index 301fb73..1cf88c4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest3.java
@@ -53,7 +53,7 @@ public class AsyncLoggerConfigTest3 {
}
final Message msg = new ParameterizedMessage("{}", map);
- Log4jLogEvent event = Log4jLogEvent.newBuilder()
+ final Log4jLogEvent event = Log4jLogEvent.newBuilder()
.setLevel(Level.WARN)
.setLoggerName(getClass().getName())
.setMessage(msg)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
index 454c08e..00ddcf4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigWithAsyncEnabledTest.java
@@ -57,7 +57,7 @@ public class AsyncLoggerConfigWithAsyncEnabledTest {
assertTrue("Deleted old file before test", !file.exists() || file.delete());
final Logger log = LogManager.getLogger("com.foo.Bar");
- String format = "Additive logging: {} for the price of {}!";
+ final String format = "Additive logging: {} for the price of {}!";
log.info(format, 2, 1);
CoreLoggerContexts.stopLoggerContext(file); // stop async thread
@@ -67,7 +67,7 @@ public class AsyncLoggerConfigWithAsyncEnabledTest {
reader.close();
file.delete();
- String expected = "Additive logging: {} for the price of {}! [2,1] Additive logging: 2 for the price of 1!";
+ final String expected = "Additive logging: {} for the price of {}! [2,1] Additive logging: 2 for the price of 1!";
assertThat(line1, containsString(expected));
assertThat(line2, containsString(expected));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
index 56cbfc6..e5984aa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java
@@ -88,12 +88,12 @@ public class AsyncLoggerCustomSelectorLocationTest {
public static final class CustomAsyncContextSelector implements ContextSelector {
private static final LoggerContext CONTEXT = new AsyncLoggerContext("AsyncDefault");
@Override
- public LoggerContext getContext(String fqcn, ClassLoader loader, boolean currentContext) {
+ public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext) {
return CONTEXT;
}
@Override
- public LoggerContext getContext(String fqcn, ClassLoader loader, boolean currentContext, URI configLocation) {
+ public LoggerContext getContext(final String fqcn, final ClassLoader loader, final boolean currentContext, final URI configLocation) {
return CONTEXT;
}
@@ -103,7 +103,7 @@ public class AsyncLoggerCustomSelectorLocationTest {
}
@Override
- public void removeContext(LoggerContext context) {
+ public void removeContext(final LoggerContext context) {
// does not remove anything
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
index 6c8423f..c8e5ecd 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/BlockingAppender.java
@@ -64,7 +64,7 @@ public class BlockingAppender extends AbstractAppender {
// block until the test class tells us to continue
try {
countDownLatch.await();
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
index d0542dc..187a08f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAbstractTest.java
@@ -40,7 +40,7 @@ public abstract class QueueFullAbstractTest {
protected BlockingAppender blockingAppender;
protected Unlocker unlocker;
- protected static void TRACE(Object msg) {
+ protected static void TRACE(final Object msg) {
if (TRACE) {
System.out.println(msg);
}
@@ -48,7 +48,7 @@ public abstract class QueueFullAbstractTest {
class Unlocker extends Thread {
final CountDownLatch countDownLatch;
- Unlocker(CountDownLatch countDownLatch) {
+ Unlocker(final CountDownLatch countDownLatch) {
this.countDownLatch = countDownLatch;
}
@Override
@@ -57,7 +57,7 @@ public abstract class QueueFullAbstractTest {
countDownLatch.await();
TRACE("Unlocker activated. Sleeping 500 millis before taking action...");
Thread.sleep(500);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
throw new RuntimeException(e);
}
TRACE("Unlocker signalling BlockingAppender to proceed...");
@@ -66,9 +66,9 @@ public abstract class QueueFullAbstractTest {
}
class DomainObject {
- private Logger innerLogger = LogManager.getLogger(DomainObject.class);
+ private final Logger innerLogger = LogManager.getLogger(DomainObject.class);
final int count;
- DomainObject(int loggingCount) {
+ DomainObject(final int loggingCount) {
this.count = loggingCount;
}
@@ -86,34 +86,34 @@ public abstract class QueueFullAbstractTest {
static Stack transform(final List<LogEvent> logEvents) {
final List<String> filtered = new ArrayList<>(logEvents.size());
- for (LogEvent event : logEvents) {
+ for (final LogEvent event : logEvents) {
filtered.add(event.getMessage().getFormattedMessage());
}
Collections.reverse(filtered);
- Stack<String> result = new Stack<>();
+ final Stack<String> result = new Stack<>();
result.addAll(filtered);
return result;
}
- static long asyncRemainingCapacity(Logger logger) {
+ static long asyncRemainingCapacity(final Logger logger) {
if (logger instanceof AsyncLogger) {
try {
- Field f = field(AsyncLogger.class, "loggerDisruptor");
+ final Field f = field(AsyncLogger.class, "loggerDisruptor");
return ((AsyncLoggerDisruptor) f.get(logger)).getDisruptor().getRingBuffer().remainingCapacity();
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new RuntimeException(ex);
}
} else {
- LoggerConfig loggerConfig = ((org.apache.logging.log4j.core.Logger) logger).get();
+ final LoggerConfig loggerConfig = ((org.apache.logging.log4j.core.Logger) logger).get();
if (loggerConfig instanceof AsyncLoggerConfig) {
try {
- Object delegate = field(AsyncLoggerConfig.class, "delegate").get(loggerConfig);
+ final Object delegate = field(AsyncLoggerConfig.class, "delegate").get(loggerConfig);
return ((Disruptor) field(AsyncLoggerConfigDisruptor.class, "disruptor").get(delegate)).getRingBuffer().remainingCapacity();
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new RuntimeException(ex);
}
} else {
- Appender async = loggerConfig.getAppenders().get("async");
+ final Appender async = loggerConfig.getAppenders().get("async");
if (async instanceof AsyncAppender) {
return ((AsyncAppender) async).getQueueCapacity();
}
@@ -121,8 +121,8 @@ public abstract class QueueFullAbstractTest {
}
throw new IllegalStateException("Neither Async Loggers nor AsyncAppender are configured");
}
- private static Field field(Class<?> c, String name) throws NoSuchFieldException {
- Field f = c.getDeclaredField(name);
+ private static Field field(final Class<?> c, final String name) throws NoSuchFieldException {
+ final Field f = c.getDeclaredField(name);
f.setAccessible(true);
return f;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
index 307a93d..d11c2ff 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java
@@ -94,10 +94,10 @@ public class QueueFullAsyncLoggerConfigLoggingFromToStringTest extends QueueFull
final Stack<String> actual = transform(blockingAppender.logEvents);
assertEquals("Logging in toString() #0", actual.pop());
- List<StatusData> statusDataList = StatusLogger.getLogger().getStatusData();
+ final List<StatusData> statusDataList = StatusLogger.getLogger().getStatusData();
assertEquals("Jumped the queue: queue full",
"Logging in toString() #128", actual.pop());
- StatusData mostRecentStatusData = statusDataList.get(statusDataList.size() - 1);
+ final StatusData mostRecentStatusData = statusDataList.get(statusDataList.size() - 1);
assertEquals("Expected warn level status message", Level.WARN, mostRecentStatusData.getLevel());
assertThat(mostRecentStatusData.getFormattedStatus(), containsString(
"Log4j2 logged an event out of order to prevent deadlock caused by domain " +
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
index 099d660..53ada5b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
@@ -192,8 +192,8 @@ public class RingBufferLogEventTest {
final Marker marker = MarkerManager.getMarker("marked man");
final String fqcn = "f.q.c.n";
final Level level = Level.TRACE;
- ReusableMessageFactory factory = new ReusableMessageFactory();
- Message message = factory.newMessage("Hello {}!", "World");
+ final ReusableMessageFactory factory = new ReusableMessageFactory();
+ final Message message = factory.newMessage("Hello {}!", "World");
try {
final Throwable t = new InternalError("not a real error");
final ContextStack contextStack = new MutableThreadContextStack(Arrays.asList("a", "b"));
@@ -221,8 +221,8 @@ public class RingBufferLogEventTest {
final Marker marker = MarkerManager.getMarker("marked man");
final String fqcn = "f.q.c.n";
final Level level = Level.TRACE;
- ReusableMessageFactory factory = new ReusableMessageFactory();
- Message message = factory.newMessage("Hello {}!", "World");
+ final ReusableMessageFactory factory = new ReusableMessageFactory();
+ final Message message = factory.newMessage("Hello {}!", "World");
try {
final Throwable t = new InternalError("not a real error");
final ContextStack contextStack = new MutableThreadContextStack(Arrays.asList("a", "b"));
@@ -255,7 +255,7 @@ public class RingBufferLogEventTest {
final RingBufferLogEvent evt = new RingBufferLogEvent();
evt.forEachParameter(new ParameterConsumer<Void>() {
@Override
- public void accept(Object parameter, int parameterIndex, Void state) {
+ public void accept(final Object parameter, final int parameterIndex, final Void state) {
fail("Should not have been called");
}
}, null);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
index bf0823b..39cde5f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
@@ -130,7 +130,7 @@ public final class Histogram
// do a classic binary search to find the high value
while (low < high)
{
- int mid = low + ((high - low) >> 1);
+ final int mid = low + ((high - low) >> 1);
if (upperBounds[mid] < value)
{
low = mid + 1;
@@ -287,10 +287,10 @@ public final class Histogram
{
if (0L != counts[i])
{
- long upperBound = Math.min(upperBounds[i], maxValue);
- long midPoint = lowerBound + ((upperBound - lowerBound) / 2L);
+ final long upperBound = Math.min(upperBounds[i], maxValue);
+ final long midPoint = lowerBound + ((upperBound - lowerBound) / 2L);
- BigDecimal intervalTotal = new BigDecimal(midPoint).multiply(new BigDecimal(counts[i]));
+ final BigDecimal intervalTotal = new BigDecimal(midPoint).multiply(new BigDecimal(counts[i]));
total = total.add(intervalTotal);
}
@@ -360,7 +360,7 @@ public final class Histogram
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("Histogram{");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
index cb7b497..2eb61b2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
@@ -96,7 +96,7 @@ public class CompositeConfigurationTest {
appendersMap.size());
assertTrue(appendersMap.get("STDOUT") instanceof ConsoleAppender);
- Filter loggerFilter = config.getLogger("cat1").getFilter();
+ final Filter loggerFilter = config.getLogger("cat1").getFilter();
assertTrue(loggerFilter instanceof RegexFilter);
assertEquals(loggerFilter.getOnMatch(), Filter.Result.DENY);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
index b94a5a9..67217f6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_2134Test.java
@@ -38,23 +38,23 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefresh() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
- PatternLayout layout = PatternLayout.newBuilder()
+ final PatternLayout layout = PatternLayout.newBuilder()
// @formatter:off
.withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN)
.withConfiguration(config)
.build();
final Layout<? extends Serializable> layout1 = layout;
// @formatter:on
- Appender appender = FileAppender.newBuilder().withFileName("target/test.log").setLayout(layout1)
+ final Appender appender = FileAppender.newBuilder().withFileName("target/test.log").setLayout(layout1)
.setConfiguration(config).withBufferSize(4000).setName("File").build();
// appender.start();
config.addAppender(appender);
- AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
- AppenderRef[] refs = new AppenderRef[] { ref };
- LoggerConfig loggerConfig = LoggerConfig.createLogger(false, Level.INFO, "testlog4j2refresh", "true", refs,
+ final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
+ final AppenderRef[] refs = new AppenderRef[] { ref };
+ final LoggerConfig loggerConfig = LoggerConfig.createLogger(false, Level.INFO, "testlog4j2refresh", "true", refs,
null, config, null);
loggerConfig.addAppender(appender, null, null);
config.addLogger("testlog4j2refresh", loggerConfig);
@@ -66,7 +66,7 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefreshMinimalCodeStart() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
ctx.start(config);
@@ -76,7 +76,7 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefreshMinimalCodeStopStart() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
ctx.stop();
ctx.start();
@@ -86,7 +86,7 @@ public class JiraLog4j2_2134Test {
@Test
public void testRefreshMinimalCodeStopStartConfig() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
ctx.stop();
@@ -98,18 +98,18 @@ public class JiraLog4j2_2134Test {
@SuppressWarnings("deprecation")
@Test
public void testRefreshDeprecatedApis() {
- Logger log = LogManager.getLogger(this.getClass());
+ final Logger log = LogManager.getLogger(this.getClass());
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
- PatternLayout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, config, null,
+ final PatternLayout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, config, null,
null, false, false, null, null);
- Appender appender = FileAppender.createAppender("target/test.log", "false", "false", "File", "true", "false",
+ final Appender appender = FileAppender.createAppender("target/test.log", "false", "false", "File", "true", "false",
"false", "4000", layout, null, "false", null, config);
appender.start();
config.addAppender(appender);
- AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
- AppenderRef[] refs = new AppenderRef[] { ref };
- LoggerConfig loggerConfig = LoggerConfig.createLogger("false", Level.INFO, "testlog4j2refresh", "true", refs,
+ final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
+ final AppenderRef[] refs = new AppenderRef[] { ref };
+ final LoggerConfig loggerConfig = LoggerConfig.createLogger("false", Level.INFO, "testlog4j2refresh", "true", refs,
null, config, null);
loggerConfig.addAppender(appender, null, null);
config.addLogger("testlog4j2refresh", loggerConfig);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
index bbc9837..740818e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/NestedLoggerConfigTest.java
@@ -54,13 +54,13 @@ public class NestedLoggerConfigTest {
private final String prefix;
- public NestedLoggerConfigTest(String prefix) {
+ public NestedLoggerConfigTest(final String prefix) {
this.prefix = prefix;
}
@Test
public void testInheritParentDefaultLevel() throws IOException {
- Configuration configuration = loadConfiguration(prefix + "default-level.xml");
+ final Configuration configuration = loadConfiguration(prefix + "default-level.xml");
try {
assertEquals(Level.ERROR, configuration.getLoggerConfig("com.foo").getLevel());
} finally {
@@ -70,7 +70,7 @@ public class NestedLoggerConfigTest {
@Test
public void testInheritParentLevel() throws IOException {
- Configuration configuration = loadConfiguration(prefix + "inherit-level.xml");
+ final Configuration configuration = loadConfiguration(prefix + "inherit-level.xml");
try {
assertEquals(Level.TRACE, configuration.getLoggerConfig("com.foo").getLevel());
} finally {
@@ -78,10 +78,10 @@ public class NestedLoggerConfigTest {
}
}
- private Configuration loadConfiguration(String resourcePath) throws IOException {
- InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath);
+ private Configuration loadConfiguration(final String resourcePath) throws IOException {
+ final InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath);
try {
- Configuration configuration = new XmlConfiguration(new LoggerContext("test"), new ConfigurationSource(in));
+ final Configuration configuration = new XmlConfiguration(new LoggerContext("test"), new ConfigurationSource(in));
configuration.initialize();
configuration.start();
return configuration;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
index 47872fa..aacdf2d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
@@ -63,7 +63,7 @@ public class FactoryTestStringMap implements IndexedStringMap {
}
@Override
- public String getKeyAt(int index) {
+ public String getKeyAt(final int index) {
return null;
}
@@ -73,12 +73,12 @@ public class FactoryTestStringMap implements IndexedStringMap {
}
@Override
- public <V> V getValueAt(int index) {
+ public <V> V getValueAt(final int index) {
return null;
}
@Override
- public int indexOfKey(String key) {
+ public int indexOfKey(final String key) {
return 0;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
index 273502a..033cc9d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
@@ -63,7 +63,7 @@ public class MutableLogEventTest {
try {
Class.forName("java.io.ObjectInputFilter");
useObjectInputStream = true;
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Ignore the exception
}
}
@@ -116,7 +116,7 @@ public class MutableLogEventTest {
@Test
public void testInitFromReusableCopiesFormatString() {
- Message message = ReusableMessageFactory.INSTANCE.newMessage("msg in a {}", "bottle");
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage("msg in a {}", "bottle");
final Log4jLogEvent source = Log4jLogEvent.newBuilder() //
.setContextData(CONTEXT_DATA) //
.setContextStack(STACK) //
@@ -138,17 +138,17 @@ public class MutableLogEventTest {
assertEquals("format", "msg in a {}", mutable.getFormat());
assertEquals("formatted", "msg in a bottle", mutable.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, mutable.getParameters());
- Message memento = mutable.memento();
+ final Message memento = mutable.memento();
assertEquals("format", "msg in a {}", memento.getFormat());
assertEquals("formatted", "msg in a bottle", memento.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, memento.getParameters());
- Message eventMementoMessage = mutable.createMemento().getMessage();
+ final Message eventMementoMessage = mutable.createMemento().getMessage();
assertEquals("format", "msg in a {}", eventMementoMessage.getFormat());
assertEquals("formatted", "msg in a bottle", eventMementoMessage.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, eventMementoMessage.getParameters());
- Message log4JLogEventMessage = new Log4jLogEvent.Builder(mutable).build().getMessage();
+ final Message log4JLogEventMessage = new Log4jLogEvent.Builder(mutable).build().getMessage();
assertEquals("format", "msg in a {}", log4JLogEventMessage.getFormat());
assertEquals("formatted", "msg in a bottle", log4JLogEventMessage.getFormattedMessage());
assertEquals("parameters", new String[] {"bottle"}, log4JLogEventMessage.getParameters());
@@ -156,8 +156,8 @@ public class MutableLogEventTest {
@Test
public void testInitFromReusableObjectCopiesParameter() {
- Object param = new Object();
- Message message = ReusableMessageFactory.INSTANCE.newMessage(param);
+ final Object param = new Object();
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage(param);
final Log4jLogEvent source = Log4jLogEvent.newBuilder()
.setContextData(CONTEXT_DATA)
.setContextStack(STACK)
@@ -180,7 +180,7 @@ public class MutableLogEventTest {
assertNull("format", mutable.getFormat());
assertEquals("formatted", param.toString(), mutable.getFormattedMessage());
assertEquals("parameters", new Object[] {param}, mutable.getParameters());
- Message memento = mutable.memento();
+ final Message memento = mutable.memento();
assertNull("format", memento.getFormat());
assertEquals("formatted", param.toString(), memento.getFormattedMessage());
assertEquals("parameters", new Object[] {param}, memento.getParameters());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
index 912f1a8..2f1bc04 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromThrowableMessageTest.java
@@ -76,8 +76,8 @@ public class NestedLoggingFromThrowableMessageTest {
CoreLoggerContexts.stopLoggerContext(false, file1);
CoreLoggerContexts.stopLoggerContext(false, file2);
- Set<String> lines1 = readUniqueLines(file1);
- Set<String> lines2 = readUniqueLines(file2);
+ final Set<String> lines1 = readUniqueLines(file1);
+ final Set<String> lines2 = readUniqueLines(file2);
assertEquals("Expected the same data from both appenders", lines1, lines2);
assertEquals(2, lines1.size());
@@ -85,9 +85,9 @@ public class NestedLoggingFromThrowableMessageTest {
assertTrue(lines1.contains("ERROR NestedLoggingFromThrowableMessageTest Test message"));
}
- private static Set<String> readUniqueLines(File input) throws IOException {
- Set<String> lines = new HashSet<>();
- BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(input)));
+ private static Set<String> readUniqueLines(final File input) throws IOException {
+ final Set<String> lines = new HashSet<>();
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(input)));
try {
String line;
while ((line = reader.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
index f553d3a..2f913f7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjectorTest.java
@@ -78,13 +78,13 @@ public class ThreadContextDataInjectorTest {
}
private void testContextDataInjector() {
- ReadOnlyThreadContextMap readOnlythreadContextMap = getThreadContextMap();
+ final ReadOnlyThreadContextMap readOnlythreadContextMap = getThreadContextMap();
assertThat("thread context map class name",
(readOnlythreadContextMap == null) ? null : readOnlythreadContextMap.getClass().getName(),
is(equalTo(readOnlythreadContextMapClassName)));
- ContextDataInjector contextDataInjector = createInjector();
- StringMap stringMap = contextDataInjector.injectContextData(null, new SortedArrayStringMap());
+ final ContextDataInjector contextDataInjector = createInjector();
+ final StringMap stringMap = contextDataInjector.injectContextData(null, new SortedArrayStringMap());
assertThat("thread context map", ThreadContext.getContext(), allOf(hasEntry("foo", "bar"), not(hasKey("baz"))));
assertThat("context map", stringMap.toMap(), allOf(hasEntry("foo", "bar"), not(hasKey("baz"))));
@@ -106,7 +106,7 @@ public class ThreadContextDataInjectorTest {
}
}
- private void prepareThreadContext(boolean isThreadContextMapInheritable) {
+ private void prepareThreadContext(final boolean isThreadContextMapInheritable) {
System.setProperty("log4j2.isThreadContextMapInheritable", Boolean.toString(isThreadContextMapInheritable));
PropertiesUtil.getProperties().reload();
ThreadContextTest.reinitThreadContext();
@@ -130,7 +130,7 @@ public class ThreadContextDataInjectorTest {
testContextDataInjector();
}
}).get();
- } catch (ExecutionException ee) {
+ } catch (final ExecutionException ee) {
throw ee.getCause();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
index 6eb5c4f..dec48ec 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JsonLayoutTest.java
@@ -391,7 +391,7 @@ public class JsonLayoutTest {
.setCharset(StandardCharsets.UTF_8)
.setIncludeStacktrace(true)
.build();
- Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
try {
final Log4jLogEvent expected = Log4jLogEvent.newBuilder()
.setLoggerName("a.B")
@@ -400,7 +400,7 @@ public class JsonLayoutTest {
.setMessage(message)
.setThreadName("threadName")
.setTimeMillis(1).build();
- MutableLogEvent mutableLogEvent = new MutableLogEvent();
+ final MutableLogEvent mutableLogEvent = new MutableLogEvent();
mutableLogEvent.initFrom(expected);
final String str = layout.toSerializable(mutableLogEvent);
final String expectedMessage = "Testing " + TestObj.TO_STRING_VALUE;
@@ -426,9 +426,9 @@ public class JsonLayoutTest {
.setCharset(StandardCharsets.UTF_8)
.setIncludeStacktrace(true)
.build();
- Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
+ final Message message = ReusableMessageFactory.INSTANCE.newMessage("Testing {}", new TestObj());
try {
- RingBufferLogEvent ringBufferEvent = new RingBufferLogEvent();
+ final RingBufferLogEvent ringBufferEvent = new RingBufferLogEvent();
ringBufferEvent.setValues(
null, "a.B", null, "f.q.c.n", Level.DEBUG, message,
null, new SortedArrayStringMap(), ThreadContext.EMPTY_STACK, 1L,
@@ -563,7 +563,7 @@ public class JsonLayoutTest {
return value;
}
- public void setValue(int value) {
+ public void setValue(final int value) {
this.value = value;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
index 958e38a..5112e5d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_2195_Test.java
@@ -41,20 +41,20 @@ public class Log4j2_2195_Test {
@Test
public void test() {
logger.info("This is a test.", new Exception("Test exception!"));
- ListAppender listAppender = loggerContextRule.getListAppender("ListAppender");
+ final ListAppender listAppender = loggerContextRule.getListAppender("ListAppender");
Assert.assertNotNull(listAppender);
- List<String> events = listAppender.getMessages();
+ final List<String> events = listAppender.getMessages();
Assert.assertNotNull(events);
Assert.assertEquals(1, events.size());
- String logEvent = events.get(0);
+ final String logEvent = events.get(0);
Assert.assertNotNull(logEvent);
Assert.assertFalse("\"org.junit\" should not be here", logEvent.contains("org.junit"));
Assert.assertFalse("\"org.eclipse\" should not be here", logEvent.contains("org.eclipse"));
//
- Layout<? extends Serializable> layout = listAppender.getLayout();
- PatternLayout pLayout = (PatternLayout) layout;
+ final Layout<? extends Serializable> layout = listAppender.getLayout();
+ final PatternLayout pLayout = (PatternLayout) layout;
Assert.assertNotNull(pLayout);
- Serializer eventSerializer = pLayout.getEventSerializer();
+ final Serializer eventSerializer = pLayout.getEventSerializer();
Assert.assertNotNull(eventSerializer);
//
Assert.assertTrue("Missing \"|\"", logEvent.contains("|"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
index db70075..d1bb7a8 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
@@ -195,15 +195,15 @@ public class Rfc5424LayoutTest {
final StructuredDataMessage msg2 = new StructuredDataMessage("Extra@18060", null, "Audit");
msg2.put("Item1", "Hello");
msg2.put("Item2", "World");
- List<StructuredDataMessage> messages = new ArrayList<>();
+ final List<StructuredDataMessage> messages = new ArrayList<>();
messages.add(msg);
messages.add(msg2);
final StructuredDataCollectionMessage collectionMessage = new StructuredDataCollectionMessage(messages);
root.info(MarkerManager.getMarker("EVENT"), collectionMessage);
- List<String> list = appender.getMessages();
- String result = list.get(0);
+ final List<String> list = appender.getMessages();
+ final String result = list.get(0);
assertTrue("Expected line to contain " + collectionLine1 + ", Actual " + result,
result.contains(collectionLine1));
assertTrue("Expected line to contain " + collectionLine2 + ", Actual " + result,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
index c01c82e..0d5205d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
@@ -66,7 +66,7 @@ public class SerializedLayoutTest {
try {
Class.forName("java.io.ObjectInputFilter");
useObjectInputStream = true;
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Ignore the exception
}
ConfigurationFactory.setConfigurationFactory(cf);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
index ea41e61..919eebc 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
@@ -46,7 +46,7 @@ public class MockTcpSyslogServer extends MockSyslogServer {
thread.interrupt();
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Shutdown of TCP server thread failed.");
}
}
@@ -76,7 +76,7 @@ public class MockTcpSyslogServer extends MockSyslogServer {
System.out.println("Message too long");
}
}
- } catch (BindException be) {
+ } catch (final BindException be) {
be.printStackTrace();
} finally {
if (socket != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
index a445464..b116e40 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
@@ -67,7 +67,7 @@ public class MockTlsSyslogServer extends MockSyslogServer {
if (thread != null) {
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Shutdown of TLS server thread failed.");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
index a74940b..a41b26b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
@@ -42,7 +42,7 @@ public class MockUdpSyslogServer extends MockSyslogServer {
thread.interrupt();
try {
thread.join(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
System.out.println("Shutdown of Log4j UDP server thread failed.");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
index 26cda80..13ca8a4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProviderTest.java
@@ -31,7 +31,7 @@ public class FilePasswordProviderTest {
final Path path = Files.createTempFile("testPass", ".txt");
Files.write(path, PASSWORD.getBytes(Charset.defaultCharset()));
- char[] actual = new FilePasswordProvider(path.toString()).getPassword();
+ final char[] actual = new FilePasswordProvider(path.toString()).getPassword();
Files.delete(path);
assertArrayEquals(PASSWORD.toCharArray(), actual);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
index df4b5f2..99b3097 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/MemoryPasswordProviderTest.java
@@ -29,16 +29,16 @@ public class MemoryPasswordProviderTest {
@Test
public void testConstructorDoesNotModifyOriginalParameterArray() {
- char[] initial = "123".toCharArray();
+ final char[] initial = "123".toCharArray();
new MemoryPasswordProvider(initial);
assertArrayEquals("123".toCharArray(), initial);
}
@Test
public void testGetPasswordReturnsCopyOfConstructorArray() {
- char[] initial = "123".toCharArray();
- MemoryPasswordProvider provider = new MemoryPasswordProvider(initial);
- char[] actual = provider.getPassword();
+ final char[] initial = "123".toCharArray();
+ final MemoryPasswordProvider provider = new MemoryPasswordProvider(initial);
+ final char[] actual = provider.getPassword();
assertArrayEquals("123".toCharArray(), actual);
assertNotSame(initial, actual);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
index 728254a..affb5b2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
@@ -150,8 +150,8 @@ public class DatePatternConverterTest {
}
}
- private String precisePattern(final String pattern, int precision) {
- String seconds = pattern.substring(0, pattern.indexOf("SSS"));
+ private String precisePattern(final String pattern, final int precision) {
+ final String seconds = pattern.substring(0, pattern.indexOf("SSS"));
return seconds + "nnnnnnnnn".substring(0, precision);
}
@@ -162,7 +162,7 @@ public class DatePatternConverterTest {
final StringBuilder milli = new StringBuilder();
final LogEvent event = new MyLogEvent();
- for (String timeZone : new String[]{"PDT", null}) { // Pacific Daylight Time=UTC-8:00
+ for (final String timeZone : new String[]{"PDT", null}) { // Pacific Daylight Time=UTC-8:00
for (final FixedDateFormat.FixedFormat format : FixedDateFormat.FixedFormat.values()) {
for (int i = 1; i <= 9; i++) {
if (format.getPattern().endsWith("n")) {
@@ -178,7 +178,7 @@ public class DatePatternConverterTest {
final String[] milliOptions = {format.getPattern(), timeZone};
DatePatternConverter.newInstance(milliOptions).format(event, milli);
milli.setLength(milli.length() - 3); // truncate millis
- String expected = milli.append("987123456".substring(0, i)).toString();
+ final String expected = milli.append("987123456".substring(0, i)).toString();
assertEquals(expected, precise.toString());
//System.out.println(preciseOptions[0] + ": " + precise);
@@ -208,7 +208,7 @@ public class DatePatternConverterTest {
final String[] milliOptions = {format.getPattern()};
DatePatternConverter.newInstance(milliOptions).format(event, milli);
milli.setLength(milli.length() - 3); // truncate millis
- String expected = milli.append("987123456").toString();
+ final String expected = milli.append("987123456").toString();
assertEquals(expected, precise.toString());
//System.out.println(preciseOptions[0] + ": " + precise);
@@ -228,7 +228,7 @@ public class DatePatternConverterTest {
@Override
public Instant getInstant() {
- MutableInstant result = new MutableInstant();
+ final MutableInstant result = new MutableInstant();
result.initFromEpochMilli(getTimeMillis(), 123456);
return result;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
index c3b1ba6..0987f76 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
@@ -56,7 +56,7 @@ public class HighlightConverterTest {
@Test
public void testLevelNamesBad() {
- String colorName = "red";
+ final String colorName = "red";
final String[] options = { "%-5level: %msg", PatternParser.NO_CONSOLE_NO_ANSI + "=false, "
+ PatternParser.DISABLE_ANSI + "=false, " + "BAD_LEVEL_A=" + colorName + ", BAD_LEVEL_B=" + colorName };
final HighlightConverter converter = HighlightConverter.newInstance(null, options);
@@ -67,7 +67,7 @@ public class HighlightConverterTest {
@Test
public void testLevelNamesGood() {
- String colorName = "red";
+ final String colorName = "red";
final String[] options = { "%-5level: %msg", PatternParser.NO_CONSOLE_NO_ANSI + "=false, "
+ PatternParser.DISABLE_ANSI + "=false, " + "DEBUG=" + colorName + ", TRACE=" + colorName };
final HighlightConverter converter = HighlightConverter.newInstance(null, options);