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:54 UTC
[25/50] [abbrv] logging-log4j2 git commit: Add final modifier to
method parameters
Add final modifier to method parameters
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/19c92876
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/19c92876
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/19c92876
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 19c92876f957a8439fa9c21ea6b9c13aced0c006
Parents: c513f13
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Sep 6 23:00:21 2016 -0400
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Sep 6 23:00:21 2016 -0400
----------------------------------------------------------------------
.../config/Log4j1ConfigurationConverter.java | 2 +-
.../log4j/config/Log4j1ConfigurationParser.java | 12 +-
.../apache/log4j/layout/Log4j1XmlLayout.java | 2 +-
.../pattern/Log4j1MdcPatternConverterTest.java | 2 +-
.../logging/log4j/core/AbstractLifeCycle.java | 2 +-
.../logging/log4j/core/LoggerContext.java | 6 +-
.../log4j/core/appender/AbstractAppender.java | 6 +-
.../log4j/core/appender/AbstractManager.java | 2 +-
.../appender/AbstractOutputStreamAppender.java | 2 +-
.../log4j/core/appender/AsyncAppender.java | 20 +-
.../core/appender/ConfigurationFactoryData.java | 2 +-
.../log4j/core/appender/FileManager.java | 6 +-
.../core/appender/OutputStreamManager.java | 4 +-
.../core/appender/RandomAccessFileManager.java | 6 +-
.../core/appender/RollingFileAppender.java | 10 +-
.../log4j/core/appender/WriterManager.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../core/appender/mom/jeromq/JeroMqManager.java | 2 +-
.../core/appender/mom/kafka/KafkaManager.java | 2 +-
.../appender/rolling/CronTriggeringPolicy.java | 2 +-
.../rolling/OnStartupTriggeringPolicy.java | 2 +-
.../core/appender/rolling/PatternProcessor.java | 2 +-
.../appender/rolling/RollingFileManager.java | 6 +-
.../rolling/RollingRandomAccessFileManager.java | 4 +-
.../core/async/ArrayBlockingQueueFactory.java | 2 +-
.../async/DisruptorBlockingQueueFactory.java | 2 +-
.../core/async/JCToolsBlockingQueueFactory.java | 2 +-
.../core/async/LinkedTransferQueueFactory.java | 2 +-
.../core/config/AbstractConfiguration.java | 2 +-
.../core/config/ConfigurationScheduler.java | 2 +-
.../log4j/core/config/CronScheduledFuture.java | 2 +-
.../config/builder/impl/BuiltConfiguration.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 14 +-
.../properties/PropertiesConfiguration.java | 2 +-
.../PropertiesConfigurationBuilder.java | 2 +-
.../PropertiesConfigurationFactory.java | 2 +-
.../log4j/core/filter/AbstractFilterable.java | 2 +-
.../log4j/core/impl/ExtendedClassInfo.java | 2 +-
.../core/impl/ExtendedStackTraceElement.java | 4 +-
.../log4j/core/impl/ThrowableFormatOptions.java | 592 ++++++++---------
.../logging/log4j/core/impl/ThrowableProxy.java | 14 +-
.../log4j/core/net/DatagramSocketManager.java | 2 +-
.../logging/log4j/core/net/JndiManager.java | 2 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../log4j/core/net/TcpSocketManager.java | 2 +-
.../log4j/core/pattern/HtmlTextRenderer.java | 6 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 664 +++++++++----------
.../core/pattern/MessagePatternConverter.java | 4 +-
.../log4j/core/pattern/PlainTextRenderer.java | 4 +-
.../log4j/core/util/ExecutorServices.java | 2 +-
.../core/util/datetime/FixedDateFormat.java | 2 +-
.../log4j/core/appender/FileAppenderTest.java | 8 +-
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../log4j/core/appender/SocketAppenderTest.java | 2 +-
.../appender/XmlCompleteFileAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 2 +-
.../core/async/perftest/RunConversant.java | 2 +-
.../log4j/core/async/perftest/RunJCTools.java | 2 +-
.../util/ResolverUtilCustomProtocolTest.java | 20 +-
.../config/plugins/util/ResolverUtilTest.java | 8 +-
.../core/impl/ThrowableFormatOptionsTest.java | 2 +-
.../log4j/core/impl/ThrowableProxyTest.java | 4 +-
.../log4j/core/layout/Log4j2_1482_CoreTest.java | 2 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 4 +-
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../logging/log4j/junit/CleanFolders.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 4 +-
.../junit/URLStreamHandlerFactoryRule.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 2 +-
.../configuration/CustomConfiguration.java | 4 +-
.../logging/slf4j/Log4j2_1482_Slf4jTest.java | 2 +-
72 files changed, 764 insertions(+), 764 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 ab09f4b..3cfb888 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
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
*/
public final class Log4j1ConfigurationConverter {
- public static void main(String[] args) throws IOException {
+ 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);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 9356584..d857877 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
@@ -176,22 +176,22 @@ public class Log4j1ConfigurationParser {
builder.add(appenderBuilder);
}
- private void buildAttribute(String componentName, ComponentBuilder componentBuilder,
- String sourceAttributeName, String targetAttributeName) {
+ private void buildAttribute(final String componentName, final ComponentBuilder componentBuilder,
+ final String sourceAttributeName, final String targetAttributeName) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName);
if (attributeValue != null) {
componentBuilder.addAttribute(targetAttributeName, attributeValue);
}
}
- private void buildAttributeWithDefault(String componentName, ComponentBuilder componentBuilder,
- String sourceAttributeName, String targetAttributeName, String defaultValue) {
+ private void buildAttributeWithDefault(final String componentName, final ComponentBuilder componentBuilder,
+ final String sourceAttributeName, final String targetAttributeName, final String defaultValue) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName, defaultValue);
componentBuilder.addAttribute(targetAttributeName, attributeValue);
}
- private void buildMandatoryAttribute(String componentName, ComponentBuilder componentBuilder,
- String sourceAttributeName, String targetAttributeName) {
+ private void buildMandatoryAttribute(final String componentName, final ComponentBuilder componentBuilder,
+ final String sourceAttributeName, final String targetAttributeName) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName);
if (attributeValue != null) {
componentBuilder.addAttribute(targetAttributeName, attributeValue);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 1df66d5..8d0fba9 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
@@ -53,7 +53,7 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
return new Log4j1XmlLayout(locationInfo, properties);
}
- private Log4j1XmlLayout(boolean locationInfo, boolean properties) {
+ private Log4j1XmlLayout(final boolean locationInfo, final boolean properties) {
super(StandardCharsets.UTF_8);
this.locationInfo = locationInfo;
this.properties = properties;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 32ac89f..e997aee 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
@@ -62,7 +62,7 @@ public class Log4j1MdcPatternConverterTest {
test(contextMap, expected, new String[] {"key1"});
}
- private void test(Map<String, String> contextMap, String expected, String[] options) {
+ private void test(final Map<String, String> contextMap, final String expected, final String[] options) {
final LogEvent event = Log4jLogEvent.newBuilder()
.setLoggerName("MyLogger")
.setLevel(Level.DEBUG)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
index 33aabd1..71cc13d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
@@ -127,7 +127,7 @@ public class AbstractLifeCycle implements LifeCycle {
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
this.state = LifeCycle.State.STOPPED;
return true;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 248b591..1fbc855 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -302,7 +302,7 @@ public class LoggerContext extends AbstractLifeCycle
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
LOGGER.debug("Stopping LoggerContext[name={}, {}]...", getName(), this);
configLock.lock();
final boolean shutdownEs;
@@ -685,7 +685,7 @@ public class LoggerContext extends AbstractLifeCycle
* scheduled for execution
* @throws NullPointerException if the task is null
*/
- public Future<?> submit(Runnable task) {
+ public Future<?> submit(final Runnable task) {
return executorService.submit(task);
}
@@ -701,7 +701,7 @@ public class LoggerContext extends AbstractLifeCycle
* @throws NullPointerException
* if the task is null
*/
- public Future<?> submitDaemon(Runnable task) {
+ public Future<?> submitDaemon(final Runnable task) {
return executorServiceDeamons.submit(task);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
index 8df298f..069392c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
@@ -66,17 +66,17 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
return layout;
}
- public B withName(String name) {
+ public B withName(final String name) {
this.name = name;
return asBuilder();
}
- public B withIgnoreExceptions(boolean ignoreExceptions) {
+ public B withIgnoreExceptions(final boolean ignoreExceptions) {
this.ignoreExceptions = ignoreExceptions;
return asBuilder();
}
- public B withLayout(Layout<? extends Serializable> layout) {
+ public B withLayout(final Layout<? extends Serializable> layout) {
this.layout = layout;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
index dfe7ffd..edd82a2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
@@ -144,7 +144,7 @@ public abstract class AbstractManager implements AutoCloseable {
* @param timeout TODO
* @param timeUnit TODO
*/
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
// This default implementation does nothing.
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 4d16be8..1ff4cb9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -60,7 +60,7 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
return immediateFlush;
}
- public B withImmediateFlush(boolean immediateFlush) {
+ public B withImmediateFlush(final boolean immediateFlush) {
this.immediateFlush = immediateFlush;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index 4e85d67..ff75f77 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -308,52 +308,52 @@ public final class AsyncAppender extends AbstractAppender {
@PluginElement(BlockingQueueFactory.ELEMENT_TYPE)
private BlockingQueueFactory<LogEvent> blockingQueueFactory = new ArrayBlockingQueueFactory<>();
- public Builder setAppenderRefs(AppenderRef[] appenderRefs) {
+ public Builder setAppenderRefs(final AppenderRef[] appenderRefs) {
this.appenderRefs = appenderRefs;
return this;
}
- public Builder setErrorRef(String errorRef) {
+ public Builder setErrorRef(final String errorRef) {
this.errorRef = errorRef;
return this;
}
- public Builder setBlocking(boolean blocking) {
+ public Builder setBlocking(final boolean blocking) {
this.blocking = blocking;
return this;
}
- public Builder setShutdownTimeout(long shutdownTimeout) {
+ public Builder setShutdownTimeout(final long shutdownTimeout) {
this.shutdownTimeout = shutdownTimeout;
return this;
}
- public Builder setBufferSize(int bufferSize) {
+ public Builder setBufferSize(final int bufferSize) {
this.bufferSize = bufferSize;
return this;
}
- public Builder setName(String name) {
+ public Builder setName(final String name) {
this.name = name;
return this;
}
- public Builder setIncludeLocation(boolean includeLocation) {
+ public Builder setIncludeLocation(final boolean includeLocation) {
this.includeLocation = includeLocation;
return this;
}
- public Builder setFilter(Filter filter) {
+ public Builder setFilter(final Filter filter) {
this.filter = filter;
return this;
}
- public Builder setConfiguration(Configuration configuration) {
+ public Builder setConfiguration(final Configuration configuration) {
this.configuration = configuration;
return this;
}
- public Builder setIgnoreExceptions(boolean ignoreExceptions) {
+ public Builder setIgnoreExceptions(final boolean ignoreExceptions) {
this.ignoreExceptions = ignoreExceptions;
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
index e2c20d4..cadfea0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
@@ -29,7 +29,7 @@ public class ConfigurationFactoryData {
*/
public final Configuration configuration;
- public ConfigurationFactoryData(Configuration configuration) {
+ public ConfigurationFactoryData(final Configuration configuration) {
super();
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index cb8e2ed..6c0427a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -76,7 +76,7 @@ public class FileManager extends OutputStreamManager {
/**
* @since 2.7
*/
- protected FileManager(LoggerContext loggerContext, final String fileName, final OutputStream os, final boolean append, final boolean locking,
+ protected FileManager(final LoggerContext loggerContext, final String fileName, final OutputStream os, final boolean append, final boolean locking,
final boolean createOnDemand, final String advertiseURI, final Layout<? extends Serializable> layout,
final boolean writeHeader, final ByteBuffer buffer) {
super(loggerContext, os, fileName, createOnDemand, layout, writeHeader, buffer);
@@ -102,7 +102,7 @@ public class FileManager extends OutputStreamManager {
*/
public static FileManager getFileManager(final String fileName, final boolean append, boolean locking,
final boolean bufferedIo, final boolean createOnDemand, final String advertiseUri,
- final Layout<? extends Serializable> layout, final int bufferSize, Configuration configuration) {
+ final Layout<? extends Serializable> layout, final int bufferSize, final Configuration configuration) {
if (locking && bufferedIo) {
locking = false;
@@ -220,7 +220,7 @@ public class FileManager extends OutputStreamManager {
*/
public FactoryData(final boolean append, final boolean locking, final boolean bufferedIo, final int bufferSize,
final boolean createOnDemand, final String advertiseURI, final Layout<? extends Serializable> layout,
- Configuration configuration) {
+ final Configuration configuration) {
super(configuration);
this.append = append;
this.locking = locking;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
index f42cc72..af4e11e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
@@ -76,7 +76,7 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe
/**
* @since 2.7
*/
- protected OutputStreamManager(final LoggerContext loggerContext, OutputStream os, final String streamName,
+ protected OutputStreamManager(final LoggerContext loggerContext, final OutputStream os, final String streamName,
final boolean createOnDemand, final Layout<? extends Serializable> layout, final boolean writeHeader,
final ByteBuffer byteBuffer) {
super(loggerContext, streamName);
@@ -131,7 +131,7 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe
* Default hook to write footer during close.
*/
@Override
- public void releaseSub(long timeout, TimeUnit timeUnit) {
+ public void releaseSub(final long timeout, final TimeUnit timeUnit) {
writeFooter();
closeOutputStream();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
index 6aca266..68a6f81 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
@@ -44,7 +44,7 @@ public class RandomAccessFileManager extends OutputStreamManager {
private final RandomAccessFile randomAccessFile;
private final ThreadLocal<Boolean> isEndOfBatch = new ThreadLocal<>();
- protected RandomAccessFileManager(LoggerContext loggerContext, final RandomAccessFile file, final String fileName,
+ protected RandomAccessFileManager(final LoggerContext loggerContext, final RandomAccessFile file, final String fileName,
final OutputStream os, final int bufferSize, final String advertiseURI,
final Layout<? extends Serializable> layout, final boolean writeHeader) {
super(loggerContext, os, fileName, false, layout, writeHeader, ByteBuffer.wrap(new byte[bufferSize]));
@@ -69,7 +69,7 @@ public class RandomAccessFileManager extends OutputStreamManager {
*/
public static RandomAccessFileManager getFileManager(final String fileName, final boolean append,
final boolean isFlush, final int bufferSize, final String advertiseURI,
- final Layout<? extends Serializable> layout, Configuration configuration) {
+ final Layout<? extends Serializable> layout, final Configuration configuration) {
return (RandomAccessFileManager) getManager(fileName, new FactoryData(append,
isFlush, bufferSize, advertiseURI, layout, configuration), FACTORY);
}
@@ -158,7 +158,7 @@ public class RandomAccessFileManager extends OutputStreamManager {
* @param configuration The configuration.
*/
public FactoryData(final boolean append, final boolean immediateFlush, final int bufferSize,
- final String advertiseURI, final Layout<? extends Serializable> layout, Configuration configuration) {
+ final String advertiseURI, final Layout<? extends Serializable> layout, final Configuration configuration) {
super(configuration);
this.append = append;
this.immediateFlush = immediateFlush;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index 44ab7f3..726c2d2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -216,17 +216,17 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
return strategy;
}
- public B withFilePattern(String filePattern) {
+ public B withFilePattern(final String filePattern) {
this.filePattern = filePattern;
return asBuilder();
}
- public B withPolicy(TriggeringPolicy policy) {
+ public B withPolicy(final TriggeringPolicy policy) {
this.policy = policy;
return asBuilder();
}
- public B withStrategy(RolloverStrategy strategy) {
+ public B withStrategy(final RolloverStrategy strategy) {
this.strategy = strategy;
return asBuilder();
}
@@ -335,8 +335,8 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
final String bufferSizeStr,
final String immediateFlush,
final TriggeringPolicy policy,
- RolloverStrategy strategy,
- Layout<? extends Serializable> layout,
+ final RolloverStrategy strategy,
+ final Layout<? extends Serializable> layout,
final Filter filter,
final String ignore,
final String advertise,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
index 5a95794..323a9fe 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
@@ -99,7 +99,7 @@ public class WriterManager extends AbstractManager {
* Default hook to write footer during close.
*/
@Override
- public void releaseSub(long timeout, TimeUnit timeUnit) {
+ public void releaseSub(final long timeout, final TimeUnit timeUnit) {
writeFooter();
closeWriter();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index 26f0070..5f46bf4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -171,7 +171,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
}
@Override
- public final void releaseSub(long timeout, TimeUnit timeUnit) {
+ public final void releaseSub(final long timeout, final TimeUnit timeUnit) {
this.shutdown();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
index 2d8dfda..a36d3fb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
@@ -125,7 +125,7 @@ public class JmsManager extends AbstractManager {
}
@Override
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
try {
this.session.close();
} catch (final JMSException ignored) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
index c460d93..f731d61 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
@@ -105,7 +105,7 @@ public class JeroMqManager extends AbstractManager {
}
@Override
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
publisher.close();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
index 58c4ba2..d991d7e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
@@ -43,7 +43,7 @@ public class KafkaManager extends AbstractManager {
private final String topic;
- public KafkaManager(LoggerContext loggerContext, final String name, final String topic, final Property[] properties) {
+ public KafkaManager(final LoggerContext loggerContext, final String name, final String topic, final Property[] properties) {
super(loggerContext, name);
this.topic = topic;
config.setProperty("key.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 8d8bba7..54998dc 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
@@ -141,7 +141,7 @@ public final class CronTriggeringPolicy extends AbstractLifeCycle implements Tri
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
setStopping();
boolean canceled = true;
if (future != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
index ae7e439..36639ae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
@@ -36,7 +36,7 @@ public class OnStartupTriggeringPolicy extends AbstractLifeCycle implements Trig
private final long minSize;
- private OnStartupTriggeringPolicy(long minSize) {
+ private OnStartupTriggeringPolicy(final long minSize) {
this.minSize = minSize;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
index ba7934e..ca13769 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
@@ -96,7 +96,7 @@ public class PatternProcessor {
return prevFileTime;
}
- public void setPrevFileTime(long prevFileTime) {
+ public void setPrevFileTime(final long prevFileTime) {
this.prevFileTime = prevFileTime;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index be5f2cb..1fc08a0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -85,7 +85,7 @@ public class RollingFileManager extends FileManager {
/**
* @since 2.7
*/
- protected RollingFileManager(LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os,
+ protected RollingFileManager(final LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os,
final boolean append, final boolean createOnDemand, final long size, final long time,
final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy,
final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer) {
@@ -144,7 +144,7 @@ public class RollingFileManager extends FileManager {
return renameEmptyFiles;
}
- public void setRenameEmptyFiles(boolean renameEmptyFiles) {
+ public void setRenameEmptyFiles(final boolean renameEmptyFiles) {
this.renameEmptyFiles = renameEmptyFiles;
}
@@ -175,7 +175,7 @@ public class RollingFileManager extends FileManager {
}
@Override
- public void releaseSub(long timeout, TimeUnit timeUnit) {
+ public void releaseSub(final long timeout, final TimeUnit timeUnit) {
triggeringPolicy.stop(timeout, timeUnit);
super.releaseSub(timeout, timeUnit);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
index f27d445..564934f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
@@ -82,7 +82,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
public static RollingRandomAccessFileManager getRollingRandomAccessFileManager(final String fileName,
final String filePattern, final boolean isAppend, final boolean immediateFlush, final int bufferSize,
final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI,
- final Layout<? extends Serializable> layout, Configuration configuration) {
+ final Layout<? extends Serializable> layout, final Configuration configuration) {
return (RollingRandomAccessFileManager) getManager(fileName, new FactoryData(filePattern, isAppend,
immediateFlush, bufferSize, policy, strategy, advertiseURI, layout, configuration), FACTORY);
}
@@ -231,7 +231,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
*/
public FactoryData(final String pattern, final boolean append, final boolean immediateFlush,
final int bufferSize, final TriggeringPolicy policy, final RolloverStrategy strategy,
- final String advertiseURI, final Layout<? extends Serializable> layout, Configuration configuration) {
+ final String advertiseURI, final Layout<? extends Serializable> layout, final Configuration configuration) {
super(configuration);
this.pattern = pattern;
this.append = append;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
index dcad78a..2303e1c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
@@ -15,7 +15,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "ArrayBlockingQueue", category = Node.CATEGORY, elementType = BlockingQueueFactory.ELEMENT_TYPE)
public class ArrayBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
@Override
- public BlockingQueue<E> create(int capacity) {
+ public BlockingQueue<E> create(final int capacity) {
return new ArrayBlockingQueue<>(capacity);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
index 9b85ae6..2a45402 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
@@ -24,7 +24,7 @@ public class DisruptorBlockingQueueFactory<E> implements BlockingQueueFactory<E>
}
@Override
- public BlockingQueue<E> create(int capacity) {
+ public BlockingQueue<E> create(final int capacity) {
return new DisruptorBlockingQueue<>(capacity, spinPolicy);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 9ae140d..2b83858 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
@@ -57,7 +57,7 @@ public class JCToolsBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
public int drainTo(final Collection<? super E> c, final int maxElements) {
return drain(new Consumer<E>() {
@Override
- public void accept(E e) {
+ public void accept(final E e) {
c.add(e);
}
}, maxElements);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
index 6ab24e7..0d4628e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "LinkedTransferQueue", category = Node.CATEGORY, elementType = BlockingQueueFactory.ELEMENT_TYPE)
public class LinkedTransferQueueFactory<E> implements BlockingQueueFactory<E> {
@Override
- public BlockingQueue<E> create(int capacity) {
+ public BlockingQueue<E> create(final int capacity) {
return new LinkedTransferQueue<>();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index 8b656a6..c6373c1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -130,7 +130,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
/**
* Constructor.
*/
- protected AbstractConfiguration(LoggerContext loggerContext, final ConfigurationSource configurationSource) {
+ protected AbstractConfiguration(final LoggerContext loggerContext, final ConfigurationSource configurationSource) {
this.loggerContext = new WeakReference<>(loggerContext);
// The loggerContext is null for the NullConfiguration class.
// this.loggerContext = new WeakReference(Objects.requireNonNull(loggerContext, "loggerContext is null"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 a17166d..89ebcd5 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
@@ -153,7 +153,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
return executorService.scheduleWithFixedDelay(command, initialDelay, delay, unit);
}
- public long nextFireInterval(Date fireDate) {
+ public long nextFireInterval(final Date fireDate) {
return fireDate.getTime() - new Date().getTime();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
index 948c23b..4afb46f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
@@ -85,7 +85,7 @@ public class CronScheduledFuture<V> implements ScheduledFuture<V> {
private final ScheduledFuture<?> scheduledFuture;
private final Date runDate;
- FutureData(ScheduledFuture<?> future, Date runDate) {
+ FutureData(final ScheduledFuture<?> future, final Date runDate) {
this.scheduledFuture = future;
this.runDate = runDate;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
index ca35d12..aa7761c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
@@ -54,7 +54,7 @@ public class BuiltConfiguration extends AbstractConfiguration {
private Component scriptsComponent;
private String contentType = "text";
- public BuiltConfiguration(LoggerContext loggerContext, final ConfigurationSource source, final Component rootComponent) {
+ public BuiltConfiguration(final LoggerContext loggerContext, final ConfigurationSource source, final Component rootComponent) {
super(loggerContext, source);
statusConfig = new StatusConfiguration().withVerboseClasses(VERBOSE_CLASSES).withStatus(getDefaultStatus());
for (final Component component : rootComponent.getComponents()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 8a700a4..58474cb 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
@@ -226,7 +226,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return sw.toString();
}
- private void writeXmlConfiguration(XMLStreamWriter xmlWriter) throws XMLStreamException {
+ private void writeXmlConfiguration(final XMLStreamWriter xmlWriter) throws XMLStreamException {
xmlWriter.writeStartDocument();
xmlWriter.writeCharacters(EOL);
@@ -275,13 +275,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeEndDocument();
}
- private void writeXmlSection(XMLStreamWriter xmlWriter, Component component) throws XMLStreamException {
+ private void writeXmlSection(final XMLStreamWriter xmlWriter, final Component component) throws XMLStreamException {
if (!component.getAttributes().isEmpty() || !component.getComponents().isEmpty() || component.getValue() != null) {
writeXmlComponent(xmlWriter, component, 1);
}
}
- private void writeXmlComponent(XMLStreamWriter xmlWriter, Component component, int nesting) throws XMLStreamException {
+ private void writeXmlComponent(final XMLStreamWriter xmlWriter, final Component component, final int nesting) throws XMLStreamException {
if (!component.getComponents().isEmpty() || component.getValue() != null) {
writeXmlIndent(xmlWriter, nesting);
xmlWriter.writeStartElement(component.getPluginType());
@@ -307,13 +307,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeCharacters(EOL);
}
- private void writeXmlIndent(XMLStreamWriter xmlWriter, int nesting) throws XMLStreamException {
+ private void writeXmlIndent(final XMLStreamWriter xmlWriter, final int nesting) throws XMLStreamException {
for (int i = 0; i < nesting; i++) {
xmlWriter.writeCharacters(INDENT);
}
}
- private void writeXmlAttributes(XMLStreamWriter xmlWriter, Component component) throws XMLStreamException {
+ private void writeXmlAttributes(final XMLStreamWriter xmlWriter, final Component component) throws XMLStreamException {
for (Map.Entry<String, String> attribute : component.getAttributes().entrySet()) {
xmlWriter.writeAttribute(attribute.getKey(), attribute.getValue());
}
@@ -526,13 +526,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public ConfigurationBuilder<T> setDestination(String destination) {
+ public ConfigurationBuilder<T> setDestination(final String destination) {
this.destination = destination;
return this;
}
@Override
- public void setLoggerContext(LoggerContext loggerContext) {
+ public void setLoggerContext(final LoggerContext loggerContext) {
this.loggerContext = loggerContext;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
index b89b30c..ff6f467 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
public class PropertiesConfiguration extends BuiltConfiguration implements Reconfigurable {
// ctor is called through reflection.
- public PropertiesConfiguration(LoggerContext loggerContext, final ConfigurationSource source, final Component root) {
+ public PropertiesConfiguration(final LoggerContext loggerContext, final ConfigurationSource source, final Component root) {
super(loggerContext, source, root);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
index e35599c..63b093f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
@@ -369,7 +369,7 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
return loggerBuilder;
}
- public PropertiesConfigurationBuilder setLoggerContext(LoggerContext loggerContext) {
+ public PropertiesConfigurationBuilder setLoggerContext(final LoggerContext loggerContext) {
this.loggerContext = loggerContext;
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
index 2263267..d5e1aa9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
@@ -42,7 +42,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
}
@Override
- public PropertiesConfiguration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) {
+ public PropertiesConfiguration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
final Properties properties = new Properties();
try (final InputStream configStream = source.getInputStream()) {
properties.load(configStream);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 92b8eee..278a02a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -48,7 +48,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
return (B) this;
}
- public B withFilter(Filter filter) {
+ public B withFilter(final Filter filter) {
this.filter = filter;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
index 280a574..44d42f9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
@@ -102,7 +102,7 @@ public final class ExtendedClassInfo implements Serializable {
return result;
}
- public void renderOn(StringBuilder output, TextRenderer textRenderer) {
+ public void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
if (!this.exact) {
textRenderer.render("~", output, "ExtraClassInfo.Inexact");
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
index 4648ed8..06183e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
@@ -133,13 +133,13 @@ public final class ExtendedStackTraceElement implements Serializable {
return this.stackTraceElement.isNativeMethod();
}
- void renderOn(StringBuilder output, TextRenderer textRenderer) {
+ void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
render(this.stackTraceElement, output, textRenderer);
textRenderer.render(" ", output, "Text");
this.extraClassInfo.renderOn(output, textRenderer);
}
- private void render(StackTraceElement stElement, StringBuilder output, TextRenderer textRenderer) {
+ private void render(final StackTraceElement stElement, final StringBuilder output, final TextRenderer textRenderer) {
final String fileName = stElement.getFileName();
final int lineNumber = stElement.getLineNumber();
textRenderer.render(getClassName(), output, "StackTraceElement.ClassName");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 9890347..565f15c 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
@@ -1,296 +1,296 @@
-/*
- * 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.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-import org.apache.logging.log4j.core.pattern.JAnsiTextRenderer;
-import org.apache.logging.log4j.core.pattern.TextRenderer;
-import org.apache.logging.log4j.core.pattern.PlainTextRenderer;
-import org.apache.logging.log4j.core.util.Constants;
-import org.apache.logging.log4j.core.util.Loader;
-import org.apache.logging.log4j.core.util.Patterns;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.util.Strings;
-
-/**
- * Contains options which control how a {@link Throwable} pattern is formatted.
- */
-public final class ThrowableFormatOptions {
-
- private static final int DEFAULT_LINES = Integer.MAX_VALUE;
-
- /**
- * Default instance of {@code ThrowableFormatOptions}.
- */
- protected static final ThrowableFormatOptions DEFAULT = new ThrowableFormatOptions();
-
- /**
- * Format the whole stack trace.
- */
- private static final String FULL = "full";
-
- /**
- * Do not format the exception.
- */
- private static final String NONE = "none";
-
- /**
- * Format only the first line of the throwable.
- */
- private static final String SHORT = "short";
-
- /**
- * ANSI renderer
- */
- private final TextRenderer textRenderer;
-
- /**
- * The number of lines to write.
- */
- private final int lines;
-
- /**
- * The stack trace separator.
- */
- private final String separator;
-
- /**
- * The list of packages to filter.
- */
- private final List<String> ignorePackages;
-
- public static final String CLASS_NAME = "short.className";
- public static final String METHOD_NAME = "short.methodName";
- public static final String LINE_NUMBER = "short.lineNumber";
- public static final String FILE_NAME = "short.fileName";
- public static final String MESSAGE = "short.message";
- public static final String LOCALIZED_MESSAGE = "short.localizedMessage";
-
- /**
- * Constructs the options for printing stack trace.
- *
- * @param lines
- * The number of lines.
- * @param separator
- * The stack trace separator.
- * @param ignorePackages
- * The packages to filter.
- * @param textRenderer
- * The ANSI renderer
- */
- protected ThrowableFormatOptions(final int lines, final String separator, final List<String> ignorePackages,
- TextRenderer textRenderer) {
- this.lines = lines;
- this.separator = separator == null ? Constants.LINE_SEPARATOR : separator;
- this.ignorePackages = ignorePackages;
- this.textRenderer = textRenderer == null ? PlainTextRenderer.getInstance() : textRenderer;
- }
-
- /**
- * Constructs the options for printing stack trace.
- *
- * @param packages
- * The packages to filter.
- */
- protected ThrowableFormatOptions(final List<String> packages) {
- this(DEFAULT_LINES, null, packages, null);
- }
-
- /**
- * Constructs the options for printing stack trace.
- */
- protected ThrowableFormatOptions() {
- this(DEFAULT_LINES, null, null, null);
- }
-
- /**
- * Returns the number of lines to write.
- *
- * @return The number of lines to write.
- */
- public int getLines() {
- return this.lines;
- }
-
- /**
- * Returns the stack trace separator.
- *
- * @return The stack trace separator.
- */
- public String getSeparator() {
- return this.separator;
- }
-
- /**
- * Returns the message rendered.
- *
- * @return the message rendered.
- */
- public TextRenderer getTextRenderer() {
- return textRenderer;
- }
-
- /**
- * Returns the list of packages to ignore (filter out).
- *
- * @return The list of packages to ignore (filter out).
- */
- public List<String> getIgnorePackages() {
- return this.ignorePackages;
- }
-
- /**
- * Determines if all lines should be printed.
- *
- * @return true for all lines, false otherwise.
- */
- public boolean allLines() {
- return this.lines == DEFAULT_LINES;
- }
-
- /**
- * Determines if any lines should be printed.
- *
- * @return true for any lines, false otherwise.
- */
- public boolean anyLines() {
- return this.lines > 0;
- }
-
- /**
- * Returns the minimum between the lines and the max lines.
- *
- * @param maxLines
- * The maximum number of lines.
- * @return The number of lines to print.
- */
- public int minLines(final int maxLines) {
- return this.lines > maxLines ? maxLines : this.lines;
- }
-
- /**
- * Determines if there are any packages to filter.
- *
- * @return true if there are packages, false otherwise.
- */
- public boolean hasPackages() {
- return this.ignorePackages != null && !this.ignorePackages.isEmpty();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- final StringBuilder s = new StringBuilder();
- s.append('{')
- .append(allLines() ? FULL : this.lines == 2 ? SHORT : anyLines() ? String.valueOf(this.lines) : NONE)
- .append('}');
- s.append("{separator(").append(this.separator).append(")}");
- if (hasPackages()) {
- s.append("{filters(");
- for (final String p : this.ignorePackages) {
- s.append(p).append(',');
- }
- s.deleteCharAt(s.length() - 1);
- s.append(")}");
- }
- return s.toString();
- }
-
- /**
- * Creates a new instance based on the array of options.
- *
- * @param options
- * The array of options.
- * @return A new initialized instance.
- */
- public static ThrowableFormatOptions newInstance(String[] options) {
- if (options == null || options.length == 0) {
- return DEFAULT;
- }
- // NOTE: The following code is present for backward compatibility
- // and was copied from Extended/RootThrowablePatternConverter.
- // This supports a single option with the format:
- // %xEx{["none"|"short"|"full"|depth],[filters(packages)}
- // However, the convention for multiple options should be:
- // %xEx{["none"|"short"|"full"|depth]}[{filters(packages)}]
- if (options.length == 1 && Strings.isNotEmpty(options[0])) {
- final String[] opts = options[0].split(Patterns.COMMA_SEPARATOR, 2);
- final String first = opts[0].trim();
- try (final Scanner scanner = new Scanner(first)) {
- if (opts.length > 1 && (first.equalsIgnoreCase(FULL) || first.equalsIgnoreCase(SHORT)
- || first.equalsIgnoreCase(NONE) || scanner.hasNextInt())) {
- options = new String[] { first, opts[1].trim() };
- }
- }
- }
-
- int lines = DEFAULT.lines;
- String separator = DEFAULT.separator;
- List<String> packages = DEFAULT.ignorePackages;
- TextRenderer ansiRenderer = DEFAULT.textRenderer;
- for (final String rawOption : options) {
- if (rawOption != null) {
- final String option = rawOption.trim();
- if (option.isEmpty()) {
- // continue;
- } else if (option.startsWith("separator(") && option.endsWith(")")) {
- separator = option.substring("separator(".length(), option.length() - 1);
- } else if (option.startsWith("filters(") && option.endsWith(")")) {
- final String filterStr = option.substring("filters(".length(), option.length() - 1);
- if (filterStr.length() > 0) {
- final String[] array = filterStr.split(Patterns.COMMA_SEPARATOR);
- if (array.length > 0) {
- packages = new ArrayList<>(array.length);
- for (String token : array) {
- token = token.trim();
- if (token.length() > 0) {
- packages.add(token);
- }
- }
- }
- }
- } else if (option.equalsIgnoreCase(NONE)) {
- lines = 0;
- } else if (option.equalsIgnoreCase(SHORT) || option.equalsIgnoreCase(CLASS_NAME)
- || option.equalsIgnoreCase(METHOD_NAME) || option.equalsIgnoreCase(LINE_NUMBER)
- || option.equalsIgnoreCase(FILE_NAME) || option.equalsIgnoreCase(MESSAGE)
- || option.equalsIgnoreCase(LOCALIZED_MESSAGE)) {
- lines = 2;
- } else if (option.startsWith("ansi(") && option.endsWith(")") || option.equals("ansi")) {
- if (Loader.isJansiAvailable()) {
- String styleMapStr = option.equals("ansi") ? Strings.EMPTY
- : option.substring("ansi(".length(), option.length() - 1);
- ansiRenderer = new JAnsiTextRenderer(new String[] { null, styleMapStr },
- JAnsiTextRenderer.DefaultExceptionStyleMap);
- } else {
- StatusLogger.getLogger().warn(
- "You requested ANSI exception rendering but JANSI is not on the classpath. Please see https://logging.apache.org/log4j/2.x/runtime-dependencies.html");
- }
- } else if (!option.equalsIgnoreCase(FULL)) {
- lines = Integer.parseInt(option);
- }
- }
- }
- return new ThrowableFormatOptions(lines, separator, packages, ansiRenderer);
- }
-
-}
+/*
+ * 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.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import org.apache.logging.log4j.core.pattern.JAnsiTextRenderer;
+import org.apache.logging.log4j.core.pattern.TextRenderer;
+import org.apache.logging.log4j.core.pattern.PlainTextRenderer;
+import org.apache.logging.log4j.core.util.Constants;
+import org.apache.logging.log4j.core.util.Loader;
+import org.apache.logging.log4j.core.util.Patterns;
+import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Contains options which control how a {@link Throwable} pattern is formatted.
+ */
+public final class ThrowableFormatOptions {
+
+ private static final int DEFAULT_LINES = Integer.MAX_VALUE;
+
+ /**
+ * Default instance of {@code ThrowableFormatOptions}.
+ */
+ protected static final ThrowableFormatOptions DEFAULT = new ThrowableFormatOptions();
+
+ /**
+ * Format the whole stack trace.
+ */
+ private static final String FULL = "full";
+
+ /**
+ * Do not format the exception.
+ */
+ private static final String NONE = "none";
+
+ /**
+ * Format only the first line of the throwable.
+ */
+ private static final String SHORT = "short";
+
+ /**
+ * ANSI renderer
+ */
+ private final TextRenderer textRenderer;
+
+ /**
+ * The number of lines to write.
+ */
+ private final int lines;
+
+ /**
+ * The stack trace separator.
+ */
+ private final String separator;
+
+ /**
+ * The list of packages to filter.
+ */
+ private final List<String> ignorePackages;
+
+ public static final String CLASS_NAME = "short.className";
+ public static final String METHOD_NAME = "short.methodName";
+ public static final String LINE_NUMBER = "short.lineNumber";
+ public static final String FILE_NAME = "short.fileName";
+ public static final String MESSAGE = "short.message";
+ public static final String LOCALIZED_MESSAGE = "short.localizedMessage";
+
+ /**
+ * Constructs the options for printing stack trace.
+ *
+ * @param lines
+ * The number of lines.
+ * @param separator
+ * The stack trace separator.
+ * @param ignorePackages
+ * The packages to filter.
+ * @param textRenderer
+ * The ANSI renderer
+ */
+ protected ThrowableFormatOptions(final int lines, final String separator, final List<String> ignorePackages,
+ final TextRenderer textRenderer) {
+ this.lines = lines;
+ this.separator = separator == null ? Constants.LINE_SEPARATOR : separator;
+ this.ignorePackages = ignorePackages;
+ this.textRenderer = textRenderer == null ? PlainTextRenderer.getInstance() : textRenderer;
+ }
+
+ /**
+ * Constructs the options for printing stack trace.
+ *
+ * @param packages
+ * The packages to filter.
+ */
+ protected ThrowableFormatOptions(final List<String> packages) {
+ this(DEFAULT_LINES, null, packages, null);
+ }
+
+ /**
+ * Constructs the options for printing stack trace.
+ */
+ protected ThrowableFormatOptions() {
+ this(DEFAULT_LINES, null, null, null);
+ }
+
+ /**
+ * Returns the number of lines to write.
+ *
+ * @return The number of lines to write.
+ */
+ public int getLines() {
+ return this.lines;
+ }
+
+ /**
+ * Returns the stack trace separator.
+ *
+ * @return The stack trace separator.
+ */
+ public String getSeparator() {
+ return this.separator;
+ }
+
+ /**
+ * Returns the message rendered.
+ *
+ * @return the message rendered.
+ */
+ public TextRenderer getTextRenderer() {
+ return textRenderer;
+ }
+
+ /**
+ * Returns the list of packages to ignore (filter out).
+ *
+ * @return The list of packages to ignore (filter out).
+ */
+ public List<String> getIgnorePackages() {
+ return this.ignorePackages;
+ }
+
+ /**
+ * Determines if all lines should be printed.
+ *
+ * @return true for all lines, false otherwise.
+ */
+ public boolean allLines() {
+ return this.lines == DEFAULT_LINES;
+ }
+
+ /**
+ * Determines if any lines should be printed.
+ *
+ * @return true for any lines, false otherwise.
+ */
+ public boolean anyLines() {
+ return this.lines > 0;
+ }
+
+ /**
+ * Returns the minimum between the lines and the max lines.
+ *
+ * @param maxLines
+ * The maximum number of lines.
+ * @return The number of lines to print.
+ */
+ public int minLines(final int maxLines) {
+ return this.lines > maxLines ? maxLines : this.lines;
+ }
+
+ /**
+ * Determines if there are any packages to filter.
+ *
+ * @return true if there are packages, false otherwise.
+ */
+ public boolean hasPackages() {
+ return this.ignorePackages != null && !this.ignorePackages.isEmpty();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ final StringBuilder s = new StringBuilder();
+ s.append('{')
+ .append(allLines() ? FULL : this.lines == 2 ? SHORT : anyLines() ? String.valueOf(this.lines) : NONE)
+ .append('}');
+ s.append("{separator(").append(this.separator).append(")}");
+ if (hasPackages()) {
+ s.append("{filters(");
+ for (final String p : this.ignorePackages) {
+ s.append(p).append(',');
+ }
+ s.deleteCharAt(s.length() - 1);
+ s.append(")}");
+ }
+ return s.toString();
+ }
+
+ /**
+ * Creates a new instance based on the array of options.
+ *
+ * @param options
+ * The array of options.
+ * @return A new initialized instance.
+ */
+ public static ThrowableFormatOptions newInstance(String[] options) {
+ if (options == null || options.length == 0) {
+ return DEFAULT;
+ }
+ // NOTE: The following code is present for backward compatibility
+ // and was copied from Extended/RootThrowablePatternConverter.
+ // This supports a single option with the format:
+ // %xEx{["none"|"short"|"full"|depth],[filters(packages)}
+ // However, the convention for multiple options should be:
+ // %xEx{["none"|"short"|"full"|depth]}[{filters(packages)}]
+ if (options.length == 1 && Strings.isNotEmpty(options[0])) {
+ final String[] opts = options[0].split(Patterns.COMMA_SEPARATOR, 2);
+ final String first = opts[0].trim();
+ try (final Scanner scanner = new Scanner(first)) {
+ if (opts.length > 1 && (first.equalsIgnoreCase(FULL) || first.equalsIgnoreCase(SHORT)
+ || first.equalsIgnoreCase(NONE) || scanner.hasNextInt())) {
+ options = new String[] { first, opts[1].trim() };
+ }
+ }
+ }
+
+ int lines = DEFAULT.lines;
+ String separator = DEFAULT.separator;
+ List<String> packages = DEFAULT.ignorePackages;
+ TextRenderer ansiRenderer = DEFAULT.textRenderer;
+ for (final String rawOption : options) {
+ if (rawOption != null) {
+ final String option = rawOption.trim();
+ if (option.isEmpty()) {
+ // continue;
+ } else if (option.startsWith("separator(") && option.endsWith(")")) {
+ separator = option.substring("separator(".length(), option.length() - 1);
+ } else if (option.startsWith("filters(") && option.endsWith(")")) {
+ final String filterStr = option.substring("filters(".length(), option.length() - 1);
+ if (filterStr.length() > 0) {
+ final String[] array = filterStr.split(Patterns.COMMA_SEPARATOR);
+ if (array.length > 0) {
+ packages = new ArrayList<>(array.length);
+ for (String token : array) {
+ token = token.trim();
+ if (token.length() > 0) {
+ packages.add(token);
+ }
+ }
+ }
+ }
+ } else if (option.equalsIgnoreCase(NONE)) {
+ lines = 0;
+ } else if (option.equalsIgnoreCase(SHORT) || option.equalsIgnoreCase(CLASS_NAME)
+ || option.equalsIgnoreCase(METHOD_NAME) || option.equalsIgnoreCase(LINE_NUMBER)
+ || option.equalsIgnoreCase(FILE_NAME) || option.equalsIgnoreCase(MESSAGE)
+ || option.equalsIgnoreCase(LOCALIZED_MESSAGE)) {
+ lines = 2;
+ } else if (option.startsWith("ansi(") && option.endsWith(")") || option.equals("ansi")) {
+ if (Loader.isJansiAvailable()) {
+ String styleMapStr = option.equals("ansi") ? Strings.EMPTY
+ : option.substring("ansi(".length(), option.length() - 1);
+ ansiRenderer = new JAnsiTextRenderer(new String[] { null, styleMapStr },
+ JAnsiTextRenderer.DefaultExceptionStyleMap);
+ } else {
+ StatusLogger.getLogger().warn(
+ "You requested ANSI exception rendering but JANSI is not on the classpath. Please see https://logging.apache.org/log4j/2.x/runtime-dependencies.html");
+ }
+ } else if (!option.equalsIgnoreCase(FULL)) {
+ lines = Integer.parseInt(option);
+ }
+ }
+ }
+ return new ThrowableFormatOptions(lines, separator, packages, ansiRenderer);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index f114c01..5cd73bc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -212,12 +212,12 @@ public class ThrowableProxy implements Serializable {
}
private void formatCause(final StringBuilder sb, final String prefix, final ThrowableProxy cause,
- final List<String> ignorePackages, TextRenderer textRenderer) {
+ final List<String> ignorePackages, final TextRenderer textRenderer) {
formatThrowableProxy(sb, prefix, CAUSED_BY_LABEL, cause, ignorePackages, textRenderer);
}
private void formatThrowableProxy(final StringBuilder sb, final String prefix, final String causeLabel,
- final ThrowableProxy throwableProxy, final List<String> ignorePackages, TextRenderer textRenderer) {
+ final ThrowableProxy throwableProxy, final List<String> ignorePackages, final TextRenderer textRenderer) {
if (throwableProxy == null) {
return;
}
@@ -231,7 +231,7 @@ public class ThrowableProxy implements Serializable {
this.formatCause(sb, prefix, throwableProxy.causeProxy, ignorePackages, textRenderer);
}
- void renderOn(StringBuilder output, TextRenderer textRenderer) {
+ void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
final String msg = this.message;
textRenderer.render(this.name, output, "Name");
if (msg != null) {
@@ -241,7 +241,7 @@ public class ThrowableProxy implements Serializable {
}
private void formatSuppressed(final StringBuilder sb, final String prefix, final ThrowableProxy[] suppressedProxies,
- final List<String> ignorePackages, TextRenderer textRenderer) {
+ final List<String> ignorePackages, final TextRenderer textRenderer) {
if (suppressedProxies == null) {
return;
}
@@ -252,7 +252,7 @@ public class ThrowableProxy implements Serializable {
private void formatElements(final StringBuilder sb, final String prefix, final int commonCount,
final StackTraceElement[] causedTrace, final ExtendedStackTraceElement[] extStackTrace,
- final List<String> ignorePackages, TextRenderer textRenderer) {
+ final List<String> ignorePackages, final TextRenderer textRenderer) {
if (ignorePackages == null || ignorePackages.isEmpty()) {
for (final ExtendedStackTraceElement element : extStackTrace) {
this.formatEntry(element, sb, prefix, textRenderer);
@@ -283,7 +283,7 @@ public class ThrowableProxy implements Serializable {
}
}
- private void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count, TextRenderer textRenderer) {
+ private void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count, final TextRenderer textRenderer) {
textRenderer.render(prefix, sb, "Prefix");
if (count == 1) {
textRenderer.render("\t... ", sb, "Suppressed");
@@ -295,7 +295,7 @@ public class ThrowableProxy implements Serializable {
textRenderer.render(EOL_STR, sb, "Text");
}
- private void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, final String prefix, TextRenderer textRenderer) {
+ private void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, final String prefix, final TextRenderer textRenderer) {
textRenderer.render(prefix, sb, "Prefix");
textRenderer.render("\tat ", sb, "At");
extStackTraceElement.renderOn(sb, textRenderer);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
index 56e17dc..844c614 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
@@ -95,7 +95,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
private final Layout<? extends Serializable> layout;
private final int bufferSize;
- public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, int bufferSize) {
+ public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, final int bufferSize) {
this.host = host;
this.port = port;
this.layout = layout;