You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/08 14:50:56 UTC
[27/50] [abbrv] logging-log4j2 git commit: Add final modifier to
local variables.
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/f4b60405
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f4b60405
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f4b60405
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: f4b604050e5de71431e017b58b4e5cab0e42e05d
Parents: 19c9287
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Sep 6 23:01:19 2016 -0400
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Sep 6 23:01:19 2016 -0400
----------------------------------------------------------------------
.../config/Log4j1ConfigurationConverter.java | 2 +-
.../config/Log4j1ConfigurationFactory.java | 2 +-
.../log4j/config/Log4j1ConfigurationParser.java | 10 +-
.../apache/log4j/layout/Log4j1XmlLayout.java | 17 +-
.../pattern/Log4j1NdcPatternConverter.java | 2 +-
.../log4j/layout/Log4j1XmlLayoutTest.java | 18 +-
.../pattern/Log4j1MdcPatternConverterTest.java | 16 +-
.../log4j/spi/DefaultThreadContextMap.java | 2 +-
.../apache/logging/log4j/TraceLoggingTest.java | 16 +-
.../log4j/core/appender/ConsoleAppender.java | 2 +-
.../log4j/core/appender/FileAppender.java | 2 +-
.../log4j/core/appender/SocketAppender.java | 2 +-
.../appender/rolling/CronTriggeringPolicy.java | 2 +-
.../core/appender/routing/IdlePurgePolicy.java | 2 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 2 +-
.../core/async/JCToolsBlockingQueueFactory.java | 2 +-
.../core/config/ConfigurationScheduler.java | 4 +-
.../impl/DefaultConfigurationBuilder.java | 14 +-
.../log4j/core/impl/ThrowableFormatOptions.java | 2 +-
.../log4j/core/net/TcpSocketManager.java | 4 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 10 +-
.../core/pattern/MessagePatternConverter.java | 8 +-
.../log4j/core/util/ExecutorServices.java | 2 +-
.../logging/log4j/core/util/TypeUtil.java | 2 +-
.../ConsoleAppenderJAnsiMessageMain.java | 158 +++++++-------
.../ConsoleAppenderJAnsiXExceptionMain.java | 152 +++++++-------
.../log4j/core/appender/FileAppenderTest.java | 2 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 2 +-
.../RollingAppenderCronOnceADayTest.java | 6 +-
.../rolling/RollingAppenderCronTest.java | 4 +-
.../rolling/RollingAppenderSizeTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 2 +-
.../core/async/RingBufferLogEventTest.java | 2 +-
.../core/async/perftest/AbstractRunQueue.java | 6 +-
.../core/config/CompositeConfigurationTest.java | 4 +-
.../builder/ConfigurationAssemblerTest.java | 6 +-
.../util/ResolverUtilCustomProtocolTest.java | 8 +-
.../config/plugins/util/ResolverUtilTest.java | 22 +-
.../core/filter/DynamicThresholdFilterTest.java | 2 +-
.../core/impl/ReusableLogEventFactoryTest.java | 2 +-
.../core/impl/ThrowableFormatOptionsTest.java | 34 +--
.../core/layout/CsvParameterLayoutTest.java | 4 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 10 +-
.../pattern/MessagePatternConverterTest.java | 210 +++++++++----------
.../junit/URLStreamHandlerFactoryRule.java | 5 +-
.../log4j/test/appender/InMemoryAppender.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 4 +-
.../org/apache/logging/slf4j/MDCContextMap.java | 2 +-
48 files changed, 399 insertions(+), 397 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
index 3cfb888..8170708 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
@@ -33,7 +33,7 @@ public final class Log4j1ConfigurationConverter {
public static void main(final String[] args) throws IOException {
try (InputStream input = args.length > 0 ? new FileInputStream(args[0]) : System.in;
OutputStream output = args.length > 1 ? new FileOutputStream(args[1]) : System.out) {
- ConfigurationBuilder<BuiltConfiguration> builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(input);
+ final ConfigurationBuilder<BuiltConfiguration> builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(input);
builder.writeXmlConfiguration(output);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
index d6eb444..970a43f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
@@ -44,7 +44,7 @@ public class Log4j1ConfigurationFactory extends ConfigurationFactory {
final ConfigurationBuilder<BuiltConfiguration> builder;
try (final InputStream configStream = source.getInputStream()) {
builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(configStream);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new ConfigurationException("Unable to load " + source.toString(), e);
}
return builder.build();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
index d857877..04a7812 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
@@ -91,7 +91,7 @@ public class Log4j1ConfigurationParser {
final Map<String, String> classNameToProperty = buildClassToPropertyPrefixMap(sortedAppenderNames);
for (final Map.Entry<String, String> entry : classNameToProperty.entrySet()) {
final String appenderName = entry.getKey();
- String appenderClass = entry.getValue();
+ final String appenderClass = entry.getValue();
buildAppender(appenderName, appenderClass);
}
// Loggers
@@ -244,7 +244,7 @@ public class Log4j1ConfigurationParser {
break;
}
case "org.apache.log4j.HTMLLayout": {
- LayoutComponentBuilder htmlLayout = builder.newLayout("HtmlLayout");
+ final LayoutComponentBuilder htmlLayout = builder.newLayout("HtmlLayout");
htmlLayout.addAttribute("title",
getLog4jAppenderValue(name, "layout.Title", "Log4J Log Messages"));
htmlLayout.addAttribute("locationInfo",
@@ -253,7 +253,7 @@ public class Log4j1ConfigurationParser {
break;
}
case "org.apache.log4j.xml.XMLLayout": {
- LayoutComponentBuilder xmlLayout = builder.newLayout("Log4j1XmlLayout");
+ final LayoutComponentBuilder xmlLayout = builder.newLayout("Log4j1XmlLayout");
xmlLayout.addAttribute("locationInfo",
Boolean.parseBoolean(getLog4jAppenderValue(name, "layout.LocationInfo", "false")));
xmlLayout.addAttribute("properties",
@@ -283,8 +283,8 @@ public class Log4j1ConfigurationParser {
final Level rootLoggerLevel = rootLoggerParts.length > 0 ? Level.valueOf(rootLoggerParts[0]) : Level.ERROR;
final String[] sortedAppenderNames = Arrays.copyOfRange(rootLoggerParts, 1, rootLoggerParts.length);
Arrays.sort(sortedAppenderNames);
- RootLoggerComponentBuilder loggerBuilder = builder.newRootLogger(rootLoggerLevel);
- for (String appender : sortedAppenderNames) {
+ final RootLoggerComponentBuilder loggerBuilder = builder.newRootLogger(rootLoggerLevel);
+ for (final String appender : sortedAppenderNames) {
loggerBuilder.add(builder.newAppenderRef(appender));
}
builder.add(loggerBuilder);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
index 8d0fba9..4bd3a15 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
@@ -99,7 +99,7 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
Transform.appendEscapingCData(buf, event.getMessage().getFormattedMessage());
buf.append("]]></log4j:message>\r\n");
- List<String> ndc = event.getContextStack().asList();
+ final List<String> ndc = event.getContextStack().asList();
if (!ndc.isEmpty()) {
buf.append("<log4j:NDC><![CDATA[");
Transform.appendEscapingCData(buf, Strings.join(ndc, ' '));
@@ -107,12 +107,13 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
}
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+ final
Throwable thrown = event.getThrown();
if (thrown != null) {
buf.append("<log4j:throwable><![CDATA[");
buf.append(thrown.toString());
buf.append("\r\n");
- for (StackTraceElement element : thrown.getStackTrace()) {
+ for (final StackTraceElement element : thrown.getStackTrace()) {
Transform.appendEscapingCData(buf, "\tat " + element.toString());
buf.append("\r\n");
}
@@ -120,7 +121,7 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
}
if (locationInfo) {
- StackTraceElement source = event.getSource();
+ final StackTraceElement source = event.getSource();
if (source != null) {
buf.append("<log4j:locationInfo class=\"");
buf.append(Transform.escapeHtmlTags(source.getClassName()));
@@ -135,14 +136,14 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
}
if (properties) {
- Map<String, String> contextMap = event.getContextMap();
+ final Map<String, String> contextMap = event.getContextMap();
if (!contextMap.isEmpty()) {
buf.append("<log4j:properties>\r\n");
- Object[] keys = contextMap.keySet().toArray();
+ final Object[] keys = contextMap.keySet().toArray();
Arrays.sort(keys);
- for (Object key1 : keys) {
- String key = key1.toString();
- String val = contextMap.get(key);
+ for (final Object key1 : keys) {
+ final String key = key1.toString();
+ final String val = contextMap.get(key);
if (val != null) {
buf.append("<log4j:data name=\"");
buf.append(Transform.escapeHtmlTags(key));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
index 1eb38be..405db00 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java
@@ -57,7 +57,7 @@ public final class Log4j1NdcPatternConverter extends LogEventPatternConverter {
@Override
public void format(final LogEvent event, final StringBuilder toAppendTo) {
- List<String> ndc = event.getContextStack().asList();
+ final List<String> ndc = event.getContextStack().asList();
toAppendTo.append(Strings.join(ndc, ' '));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java
index 7f38c56..2ee4be5 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java
@@ -30,18 +30,18 @@ public class Log4j1XmlLayoutTest {
@Test
public void testWithoutThrown() {
- Log4j1XmlLayout layout = Log4j1XmlLayout.createLayout(false, true);
+ final Log4j1XmlLayout layout = Log4j1XmlLayout.createLayout(false, true);
- Log4jLogEvent event = Log4jLogEvent.newBuilder()
+ final Log4jLogEvent event = Log4jLogEvent.newBuilder()
.setLoggerName("a.B")
.setLevel(Level.INFO)
.setMessage(new SimpleMessage("Hello, World"))
.setTimeMillis(System.currentTimeMillis() + 17)
.build();
- String result = layout.toSerializable(event);
+ final String result = layout.toSerializable(event);
- String expected =
+ final String expected =
"<log4j:event logger=\"a.B\" timestamp=\"" + event.getTimeMillis() + "\" level=\"INFO\" thread=\"main\">\r\n" +
"<log4j:message><![CDATA[Hello, World]]></log4j:message>\r\n" +
"</log4j:event>\r\n\r\n";
@@ -51,12 +51,12 @@ public class Log4j1XmlLayoutTest {
@Test
public void testWithPropertiesAndLocationInfo() {
- Log4j1XmlLayout layout = Log4j1XmlLayout.createLayout(true, true);
+ final Log4j1XmlLayout layout = Log4j1XmlLayout.createLayout(true, true);
- Map<String, String> contextMap = new HashMap<>(2);
+ final Map<String, String> contextMap = new HashMap<>(2);
contextMap.put("key1", "value1");
contextMap.put("key2", "value2");
- Log4jLogEvent event = Log4jLogEvent.newBuilder()
+ final Log4jLogEvent event = Log4jLogEvent.newBuilder()
.setLoggerName("a.B")
.setLevel(Level.INFO)
.setMessage(new SimpleMessage("Hello, World"))
@@ -66,9 +66,9 @@ public class Log4j1XmlLayoutTest {
.setContextMap(contextMap)
.build();
- String result = layout.toSerializable(event);
+ final String result = layout.toSerializable(event);
- String expected =
+ final String expected =
"<log4j:event logger=\"a.B\" timestamp=\"" + event.getTimeMillis() + "\" level=\"INFO\" thread=\"main\">\r\n" +
"<log4j:message><![CDATA[Hello, World]]></log4j:message>\r\n" +
"<log4j:locationInfo class=\"pack.MyClass\" method=\"myMethod\" file=\"MyClass.java\" line=\"17\"/>\r\n" +
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
index e997aee..5fc2489 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
@@ -31,34 +31,34 @@ public class Log4j1MdcPatternConverterTest {
@Test
public void testConverter0() {
- Map<String, String> contextMap = new HashMap<>(0);
- String expected = "{}";
+ final Map<String, String> contextMap = new HashMap<>(0);
+ final String expected = "{}";
test(contextMap, expected, null);
}
@Test
public void testConverter1() {
- Map<String, String> contextMap = new HashMap<>(1);
+ final Map<String, String> contextMap = new HashMap<>(1);
contextMap.put("key1", "value1");
- String expected = "{{key1,value1}}";
+ final String expected = "{{key1,value1}}";
test(contextMap, expected, null);
}
@Test
public void testConverter2() {
- Map<String, String> contextMap = new HashMap<>(2);
+ final Map<String, String> contextMap = new HashMap<>(2);
contextMap.put("key1", "value1");
contextMap.put("key2", "value2");
- String expected = "{{key1,value1}{key2,value2}}";
+ final String expected = "{{key1,value1}{key2,value2}}";
test(contextMap, expected, null);
}
@Test
public void testConverterWithKey() {
- Map<String, String> contextMap = new HashMap<>(2);
+ final Map<String, String> contextMap = new HashMap<>(2);
contextMap.put("key1", "value1");
contextMap.put("key2", "value2");
- String expected = "value1";
+ final String expected = "value1";
test(contextMap, expected, new String[] {"key1"});
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index 92822b9..fc49ff8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -81,7 +81,7 @@ public class DefaultThreadContextMap implements ThreadContextMap2 {
}
Map<String, String> map = localMap.get();
map = map == null ? new HashMap<String, String>(m.size()) : new HashMap<>(map);
- for (Map.Entry<String, String> e : m.entrySet()) {
+ for (final Map.Entry<String, String> e : m.entrySet()) {
map.put(e.getKey(), e.getValue());
}
localMap.set(Collections.unmodifiableMap(map));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-api/src/test/java/org/apache/logging/log4j/TraceLoggingTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/TraceLoggingTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/TraceLoggingTest.java
index 0dce612..81a2ca1 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/TraceLoggingTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/TraceLoggingTest.java
@@ -266,13 +266,13 @@ public class TraceLoggingTest extends AbstractLogger {
@Test
public void testTraceEntryExit() {
currentLevel = Level.TRACE;
- FlowMessageFactory fact = new DefaultFlowMessageFactory();
+ final FlowMessageFactory fact = new DefaultFlowMessageFactory();
- ParameterizedMessage paramMsg = new ParameterizedMessage("Tracy {}", "Logan");
+ final ParameterizedMessage paramMsg = new ParameterizedMessage("Tracy {}", "Logan");
currentEvent = new LogEvent(ENTRY_MARKER.getName(), fact.newEntryMessage(paramMsg), null);
- EntryMessage entry = traceEntry("Tracy {}", "Logan");
+ final EntryMessage entry = traceEntry("Tracy {}", "Logan");
- ReusableParameterizedMessage msg = ReusableParameterizedMessageTest.set(
+ final ReusableParameterizedMessage msg = ReusableParameterizedMessageTest.set(
new ReusableParameterizedMessage(), "Tracy {}", "Logan");
ReusableParameterizedMessageTest.set(msg, "Some other message {}", 123);
currentEvent = new LogEvent(null, msg, null);
@@ -291,14 +291,14 @@ public class TraceLoggingTest extends AbstractLogger {
@Test
public void testTraceEntryMessage() {
currentLevel = Level.TRACE;
- FlowMessageFactory fact = new DefaultFlowMessageFactory();
+ final FlowMessageFactory fact = new DefaultFlowMessageFactory();
- ParameterizedMessage paramMsg = new ParameterizedMessage("Tracy {}", "Logan");
+ final ParameterizedMessage paramMsg = new ParameterizedMessage("Tracy {}", "Logan");
currentEvent = new LogEvent(ENTRY_MARKER.getName(), fact.newEntryMessage(paramMsg), null);
- ReusableParameterizedMessage msg = ReusableParameterizedMessageTest.set(
+ final ReusableParameterizedMessage msg = ReusableParameterizedMessageTest.set(
new ReusableParameterizedMessage(), "Tracy {}", "Logan");
- EntryMessage entry = traceEntry(msg);
+ final EntryMessage entry = traceEntry(msg);
ReusableParameterizedMessageTest.set(msg, "Some other message {}", 123);
currentEvent = new LogEvent(null, msg, null);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index d5be743..3650172 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -195,7 +195,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
if (follow && direct) {
throw new IllegalArgumentException("Cannot use both follow and direct on ConsoleAppender");
}
- Layout<? extends Serializable> layout = getOrCreateLayout();
+ final Layout<? extends Serializable> layout = getOrCreateLayout();
return new ConsoleAppender(getName(), layout, getFilter(), getManager(target, follow, direct, layout),
isIgnoreExceptions(), target);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 696a236..46146f9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -81,7 +81,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
if (!bufferedIo && bufferSize > 0) {
LOGGER.warn("The bufferSize is set to {} but bufferedIo is false: {}", bufferSize, bufferedIo);
}
- Layout<? extends Serializable> layout = getOrCreateLayout();
+ final Layout<? extends Serializable> layout = getOrCreateLayout();
final FileManager manager = FileManager.getFileManager(fileName, append, locking, bufferedIo, createOnDemand,
advertiseUri, layout, bufferSize, configuration);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 42554e1..744def0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -94,7 +94,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
@Override
public SocketAppender build() {
boolean immediateFlush = isImmediateFlush();
- boolean bufferedIo = isBufferedIo();
+ final boolean bufferedIo = isBufferedIo();
Layout<? extends Serializable> layout = getLayout();
if (layout == null) {
layout = SerializedLayout.createLayout();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
index 54998dc..4936feb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
@@ -134,7 +134,7 @@ public final class CronTriggeringPolicy extends AbstractLifeCycle implements Tri
manager.getPatternProcessor().setPrevFileTime(nextRollDate.getTime());
manager.rollover();
final Date fireDate = future.getFireTime();
- Calendar cal = Calendar.getInstance();
+ final Calendar cal = Calendar.getInstance();
cal.setTime(fireDate);
cal.add(Calendar.SECOND, -1);
nextRollDate = cal.getTime();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index cde5cb0..11fa757 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -112,7 +112,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
}
if (updateTime < Long.MAX_VALUE) {
- long interval = timeToLive - (System.currentTimeMillis() - updateTime);
+ final long interval = timeToLive - (System.currentTimeMillis() - updateTime);
future = scheduler.schedule(this, interval, TimeUnit.MILLISECONDS);
} else {
// reset to initial state - in case of all appenders already purged
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
index 4308532..16c719a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
@@ -136,7 +136,7 @@ class AsyncLoggerDisruptor extends AbstractLifeCycle {
try {
// busy-spins until all events currently in the disruptor have been processed
temp.shutdown(timeout, timeUnit);
- } catch (TimeoutException e) {
+ } catch (final TimeoutException e) {
temp.shutdown();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
index 2b83858..54a33cf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
@@ -83,7 +83,7 @@ public class JCToolsBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
int idleCounter = 0;
final long timeoutNanos = System.nanoTime() + unit.toNanos(timeout);
do {
- E result = poll();
+ final E result = poll();
if (result != null) {
return result;
} else if (System.nanoTime() - timeoutNanos > 0) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
index 89ebcd5..55cd74a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
@@ -115,7 +115,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
* @return a ScheduledFuture representing the next time the command will run.
*/
public CronScheduledFuture<?> scheduleWithCron(final CronExpression cronExpression, final Runnable command) {
- Date fireDate = cronExpression.getNextValidTimeAfter(new Date());
+ final Date fireDate = cronExpression.getNextValidTimeAfter(new Date());
final CronRunnable runnable = new CronRunnable(command, cronExpression);
final ScheduledFuture<?> future = schedule(runnable, nextFireInterval(fireDate), TimeUnit.MILLISECONDS);
final CronScheduledFuture<?> cronScheduledFuture = new CronScheduledFuture<>(future, fireDate);
@@ -179,7 +179,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
} catch(final Throwable ex) {
LOGGER.error("{} caught error running command", SIMPLE_NAME, ex);
} finally {
- Date fireDate = cronExpression.getNextValidTimeAfter(new Date());
+ final Date fireDate = cronExpression.getNextValidTimeAfter(new Date());
final ScheduledFuture<?> future = schedule(this, nextFireInterval(fireDate), TimeUnit.MILLISECONDS);
scheduledFuture.reset(future, fireDate);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 58474cb..ac1c7d0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -202,10 +202,10 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
public void writeXmlConfiguration(final OutputStream output) throws IOException {
try {
- XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(output);
+ final XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(output);
writeXmlConfiguration(xmlWriter);
xmlWriter.close();
- } catch (XMLStreamException e) {
+ } catch (final XMLStreamException e) {
if (e.getNestedException() instanceof IOException) {
throw (IOException)e.getNestedException();
}
@@ -215,12 +215,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
public String toXmlConfiguration() {
- StringWriter sw = new StringWriter();
+ final StringWriter sw = new StringWriter();
try {
- XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
+ final XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
writeXmlConfiguration(xmlWriter);
xmlWriter.close();
- } catch (XMLStreamException e) {
+ } catch (final XMLStreamException e) {
Throwables.rethrow(e);
}
return sw.toString();
@@ -289,7 +289,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
if (!component.getComponents().isEmpty()) {
xmlWriter.writeCharacters(EOL);
}
- for (Component subComponent : component.getComponents()) {
+ for (final Component subComponent : component.getComponents()) {
writeXmlComponent(xmlWriter, subComponent, nesting + 1);
}
if (component.getValue() != null) {
@@ -314,7 +314,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
private void writeXmlAttributes(final XMLStreamWriter xmlWriter, final Component component) throws XMLStreamException {
- for (Map.Entry<String, String> attribute : component.getAttributes().entrySet()) {
+ for (final Map.Entry<String, String> attribute : component.getAttributes().entrySet()) {
xmlWriter.writeAttribute(attribute.getKey(), attribute.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
index 565f15c..b2be04d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
@@ -277,7 +277,7 @@ public final class ThrowableFormatOptions {
lines = 2;
} else if (option.startsWith("ansi(") && option.endsWith(")") || option.equals("ansi")) {
if (Loader.isJansiAvailable()) {
- String styleMapStr = option.equals("ansi") ? Strings.EMPTY
+ final String styleMapStr = option.equals("ansi") ? Strings.EMPTY
: option.substring("ansi(".length(), option.length() - 1);
ansiRenderer = new JAnsiTextRenderer(new String[] { null, styleMapStr },
JAnsiTextRenderer.DefaultExceptionStyleMap);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index 73933f7..e5af484 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -158,7 +158,7 @@ public class TcpSocketManager extends AbstractSocketManager {
if (oldSocket != null) {
try {
oldSocket.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.error("Could not close socket {}", socket);
}
}
@@ -247,7 +247,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
private Reconnector createReconnector() {
- Reconnector recon = new Reconnector(this);
+ final Reconnector recon = new Reconnector(this);
recon.setDaemon(true);
recon.setPriority(Thread.MIN_PRIORITY);
return recon;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
index f71e230..8377036 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
@@ -89,11 +89,11 @@ public final class JAnsiTextRenderer implements TextRenderer {
}
static {
- Map<String, Map<String, Code[]>> tempPreDefs = new HashMap<>();
+ final Map<String, Map<String, Code[]>> tempPreDefs = new HashMap<>();
// Default style: Spock
{
// TODO Should the keys be in an enum?
- Map<String, Code[]> map = new HashMap<>();
+ final Map<String, Code[]> map = new HashMap<>();
put(map, "Prefix", WHITE);
put(map, "Name", BG_RED, WHITE);
put(map, "NameMessageSeparator", BG_RED, WHITE);
@@ -126,7 +126,7 @@ public final class JAnsiTextRenderer implements TextRenderer {
// Style: Kirk
{
// TODO Should the keys be in an enum?
- Map<String, Code[]> map = new HashMap<>();
+ final Map<String, Code[]> map = new HashMap<>();
put(map, "Prefix", WHITE);
put(map, "Name", BG_RED, YELLOW, BOLD);
put(map, "NameMessageSeparator", BG_RED, YELLOW);
@@ -156,7 +156,7 @@ public final class JAnsiTextRenderer implements TextRenderer {
tempPreDefs.put("Kirk", Collections.unmodifiableMap(map));
}
{
- Map<String, Code[]> temp = new HashMap<>();
+ final Map<String, Code[]> temp = new HashMap<>();
// TODO
DefaultMessageStyleMap = Collections.unmodifiableMap(temp);
}
@@ -202,7 +202,7 @@ public final class JAnsiTextRenderer implements TextRenderer {
break;
case "StyleMapName":
final String predefinedMapName = codeNames[0];
- Map<String, Code[]> predefinedMap = PrefedinedStyleMaps.get(predefinedMapName);
+ final Map<String, Code[]> predefinedMap = PrefedinedStyleMaps.get(predefinedMapName);
if (predefinedMap != null) {
map.putAll(predefinedMap);
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
index 2287133..9050dec 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
@@ -71,7 +71,7 @@ public final class MessagePatternConverter extends LogEventPatternConverter {
private TextRenderer loadMessageRenderer(final String[] options) {
if (options != null) {
- for (String option : options) {
+ for (final String option : options) {
switch (option.toUpperCase(Locale.ROOT)) {
case "ANSI":
if (Loader.isJansiAvailable()) {
@@ -109,10 +109,10 @@ public final class MessagePatternConverter extends LogEventPatternConverter {
final Message msg = event.getMessage();
if (msg instanceof StringBuilderFormattable) {
- boolean doRender = textRenderer != null;
- StringBuilder workingBuilder = doRender ? new StringBuilder(80) : toAppendTo;
+ final boolean doRender = textRenderer != null;
+ final StringBuilder workingBuilder = doRender ? new StringBuilder(80) : toAppendTo;
- StringBuilderFormattable stringBuilderFormattable = (StringBuilderFormattable) msg;
+ final StringBuilderFormattable stringBuilderFormattable = (StringBuilderFormattable) msg;
final int offset = workingBuilder.length();
stringBuilderFormattable.formatTo(workingBuilder);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
index 52916b1..4214c6f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
@@ -66,7 +66,7 @@ public class ExecutorServices {
}
return false;
}
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
// (Re-)Cancel if current thread also interrupted
executorService.shutdownNow();
// Preserve interrupt status
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
index e8db1ed..eb9c328 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/TypeUtil.java
@@ -53,7 +53,7 @@ public final class TypeUtil {
public static List<Field> getAllDeclaredFields(Class<?> cls) {
final List<Field> fields = new ArrayList<>();
while (cls != null) {
- for (Field field : cls.getDeclaredFields()) {
+ for (final Field field : cls.getDeclaredFields()) {
fields.add(field);
}
cls = cls.getSuperclass();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java
index df5ef6a..68857b5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiMessageMain.java
@@ -1,79 +1,79 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.core.appender;
-
-import static org.fusesource.jansi.Ansi.ansi;
-import static org.fusesource.jansi.Ansi.Color.CYAN;
-import static org.fusesource.jansi.Ansi.Color.RED;
-
-import java.util.Map.Entry;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.junit.Test;
-
-/**
- * Shows how to use ANSI escape codes to color messages. Each message is printed to the console in color, but the rest
- * of the log entry (time stamp for example) is in the default color for that console.
- * <p>
- * Running from a Windows command line from the root of the project:
- * </p>
- *
- * <pre>
- * mvn -Dtest=org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiMessageMain test
- * </pre>
- *
- * or, on Windows:
- *
- * <pre>
- * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%USERPROFILE%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiMessageMain log4j-core/src/test/resources/log4j2-console-msg-ansi.xml
- * </pre>
- *
- */
-public class ConsoleAppenderJAnsiMessageMain {
-
- public static void main(final String[] args) {
- new ConsoleAppenderJAnsiMessageMain().test(args);
- }
-
- /**
- * This is a @Test method to make it easy to run from a command line with {@code mvn -Dtest=FQCN test}
- */
- @Test
- public void test() {
- test(null);
- }
-
- public void test(final String[] args) {
- // System.out.println(System.getProperty("java.class.path"));
- final String config = args == null || args.length == 0 ? "target/test-classes/log4j2-console-msg-ansi.xml"
- : args[0];
- try (final LoggerContext ctx = Configurator.initialize(ConsoleAppenderAnsiMessagesMain.class.getName(),
- config)) {
- final Logger logger = LogManager.getLogger(ConsoleAppenderJAnsiMessageMain.class);
- logger.info(ansi().fg(RED).a("Hello").fg(CYAN).a(" World").reset());
- // JAnsi format:
- // logger.info("@|red Hello|@ @|cyan World|@");
- for (Entry<Object, Object> entry : System.getProperties().entrySet()) {
- logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue());
- }
- }
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.appender;
+
+import static org.fusesource.jansi.Ansi.ansi;
+import static org.fusesource.jansi.Ansi.Color.CYAN;
+import static org.fusesource.jansi.Ansi.Color.RED;
+
+import java.util.Map.Entry;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.junit.Test;
+
+/**
+ * Shows how to use ANSI escape codes to color messages. Each message is printed to the console in color, but the rest
+ * of the log entry (time stamp for example) is in the default color for that console.
+ * <p>
+ * Running from a Windows command line from the root of the project:
+ * </p>
+ *
+ * <pre>
+ * mvn -Dtest=org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiMessageMain test
+ * </pre>
+ *
+ * or, on Windows:
+ *
+ * <pre>
+ * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%USERPROFILE%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiMessageMain log4j-core/src/test/resources/log4j2-console-msg-ansi.xml
+ * </pre>
+ *
+ */
+public class ConsoleAppenderJAnsiMessageMain {
+
+ public static void main(final String[] args) {
+ new ConsoleAppenderJAnsiMessageMain().test(args);
+ }
+
+ /**
+ * This is a @Test method to make it easy to run from a command line with {@code mvn -Dtest=FQCN test}
+ */
+ @Test
+ public void test() {
+ test(null);
+ }
+
+ public void test(final String[] args) {
+ // System.out.println(System.getProperty("java.class.path"));
+ final String config = args == null || args.length == 0 ? "target/test-classes/log4j2-console-msg-ansi.xml"
+ : args[0];
+ try (final LoggerContext ctx = Configurator.initialize(ConsoleAppenderAnsiMessagesMain.class.getName(),
+ config)) {
+ final Logger logger = LogManager.getLogger(ConsoleAppenderJAnsiMessageMain.class);
+ logger.info(ansi().fg(RED).a("Hello").fg(CYAN).a(" World").reset());
+ // JAnsi format:
+ // logger.info("@|red Hello|@ @|cyan World|@");
+ for (final Entry<Object, Object> entry : System.getProperties().entrySet()) {
+ logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue());
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiXExceptionMain.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiXExceptionMain.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiXExceptionMain.java
index a282756..de0b827 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiXExceptionMain.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderJAnsiXExceptionMain.java
@@ -1,76 +1,76 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.core.appender;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.junit.Test;
-
-/**
- * Shows how to use ANSI escape codes to color messages. Each message is printed to the console in color, but the rest
- * of the log entry (time stamp for example) is in the default color for that console.
- * <p>
- * Running from a Windows command line from the root of the project:
- * </p>
- *
- * <pre>
- * mvn -Dtest=org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiXExceptionMain test
- * </pre>
- *
- * or, on Windows:
- *
- * <pre>
- * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%USERPROFILE%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiXExceptionMain log4j-core/src/test/resources/log4j2-console-xex-ansi.xml
- * </pre>
- *
- */
-public class ConsoleAppenderJAnsiXExceptionMain {
-
- public static void main(final String[] args) {
- new ConsoleAppenderJAnsiXExceptionMain().test(args);
- }
-
- /**
- * This is a @Test method to make it easy to run from a command line with {@code mvn -Dtest=FQCN test}
- */
- @Test
- public void test() {
- test(null);
- }
-
- public void test(final String[] args) {
- // System.out.println(System.getProperty("java.class.path"));
- final String config = args == null || args.length == 0 ? "target/test-classes/log4j2-console-xex-ansi.xml"
- : args[0];
- final LoggerContext ctx = Configurator.initialize(ConsoleAppenderAnsiMessagesMain.class.getName(), config);
- final Logger logger = LogManager.getLogger(ConsoleAppenderJAnsiXExceptionMain.class);
- try {
- Files.getFileStore(Paths.get("?BOGUS?"));
- } catch (Exception e) {
- IllegalArgumentException logE = new IllegalArgumentException("Bad argument foo", e);
- logger.error("Gotcha!", logE);
- } finally {
- Configurator.shutdown(ctx);
- }
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.appender;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.junit.Test;
+
+/**
+ * Shows how to use ANSI escape codes to color messages. Each message is printed to the console in color, but the rest
+ * of the log entry (time stamp for example) is in the default color for that console.
+ * <p>
+ * Running from a Windows command line from the root of the project:
+ * </p>
+ *
+ * <pre>
+ * mvn -Dtest=org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiXExceptionMain test
+ * </pre>
+ *
+ * or, on Windows:
+ *
+ * <pre>
+ * java -classpath log4j-core\target\test-classes;log4j-core\target\classes;log4j-api\target\classes;%USERPROFILE%\.m2\repository\org\fusesource\jansi\jansi\1.13\jansi-1.13.jar; org.apache.logging.log4j.core.appender.ConsoleAppenderJAnsiXExceptionMain log4j-core/src/test/resources/log4j2-console-xex-ansi.xml
+ * </pre>
+ *
+ */
+public class ConsoleAppenderJAnsiXExceptionMain {
+
+ public static void main(final String[] args) {
+ new ConsoleAppenderJAnsiXExceptionMain().test(args);
+ }
+
+ /**
+ * This is a @Test method to make it easy to run from a command line with {@code mvn -Dtest=FQCN test}
+ */
+ @Test
+ public void test() {
+ test(null);
+ }
+
+ public void test(final String[] args) {
+ // System.out.println(System.getProperty("java.class.path"));
+ final String config = args == null || args.length == 0 ? "target/test-classes/log4j2-console-xex-ansi.xml"
+ : args[0];
+ final LoggerContext ctx = Configurator.initialize(ConsoleAppenderAnsiMessagesMain.class.getName(), config);
+ final Logger logger = LogManager.getLogger(ConsoleAppenderJAnsiXExceptionMain.class);
+ try {
+ Files.getFileStore(Paths.get("?BOGUS?"));
+ } catch (final Exception e) {
+ final IllegalArgumentException logE = new IllegalArgumentException("Bad argument foo", e);
+ logger.error("Gotcha!", logE);
+ } finally {
+ Configurator.shutdown(ctx);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
index 0bc391d..066b560 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
@@ -248,7 +248,7 @@ public class FileAppenderTest {
appender.start();
assertTrue("Appender did not start", appender.isStarted());
final boolean exists = Files.exists(PATH);
- String msg = String.format("concurrent = %s, createOnDemand = %s, file exists = %s", concurrent, createOnDemand,
+ final String msg = String.format("concurrent = %s, createOnDemand = %s, file exists = %s", concurrent, createOnDemand,
exists);
// If concurrent the file might have been created (or not.)
// Can't really test createOnDemand && concurrent.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
index 894ee88..6cf8474 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java
@@ -80,7 +80,7 @@ public class OnStartupTriggeringPolicyTest {
try (final RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true, false,
policy, strategy, null, layout, 8192, true, false, configuration)) {
manager.initialize();
- String files = Arrays.toString(new File(TARGET_FOLDER).listFiles());
+ final String files = Arrays.toString(new File(TARGET_FOLDER).listFiles());
assertTrue(target.toString() + ", files = " + files, Files.exists(target));
assertEquals(target.toString(), 0, Files.size(target));
assertTrue("Missing: " + rolled.toString() + ", files on disk = " + files, Files.exists(rolled));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
index 7e10367..0c38a30 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
@@ -62,7 +62,7 @@ public class RollingAppenderCronOnceADayTest {
public static void beforeClass() throws Exception {
final Path src = FileSystems.getDefault().getPath(TARGET_TEST_CLASSES, CONFIG);
String content = new String(Files.readAllBytes(src), UTF_8);
- Calendar cal = Calendar.getInstance();
+ final Calendar cal = Calendar.getInstance();
cal.add(Calendar.SECOND, CRON_DELAY);
remainingTime = cal.getTimeInMillis() - System.currentTimeMillis();
cronExpression = String.format("%d %d %d * * ?",
@@ -84,7 +84,7 @@ public class RollingAppenderCronOnceADayTest {
public void testAppender() throws Exception {
// TODO Is there a better way to test than putting the thread to sleep all over the place?
final Logger logger = loggerContextRule.getLogger();
- File file = new File(FILE);
+ final File file = new File(FILE);
assertTrue("Log file does not exist", file.exists());
logger.debug("This is test message number 1, waiting for rolling");
@@ -112,7 +112,7 @@ public class RollingAppenderCronOnceADayTest {
final Matcher<File> hasGzippedFile = hasName(that(endsWith(".gz")));
int count = 0;
final File[] files = dir.listFiles();
- for (File generatedFile : files) {
+ for (final File generatedFile : files) {
if (hasGzippedFile.matches(generatedFile)) {
count++;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
index 6c2ab9a..d6e31fe 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
@@ -58,7 +58,7 @@ public class RollingAppenderCronTest {
public void testAppender() throws Exception {
// TODO Is there a better way to test than putting the thread to sleep all over the place?
final Logger logger = loggerContextRule.getLogger();
- File file = new File(FILE);
+ final File file = new File(FILE);
assertTrue("Log file does not exist", file.exists());
logger.debug("This is test message number 1");
Thread.sleep(2500);
@@ -79,7 +79,7 @@ public class RollingAppenderCronTest {
}
if (!succeeded) {
final File[] files = dir.listFiles();
- for (File dirFile : files) {
+ for (final File dirFile : files) {
logger.error("Found file: " + dirFile.getPath());
}
fail("No compressed files found");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
index f22dfcb..4b28d20 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
@@ -123,7 +123,7 @@ public class RollingAppenderSizeTest {
}
try {
Thread.sleep(100);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
// Ignore the error.
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
index ccf7ad1..dd41839 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
@@ -119,7 +119,7 @@ public class RoutingAppenderWithPurgingTest {
private void assertFileExistance(final String... files) {
- for (String file : files) {
+ for (final String file : files) {
assertTrue("File should exist - " + file + " file ", new File(file).exists());
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/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 5c7f467..a05aab4 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
@@ -181,7 +181,7 @@ public class RingBufferLogEventTest {
final RingBufferLogEvent evt = new RingBufferLogEvent();
try {
evt.getFormattedMessage();
- } catch (NullPointerException e) {
+ } catch (final NullPointerException e) {
fail("the messageText field was not set");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
index 15ba61b..82d6065 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
@@ -41,7 +41,7 @@ public abstract class AbstractRunQueue implements IPerfTestRunner {
if (Objects.equals(queue.take(), STOP)) {
break;
}
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
e.printStackTrace();
break;
}
@@ -67,7 +67,7 @@ public abstract class AbstractRunQueue implements IPerfTestRunner {
stopped = true;
try {
queue.put(STOP);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
e.printStackTrace();
}
}
@@ -82,7 +82,7 @@ public abstract class AbstractRunQueue implements IPerfTestRunner {
PrintingAsyncQueueFullPolicy.ringbufferFull.incrementAndGet();
try {
queue.put(finalMessage);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
e.printStackTrace();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/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 53deae9..bbf842e 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
@@ -122,7 +122,7 @@ public class CompositeConfigurationTest {
try {
final CompositeConfiguration config = (CompositeConfiguration) lcr.getConfiguration();
Assert.assertNotNull(config);
- } catch (NullPointerException e) {
+ } catch (final NullPointerException e) {
fail("Should not throw NullPointerException when there are different nodes.");
}
}
@@ -141,7 +141,7 @@ public class CompositeConfigurationTest {
assertEquals("Expected Root logger log level to be WARN", Level.WARN, config.getRootLogger().getLevel());
//Test for cat2 level override
- LoggerConfig cat2 = config.getLogger("cat2");
+ final LoggerConfig cat2 = config.getLogger("cat2");
assertEquals("Expected cat2 log level to be INFO", Level.INFO, cat2.getLevel());
//Test for cat2 additivity override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
index ed59a2b..ccb2cc5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java
@@ -91,10 +91,10 @@ public class ConfigurationAssemblerTest {
final Map<String, LoggerConfig> loggers = config.getLoggers();
assertNotNull(loggers);
assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
- LoggerConfig rootLoggerConfig = loggers.get("");
+ final LoggerConfig rootLoggerConfig = loggers.get("");
assertEquals(Level.ERROR, rootLoggerConfig.getLevel());
assertFalse(rootLoggerConfig.isIncludeLocation());
- LoggerConfig loggerConfig = loggers.get("org.apache.logging.log4j");
+ final LoggerConfig loggerConfig = loggers.get("org.apache.logging.log4j");
assertEquals(Level.DEBUG, loggerConfig.getLevel());
assertTrue(loggerConfig.isIncludeLocation());
final Filter filter = config.getFilter();
@@ -103,7 +103,7 @@ public class ConfigurationAssemblerTest {
final List<CustomLevelConfig> customLevels = config.getCustomLevels();
assertNotNull("No CustomLevels", filter);
assertEquals(1, customLevels.size());
- CustomLevelConfig customLevel = customLevels.get(0);
+ final CustomLevelConfig customLevel = customLevels.get(0);
assertEquals("Panic", customLevel.getLevelName());
assertEquals(17, customLevel.getIntLevel());
final Logger logger = LogManager.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
index 6559572..0665d19 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
@@ -178,9 +178,9 @@ public class ResolverUtilCustomProtocolTest {
@Test
public void testFindInPackageFromVfsDirectoryURL() throws Exception {
- ClassLoader cl = compileAndCreateClassLoader("3");
+ final ClassLoader cl = compileAndCreateClassLoader("3");
- ResolverUtil resolverUtil = new ResolverUtil();
+ final ResolverUtil resolverUtil = new ResolverUtil();
resolverUtil.setClassLoader(new SingleURLClassLoader(new URL("vfs:/target/resolverutil3/customplugin3/"), cl));
resolverUtil.findInPackage(new PluginTest(), "customplugin3");
assertEquals("Class not found in packages", 1, resolverUtil.getClasses().size());
@@ -190,9 +190,9 @@ public class ResolverUtilCustomProtocolTest {
@Test
public void testFindInPackageFromVfsJarURL() throws Exception {
- ClassLoader cl = compileJarAndCreateClassLoader("4");
+ final ClassLoader cl = compileJarAndCreateClassLoader("4");
- ResolverUtil resolverUtil = new ResolverUtil();
+ final ResolverUtil resolverUtil = new ResolverUtil();
resolverUtil.setClassLoader(
new SingleURLClassLoader(new URL("vfs:/target/resolverutil4/customplugin4.jar/customplugin4/"), cl));
resolverUtil.findInPackage(new PluginTest(), "customplugin4");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
index b5b894f..1b16430 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
@@ -141,9 +141,9 @@ public class ResolverUtilTest {
@Test
public void testFindInPackageFromDirectoryPath() throws Exception {
- ClassLoader cl = compileAndCreateClassLoader("1");
+ final ClassLoader cl = compileAndCreateClassLoader("1");
- ResolverUtil resolverUtil = new ResolverUtil();
+ final ResolverUtil resolverUtil = new ResolverUtil();
resolverUtil.setClassLoader(cl);
resolverUtil.findInPackage(new PluginTest(), "customplugin1");
assertEquals("Class not found in packages", 1, resolverUtil.getClasses().size());
@@ -154,9 +154,9 @@ public class ResolverUtilTest {
@Test
public void testFindInPackageFromJarPath() throws Exception {
- ClassLoader cl = compileJarAndCreateClassLoader("2");
+ final ClassLoader cl = compileJarAndCreateClassLoader("2");
- ResolverUtil resolverUtil = new ResolverUtil();
+ final ResolverUtil resolverUtil = new ResolverUtil();
resolverUtil.setClassLoader(cl);
resolverUtil.findInPackage(new PluginTest(), "customplugin2");
assertEquals("Class not found in packages", 1, resolverUtil.getClasses().size());
@@ -166,9 +166,9 @@ public class ResolverUtilTest {
}
static URLClassLoader compileJarAndCreateClassLoader(final String suffix) throws IOException, Exception {
- File workDir = compile(suffix);
- File jarFile = new File(workDir, "customplugin" + suffix + ".jar");
- URI jarURI = jarFile.toURI();
+ final File workDir = compile(suffix);
+ final File jarFile = new File(workDir, "customplugin" + suffix + ".jar");
+ final URI jarURI = jarFile.toURI();
createJar(jarURI, workDir, new File(workDir,
"customplugin" + suffix + "/FixedString" + suffix + "Layout.class"));
return URLClassLoader.newInstance(new URL[] {jarURI.toURL()});
@@ -188,7 +188,7 @@ public class ResolverUtilTest {
assertTrue("Create customplugin" + suffix + " folder KO", f.getParentFile().mkdirs());
}
- String content = new String(Files.readAllBytes(orig.toPath()))
+ final String content = new String(Files.readAllBytes(orig.toPath()))
.replaceAll("FixedString", "FixedString" + suffix)
.replaceAll("customplugin", "customplugin" + suffix);
Files.write(f.toPath(), content.getBytes());
@@ -198,11 +198,11 @@ public class ResolverUtilTest {
}
static void createJar(final URI jarURI, final File workDir, final File f) throws Exception {
- Map<String, String> env = new HashMap<>();
+ final Map<String, String> env = new HashMap<>();
env.put("create", "true");
- URI uri = URI.create("jar:file://" + jarURI.getRawPath());
+ final URI uri = URI.create("jar:file://" + jarURI.getRawPath());
try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) {
- Path path = zipfs.getPath(workDir.toPath().relativize(f.toPath()).toString());
+ final Path path = zipfs.getPath(workDir.toPath().relativize(f.toPath()).toString());
if (path.getParent() != null) {
Files.createDirectories(path.getParent());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
index 1cf6b60..0488d0f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
@@ -87,7 +87,7 @@ public class DynamicThresholdFilterTest {
final DynamicThresholdFilter filter = DynamicThresholdFilter.createFilter("userid", pairs, Level.ERROR, Filter.Result.ACCEPT, Filter.Result.NEUTRAL);
filter.start();
assertTrue(filter.isStarted());
- Object [] replacements = {"one", "two", "three"};
+ final Object [] replacements = {"one", "two", "three"};
assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", replacements));
assertSame(Filter.Result.ACCEPT, filter.filter(null, Level.DEBUG, null, "some test message", "one", "two", "three"));
ThreadContext.clearMap();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
index 2863a43..cd41263 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
@@ -101,7 +101,7 @@ public class ReusableLogEventFactoryTest {
@Test
public void testCreateEventInitFieldsProperly() throws Exception {
final ReusableLogEventFactory factory = new ReusableLogEventFactory();
- LogEvent event = callCreateEvent(factory, "logger", Level.INFO, new SimpleMessage("xyz"), null);
+ final LogEvent event = callCreateEvent(factory, "logger", Level.INFO, new SimpleMessage("xyz"), null);
assertNotNull(event.getContextMap());
assertNotNull(event.getContextStack());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
index 9f3d0b6..fe1dc5e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
@@ -108,7 +108,7 @@ public final class ThrowableFormatOptionsTest {
*/
@Test
public void testFullAnsi() {
- ThrowableFormatOptions tfo = test(new String[] { "full", "ansi" },
+ final ThrowableFormatOptions tfo = test(new String[] { "full", "ansi" },
Integer.MAX_VALUE, Constants.LINE_SEPARATOR, null);
testFullAnsiEmptyConfig(tfo);
}
@@ -118,17 +118,17 @@ public final class ThrowableFormatOptionsTest {
*/
@Test
public void testFullAnsiEmptyConfig() {
- ThrowableFormatOptions tfo = test(new String[] { "full", "ansi()" },
+ final ThrowableFormatOptions tfo = test(new String[] { "full", "ansi()" },
Integer.MAX_VALUE, Constants.LINE_SEPARATOR, null);
testFullAnsiEmptyConfig(tfo);
}
private void testFullAnsiEmptyConfig(final ThrowableFormatOptions tfo) {
- TextRenderer textRenderer = tfo.getTextRenderer();
+ final TextRenderer textRenderer = tfo.getTextRenderer();
Assert.assertNotNull(textRenderer);
Assert.assertTrue(textRenderer instanceof JAnsiTextRenderer);
- JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
- Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
+ final JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
+ final Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
// We have defaults
Assert.assertFalse(styleMap.isEmpty());
Assert.assertNotNull(styleMap.get("Name"));
@@ -139,13 +139,13 @@ public final class ThrowableFormatOptionsTest {
*/
@Test
public void testFullAnsiWithCustomStyle() {
- ThrowableFormatOptions tfo = test(new String[] { "full", "ansi(Warning=red)" },
+ final ThrowableFormatOptions tfo = test(new String[] { "full", "ansi(Warning=red)" },
Integer.MAX_VALUE, Constants.LINE_SEPARATOR, null);
- TextRenderer textRenderer = tfo.getTextRenderer();
+ final TextRenderer textRenderer = tfo.getTextRenderer();
Assert.assertNotNull(textRenderer);
Assert.assertTrue(textRenderer instanceof JAnsiTextRenderer);
- JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
- Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
+ final JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
+ final Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
Assert.assertArrayEquals(new Code[] { Code.RED }, styleMap.get("Warning"));
}
@@ -154,13 +154,13 @@ public final class ThrowableFormatOptionsTest {
*/
@Test
public void testFullAnsiWithCustomStyles() {
- ThrowableFormatOptions tfo = test(new String[] { "full", "ansi(Warning=red Key=blue Value=cyan)" },
+ final ThrowableFormatOptions tfo = test(new String[] { "full", "ansi(Warning=red Key=blue Value=cyan)" },
Integer.MAX_VALUE, Constants.LINE_SEPARATOR, null);
- TextRenderer textRenderer = tfo.getTextRenderer();
+ final TextRenderer textRenderer = tfo.getTextRenderer();
Assert.assertNotNull(textRenderer);
Assert.assertTrue(textRenderer instanceof JAnsiTextRenderer);
- JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
- Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
+ final JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
+ final Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
Assert.assertArrayEquals(new Code[] { Code.RED }, styleMap.get("Warning"));
Assert.assertArrayEquals(new Code[] { Code.BLUE }, styleMap.get("Key"));
Assert.assertArrayEquals(new Code[] { Code.CYAN }, styleMap.get("Value"));
@@ -171,14 +171,14 @@ public final class ThrowableFormatOptionsTest {
*/
@Test
public void testFullAnsiWithCustomComplexStyles() {
- ThrowableFormatOptions tfo = test(
+ final ThrowableFormatOptions tfo = test(
new String[] { "full", "ansi(Warning=red Key=blue,bg_red Value=cyan,bg_black,underline)" }, Integer.MAX_VALUE,
Constants.LINE_SEPARATOR, null);
- TextRenderer textRenderer = tfo.getTextRenderer();
+ final TextRenderer textRenderer = tfo.getTextRenderer();
Assert.assertNotNull(textRenderer);
Assert.assertTrue(textRenderer instanceof JAnsiTextRenderer);
- JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
- Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
+ final JAnsiTextRenderer jansiRenderer = (JAnsiTextRenderer) textRenderer;
+ final Map<String, Code[]> styleMap = jansiRenderer.getStyleMap();
Assert.assertArrayEquals(new Code[] { Code.RED }, styleMap.get("Warning"));
Assert.assertArrayEquals(new Code[] { Code.BLUE, Code.BG_RED }, styleMap.get("Key"));
Assert.assertArrayEquals(new Code[] { Code.CYAN, Code.BG_BLACK, Code.UNDERLINE }, styleMap.get("Value"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java
index f4eddd1..f0f08fa 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutTest.java
@@ -161,10 +161,10 @@ public class CsvParameterLayoutTest {
@Test
public void testLogJsonArgument() throws InterruptedException {
- ListAppender appender = (ListAppender) init.getAppender("List");
+ final ListAppender appender = (ListAppender) init.getAppender("List");
appender.countDownLatch = new CountDownLatch(4);
appender.clear();
- Logger logger = (Logger) LogManager.getRootLogger();
+ final Logger logger = (Logger) LogManager.getRootLogger();
final String json = "{\"id\":10,\"name\":\"Alice\"}";
logger.error("log:{}", json);
// wait until background thread finished processing