You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/10/30 16:53:31 UTC
[04/13] logging-log4j2 git commit: Use final.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
index 8af33e7..c259fc2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
@@ -69,7 +69,7 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen
private int threadPriority;
private long threadId;
- private MutableInstant instant = new MutableInstant();
+ private final MutableInstant instant = new MutableInstant();
private long nanoTime;
private short parameterCount;
private boolean includeLocation;
@@ -281,7 +281,7 @@ public class RingBufferLogEvent implements LogEvent, ReusableMessage, CharSequen
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
if (parameters != null) {
for (short i = 0; i < parameterCount; i++) {
action.accept(parameters[i], i, state);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 1022f2d..97cebe0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -442,7 +442,7 @@ public class LoggerConfig extends AbstractFilterable {
return reliabilityStrategy;
}
- private void processLogEvent(final LogEvent event, LoggerConfigPredicate predicate) {
+ private void processLogEvent(final LogEvent event, final LoggerConfigPredicate predicate) {
event.setIncludeLocation(isIncludeLocation());
if (predicate.allow(this)) {
callAppenders(event);
@@ -598,19 +598,19 @@ public class LoggerConfig extends AbstractFilterable {
protected enum LoggerConfigPredicate {
ALL() {
@Override
- boolean allow(LoggerConfig config) {
+ boolean allow(final LoggerConfig config) {
return true;
}
},
ASYNCHRONOUS_ONLY() {
@Override
- boolean allow(LoggerConfig config) {
+ boolean allow(final LoggerConfig config) {
return config instanceof AsyncLoggerConfig;
}
},
SYNCHRONOUS_ONLY() {
@Override
- boolean allow(LoggerConfig config) {
+ boolean allow(final LoggerConfig config) {
return !ASYNCHRONOUS_ONLY.allow(config);
}
};
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 27d8710..b41b8e4 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
@@ -356,12 +356,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name) {
+ public LoggerComponentBuilder newAsyncLogger(final String name) {
return new DefaultLoggerComponentBuilder(this, name, null, "AsyncLogger");
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, boolean includeLocation) {
+ public LoggerComponentBuilder newAsyncLogger(final String name, final boolean includeLocation) {
return new DefaultLoggerComponentBuilder(this, name, null, "AsyncLogger", includeLocation);
}
@@ -391,7 +391,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(boolean includeLocation) {
+ public RootLoggerComponentBuilder newAsyncRootLogger(final boolean includeLocation) {
return new DefaultRootLoggerComponentBuilder(this, null, "AsyncRoot", includeLocation);
}
@@ -464,12 +464,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public LoggerComponentBuilder newLogger(String name) {
+ public LoggerComponentBuilder newLogger(final String name) {
return new DefaultLoggerComponentBuilder(this, name, null);
}
@Override
- public LoggerComponentBuilder newLogger(String name, boolean includeLocation) {
+ public LoggerComponentBuilder newLogger(final String name, final boolean includeLocation) {
return new DefaultLoggerComponentBuilder(this, name, null, includeLocation);
}
@@ -499,7 +499,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public RootLoggerComponentBuilder newRootLogger(boolean includeLocation) {
+ public RootLoggerComponentBuilder newRootLogger(final boolean includeLocation) {
return new DefaultRootLoggerComponentBuilder(this, null, includeLocation);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 4c61d33..5024a21 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
@@ -64,7 +64,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
return asBuilder();
}
- public B setPropertyArray(Property[] properties) {
+ public B setPropertyArray(final Property[] properties) {
this.propertyArray = properties;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
index 70b548d..a7a7aaa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
@@ -117,7 +117,7 @@ public class ContextDataFactory {
public static StringMap createContextData(final Map<String, String> context) {
final StringMap contextData = createContextData(context.size());
- for (Entry<String, String> entry : context.entrySet()) {
+ for (final Entry<String, String> entry : context.entrySet()) {
contextData.putValue(entry.getKey(), entry.getValue());
}
return contextData;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index 6ee9e1c..017a690 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -85,7 +85,7 @@ public class Log4jLogEvent implements LogEvent {
private String loggerName;
private Message message;
private Throwable thrown;
- private MutableInstant instant = new MutableInstant();
+ private final MutableInstant instant = new MutableInstant();
private ThrowableProxy thrownProxy;
private StringMap contextData = createContextData((List<Property>) null);
private ThreadContext.ContextStack contextStack = ThreadContext.getImmutableStack();
@@ -417,7 +417,7 @@ public class Log4jLogEvent implements LogEvent {
final String threadName, final int threadPriority, final StackTraceElement source,
final long timestampMillis, final int nanoOfMillisecond, final long nanoTime) {
this(loggerName, marker, loggerFQCN, level, message, thrown, thrownProxy, contextData, contextStack, threadId, threadName, threadPriority, source, nanoTime);
- long millis = message instanceof TimestampMessage
+ final long millis = message instanceof TimestampMessage
? ((TimestampMessage) message).getTimestamp()
: timestampMillis;
instant.initFromEpochMilli(millis, nanoOfMillisecond);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
index c867ce4..3cfcb3d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoMessage.java
@@ -36,7 +36,7 @@ public final class MementoMessage implements Message, StringBuilderFormattable {
private final String format;
private final Object[] parameters;
- public MementoMessage(String formattedMessage, String format, Object[] parameters) {
+ public MementoMessage(final String formattedMessage, final String format, final Object[] parameters) {
this.formattedMessage = formattedMessage;
this.format = format;
this.parameters = parameters;
@@ -68,7 +68,7 @@ public final class MementoMessage implements Message, StringBuilderFormattable {
}
@Override
- public void formatTo(StringBuilder buffer) {
+ public void formatTo(final StringBuilder buffer) {
buffer.append(formattedMessage);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 3e0d388..7b8f671 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
@@ -45,7 +45,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi
private int threadPriority;
private long threadId;
- private MutableInstant instant = new MutableInstant();
+ private final MutableInstant instant = new MutableInstant();
private long nanoTime;
private short parameterCount;
private boolean includeLocation;
@@ -256,7 +256,7 @@ public class MutableLogEvent implements LogEvent, ReusableMessage, ParameterVisi
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final S state) {
if (parameters != null) {
for (short i = 0; i < parameterCount; i++) {
action.accept(parameters[i], i, state);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
index dd5cf62..9f4cc17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
@@ -98,7 +98,7 @@ public class ReusableLogEventFactory implements LogEventFactory {
*/
public static void release(final LogEvent logEvent) { // LOG4J2-1583
if (logEvent instanceof MutableLogEvent) {
- MutableLogEvent mutableLogEvent = (MutableLogEvent) logEvent;
+ final MutableLogEvent mutableLogEvent = (MutableLogEvent) logEvent;
mutableLogEvent.clear();
mutableLogEvent.reserved = false;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 c948a0c..1c043af 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
@@ -298,7 +298,7 @@ public class ThrowableProxy implements Serializable {
*
* @param value New value of commonElementCount.
*/
- void setCommonElementCount(int value) {
+ void setCommonElementCount(final int value) {
this.commonElementCount = value;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
index d86d2bb..f13943a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java
@@ -53,13 +53,13 @@ class ThrowableProxyRenderer {
}
private static void formatCause(final StringBuilder sb, final String prefix, final ThrowableProxy cause,
- final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
formatThrowableProxy(sb, prefix, CAUSED_BY_LABEL, cause, ignorePackages, textRenderer, suffix, lineSeparator);
}
private static void formatThrowableProxy(final StringBuilder sb, final String prefix, final String causeLabel,
final ThrowableProxy throwableProxy, final List<String> ignorePackages,
- final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
if (throwableProxy == null) {
return;
}
@@ -75,7 +75,7 @@ class ThrowableProxyRenderer {
}
private static void formatSuppressed(final StringBuilder sb, final String prefix, final ThrowableProxy[] suppressedProxies,
- final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
if (suppressedProxies == null) {
return;
}
@@ -86,7 +86,7 @@ class ThrowableProxyRenderer {
private static void formatElements(final StringBuilder sb, final String prefix, final int commonCount,
final StackTraceElement[] causedTrace, final ExtendedStackTraceElement[] extStackTrace,
- final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
if (ignorePackages == null || ignorePackages.isEmpty()) {
for (final ExtendedStackTraceElement element : extStackTrace) {
formatEntry(element, sb, prefix, textRenderer, suffix, lineSeparator);
@@ -126,7 +126,7 @@ class ThrowableProxyRenderer {
}
private static void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count,
- final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(prefix, sb, "Prefix");
if (count == 1) {
textRenderer.render("\t... ", sb, "Suppressed");
@@ -140,7 +140,7 @@ class ThrowableProxyRenderer {
}
private static void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb,
- final String prefix, final TextRenderer textRenderer, final String suffix, String lineSeparator) {
+ final String prefix, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(prefix, sb, "Prefix");
textRenderer.render("\tat ", sb, "At");
extStackTraceElement.renderOn(sb, textRenderer);
@@ -170,7 +170,7 @@ class ThrowableProxyRenderer {
* @param suffix Append this to the end of each stack frame.
* @param lineSeparator The end-of-line separator.
*/
- static void formatExtendedStackTraceTo(ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
+ static void formatExtendedStackTraceTo(final ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(src.getName(), sb, "Name");
textRenderer.render(": ", sb, "NameMessageSeparator");
textRenderer.render(src.getMessage(), sb, "Message");
@@ -193,7 +193,7 @@ class ThrowableProxyRenderer {
* @param lineSeparator The end-of-line separator.
*/
static void formatCauseStackTrace(final ThrowableProxy src, final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
- ThrowableProxy causeProxy = src.getCauseProxy();
+ final ThrowableProxy causeProxy = src.getCauseProxy();
if (causeProxy != null) {
formatWrapper(sb, causeProxy, ignorePackages, textRenderer, suffix, lineSeparator);
sb.append(WRAPPED_BY_LABEL);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
index d764d55..2e6f652 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
@@ -177,7 +177,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
*
* @return this builder
*/
- public B setAdditionalFields(KeyValuePair[] additionalFields) {
+ public B setAdditionalFields(final KeyValuePair[] additionalFields) {
this.additionalFields = additionalFields;
return asBuilder();
}
@@ -231,7 +231,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
final ResolvableKeyValuePair[] resolvableFields = new ResolvableKeyValuePair[additionalFields.length];
for (int i = 0; i < additionalFields.length; i++) {
- ResolvableKeyValuePair resolvable = resolvableFields[i] = new ResolvableKeyValuePair(additionalFields[i]);
+ final ResolvableKeyValuePair resolvable = resolvableFields[i] = new ResolvableKeyValuePair(additionalFields[i]);
// Validate
if (config == null && resolvable.valueNeedsLookup) {
@@ -271,7 +271,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
protected Object wrapLogEvent(final LogEvent event) {
if (additionalFields.length > 0) {
// Construct map for serialization - note that we are intentionally using original LogEvent
- Map<String, String> additionalFieldsMap = resolveAdditionalFields(event);
+ final Map<String, String> additionalFieldsMap = resolveAdditionalFields(event);
// This class combines LogEvent with AdditionalFields during serialization
return new LogEventWithAdditionalFields(event, additionalFieldsMap);
} else {
@@ -280,13 +280,13 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
}
}
- private Map<String, String> resolveAdditionalFields(LogEvent logEvent) {
+ private Map<String, String> resolveAdditionalFields(final LogEvent logEvent) {
// Note: LinkedHashMap retains order
final Map<String, String> additionalFieldsMap = new LinkedHashMap<>(additionalFields.length);
final StrSubstitutor strSubstitutor = configuration.getStrSubstitutor();
// Go over each field
- for (ResolvableKeyValuePair pair : additionalFields) {
+ for (final ResolvableKeyValuePair pair : additionalFields) {
if (pair.valueNeedsLookup) {
// Resolve value
additionalFieldsMap.put(pair.key, strSubstitutor.replace(logEvent, pair.value));
@@ -316,7 +316,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
private final Object logEvent;
private final Map<String, String> additionalFields;
- public LogEventWithAdditionalFields(Object logEvent, Map<String, String> additionalFields) {
+ public LogEventWithAdditionalFields(final Object logEvent, final Map<String, String> additionalFields) {
this.logEvent = logEvent;
this.additionalFields = additionalFields;
}
@@ -339,7 +339,7 @@ abstract class AbstractJacksonLayout extends AbstractStringLayout {
final String value;
final boolean valueNeedsLookup;
- ResolvableKeyValuePair(KeyValuePair pair) {
+ ResolvableKeyValuePair(final KeyValuePair pair) {
this.key = pair.getKey();
this.value = pair.getValue();
this.valueNeedsLookup = AbstractJacksonLayout.valueNeedsLookup(this.value);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 607ec43..fbbd597 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -126,7 +126,7 @@ public final class JsonLayout extends AbstractJacksonLayout {
}
@Override
- public B setAdditionalFields(KeyValuePair[] additionalFields) {
+ public B setAdditionalFields(final KeyValuePair[] additionalFields) {
this.additionalFields = additionalFields;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 57cbb9c..15e176e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -551,9 +551,9 @@ public final class PatternLayout extends AbstractStringLayout {
}
private boolean useAnsiEscapeCodes() {
- PropertiesUtil propertiesUtil = PropertiesUtil.getProperties();
- boolean isPlatformSupportsAnsi = !propertiesUtil.isOsWindows();
- boolean isJansiRequested = !propertiesUtil.getBooleanProperty("log4j.skipJansi", true);
+ final PropertiesUtil propertiesUtil = PropertiesUtil.getProperties();
+ final boolean isPlatformSupportsAnsi = !propertiesUtil.isOsWindows();
+ final boolean isJansiRequested = !propertiesUtil.getBooleanProperty("log4j.skipJansi", true);
return isPlatformSupportsAnsi || isJansiRequested;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
index bd5fb95..f019e84 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
@@ -391,7 +391,7 @@ public final class Rfc5424Layout extends AbstractStringLayout {
if (isStructured) {
if (message instanceof MessageCollectionMessage) {
- for (StructuredDataMessage data : ((StructuredDataCollectionMessage)message)) {
+ for (final StructuredDataMessage data : ((StructuredDataCollectionMessage)message)) {
addStructuredData(sdElements, data);
}
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index 2a4593d..f01719e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -158,7 +158,7 @@ public class SslSocketManager extends TcpSocketManager {
private static class SslSocketManagerFactory extends TcpSocketManagerFactory<SslSocketManager, SslFactoryData> {
@Override
- SslSocketManager createManager(final String name, OutputStream os, Socket socket, InetAddress inetAddress,
+ SslSocketManager createManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress,
final SslFactoryData data) {
return new SslSocketManager(name, os, socket, data.sslConfiguration, inetAddress, data.host, data.port,
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout, data.bufferSize,
@@ -172,8 +172,8 @@ public class SslSocketManager extends TcpSocketManager {
}
}
- static Socket createSocket(final String host, int port, int connectTimeoutMillis,
- final SslConfiguration sslConfiguration, SocketOptions socketOptions) throws IOException {
+ static Socket createSocket(final String host, final int port, final int connectTimeoutMillis,
+ final SslConfiguration sslConfiguration, final SocketOptions socketOptions) throws IOException {
final SSLSocketFactory socketFactory = createSslSocketFactory(sslConfiguration);
final SSLSocket socket = (SSLSocket) socketFactory.createSocket();
if (socketOptions != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/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 f5b971d..4988202 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
@@ -221,7 +221,7 @@ public class TcpSocketManager extends AbstractSocketManager {
reconnector = createReconnector();
try {
reconnector.reconnect();
- } catch (IOException reconnEx) {
+ } catch (final IOException reconnEx) {
LOGGER.debug("Cannot reestablish socket connection to {}: {}; starting reconnector thread {}",
config, reconnEx.getLocalizedMessage(), reconnector.getName(), reconnEx);
reconnector.start();
@@ -230,7 +230,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
try {
writeAndFlush(bytes, offset, length, immediateFlush);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new AppenderLoggingException(
String.format("Error writing to %s after reestablishing connection for %s", getName(),
config),
@@ -460,7 +460,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
@SuppressWarnings("unchecked")
- M createManager(final String name, OutputStream os, Socket socket, InetAddress inetAddress, final T data) {
+ M createManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress, final T data) {
return (M) new TcpSocketManager(name, os, socket, inetAddress, data.host, data.port,
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout,
data.bufferSize, data.socketOptions);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
index 5855026..27ab29d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
@@ -70,7 +70,7 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
}
try (final InputStream fin = openInputStream(loadLocation)) {
final KeyStore ks = KeyStore.getInstance(this.keyStoreType);
- char[] password = this.getPasswordAsCharArray();
+ final char[] password = this.getPasswordAsCharArray();
try {
ks.load(fin, password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
index d60f82c..da16622 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
@@ -49,7 +49,7 @@ class EnvironmentPasswordProvider implements PasswordProvider {
@Override
public char[] getPassword() {
- String password = System.getenv(passwordEnvironmentVariable);
+ final String password = System.getenv(passwordEnvironmentVariable);
return password == null ? null : password.toCharArray();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
index ff59b00..355a781 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
@@ -65,14 +65,14 @@ class FilePasswordProvider implements PasswordProvider {
byte[] bytes = null;
try {
bytes = Files.readAllBytes(passwordPath);
- ByteBuffer bb = ByteBuffer.wrap(bytes);
- CharBuffer decoded = Charset.defaultCharset().decode(bb);
- char[] result = new char[decoded.limit()];
+ final ByteBuffer bb = ByteBuffer.wrap(bytes);
+ final CharBuffer decoded = Charset.defaultCharset().decode(bb);
+ final char[] result = new char[decoded.limit()];
decoded.get(result, 0, result.length);
decoded.rewind();
decoded.put(new char[result.length]); // erase decoded CharBuffer
return result;
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new IllegalStateException("Could not read password from " + passwordPath + ": " + e, e);
} finally {
if (bytes != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index 0c9e3ce..ff479be 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -107,7 +107,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
}
try {
// @formatter:off
- PasswordProvider provider = passwordFile != null
+ final PasswordProvider provider = passwordFile != null
? new FilePasswordProvider(passwordFile)
: passwordEnvironmentVariable != null
? new EnvironmentPasswordProvider(passwordEnvironmentVariable)
@@ -118,7 +118,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
Arrays.fill(password, '\0');
}
return new KeyStoreConfiguration(location, provider, keyStoreType, keyManagerFactoryAlgorithm);
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new StoreConfigurationException("Could not configure KeyStore", ex);
}
}
@@ -166,7 +166,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
public KeyManagerFactory initKeyManagerFactory() throws NoSuchAlgorithmException, UnrecoverableKeyException,
KeyStoreException {
final KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(this.keyManagerFactoryAlgorithm);
- char[] password = this.getPasswordAsCharArray();
+ final char[] password = this.getPasswordAsCharArray();
try {
kmFactory.init(this.getKeyStore(), password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
index 793e6df..f635145 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
@@ -30,7 +30,7 @@ public class StoreConfigurationException extends Exception {
super(message);
}
- public StoreConfigurationException(String message, Exception e) {
+ public StoreConfigurationException(final String message, final Exception e) {
super(message, e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index b5c282b..08ddc69 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -96,7 +96,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
}
try {
// @formatter:off
- PasswordProvider provider = passwordFile != null
+ final PasswordProvider provider = passwordFile != null
? new FilePasswordProvider(passwordFile)
: passwordEnvironmentVariable != null
? new EnvironmentPasswordProvider(passwordEnvironmentVariable)
@@ -107,7 +107,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
Arrays.fill(password, '\0');
}
return new TrustStoreConfiguration(location, provider, keyStoreType, trustManagerFactoryAlgorithm);
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new StoreConfigurationException("Could not configure TrustStore", ex);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
index 9bc85ca..703786b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
@@ -184,7 +184,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
cachedTime = new AtomicReference<>(fromEpochMillis(System.currentTimeMillis()));
}
- private CachedTime fromEpochMillis(long epochMillis) {
+ private CachedTime fromEpochMillis(final long epochMillis) {
final MutableInstant temp = new MutableInstant();
temp.initFromEpochMilli(epochMillis, 0);
return new CachedTime(temp);
@@ -266,7 +266,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
public void format(final long epochMilli, final StringBuilder output) {
- MutableInstant instant = getMutableInstant();
+ final MutableInstant instant = getMutableInstant();
instant.initFromEpochMilli(epochMilli, 0);
format(instant, output);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
index c4b9703..330da9f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
@@ -252,7 +252,7 @@ public final class HighlightConverter extends LogEventPatternConverter implement
}
}
- String getLevelStyle(Level level) {
+ String getLevelStyle(final Level level) {
return levelStyles.get(level);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
index 91c11ec..f603b05 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
@@ -276,7 +276,7 @@ public final class PatternParser {
final int begin = i; // position of first real char
int depth = 1; // already inside one level
while (depth > 0 && i < pattern.length()) {
- char c = pattern.charAt(i);
+ final char c = pattern.charAt(i);
if (c == '{') {
depth++;
} else if (c == '}') {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
index d182dc0..847c931 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
@@ -32,7 +32,7 @@ public final class ProcessIdPatternConverter extends LogEventPatternConverter {
private ProcessIdPatternConverter(final String... options) {
super("Process ID", "pid");
final String defaultValue = options.length > 0 ? options[0] : DEFAULT_DEFAULT_VALUE;
- String discoveredPid = ProcessIdUtil.getProcessId();
+ final String discoveredPid = ProcessIdUtil.getProcessId();
pid = discoveredPid.equals(ProcessIdUtil.DEFAULT_PROCESSID) ? defaultValue : discoveredPid;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de97a11d/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
index 2e49a96..0c7f451 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
@@ -54,14 +54,14 @@ public class MutableInstant implements Instant, Serializable {
@Override
public long getEpochMillisecond() {
final int millis = nanoOfSecond / NANOS_PER_MILLI;
- long epochMillisecond = epochSecond * MILLIS_PER_SECOND + millis;
+ final long epochMillisecond = epochSecond * MILLIS_PER_SECOND + millis;
return epochMillisecond;
}
@Override
public int getNanoOfMillisecond() {
final int millis = nanoOfSecond / NANOS_PER_MILLI;
- int nanoOfMillisecond = nanoOfSecond - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
+ final int nanoOfMillisecond = nanoOfSecond - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
return nanoOfMillisecond;
}
@@ -121,7 +121,7 @@ public class MutableInstant implements Instant, Serializable {
* the second element is the number of nanoseconds, later along the time-line, from the start of the millisecond
*/
public static void instantToMillisAndNanos(final long epochSecond, final int nano, final long[] result) {
- int millis = nano / NANOS_PER_MILLI;
+ final int millis = nano / NANOS_PER_MILLI;
result[0] = epochSecond * MILLIS_PER_SECOND + millis;
result[1] = nano - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
}
@@ -134,7 +134,7 @@ public class MutableInstant implements Instant, Serializable {
if (!(object instanceof MutableInstant)) {
return false;
}
- MutableInstant other = (MutableInstant) object;
+ final MutableInstant other = (MutableInstant) object;
return epochSecond == other.epochSecond && nanoOfSecond == other.nanoOfSecond;
}