This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 1a80f15 Add missing "final" modifiers. (#499)
1a80f15 is described below
commit 1a80f155da082d0323b94a4bec28277523e1f242
Author: Arturo Bernal <[email protected]>
AuthorDate: Tue Jun 1 09:25:39 2021 +0200
Add missing "final" modifiers. (#499)
---
.../java/org/apache/logging/log4j/LogBuilder.java | 46 +++++++++---------
.../java/org/apache/logging/log4j/LogManager.java | 2 +-
.../main/java/org/apache/logging/log4j/Logger.java | 6 +--
.../org/apache/logging/log4j/ThreadContext.java | 4 +-
.../logging/log4j/internal/DefaultLogBuilder.java | 54 +++++++++++-----------
.../log4j/internal/DefaultObjectInputFilter.java | 10 ++--
.../logging/log4j/internal/LogManagerStatus.java | 2 +-
.../apache/logging/log4j/message/MapMessage.java | 4 +-
.../logging/log4j/message/MessageFactory.java | 34 +++++++-------
.../logging/log4j/message/ParameterFormatter.java | 6 +--
.../log4j/message/ReusableObjectMessage.java | 4 +-
.../message/ReusableParameterizedMessage.java | 4 +-
.../log4j/message/ReusableSimpleMessage.java | 2 +-
.../message/StructuredDataCollectionMessage.java | 28 +++++------
.../logging/log4j/message/StructuredDataId.java | 6 +--
.../log4j/message/StructuredDataMessage.java | 6 +--
.../logging/log4j/message/ThreadDumpMessage.java | 2 +-
.../apache/logging/log4j/simple/SimpleLogger.java | 4 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 20 ++++----
.../logging/log4j/spi/AbstractLoggerAdapter.java | 2 +-
.../CopyOnWriteSortedArrayThreadContextMap.java | 2 +-
.../logging/log4j/spi/DefaultThreadContextMap.java | 6 +--
.../apache/logging/log4j/spi/LoggerContext.java | 14 +++---
.../logging/log4j/spi/LoggerContextFactory.java | 6 +--
.../org/apache/logging/log4j/spi/Provider.java | 4 +-
.../apache/logging/log4j/status/StatusData.java | 2 +-
.../org/apache/logging/log4j/util/Constants.java | 2 +-
.../log4j/util/FilteredObjectInputStream.java | 4 +-
.../org/apache/logging/log4j/util/LoaderUtil.java | 14 +++---
.../apache/logging/log4j/util/ProcessIdUtil.java | 2 +-
.../apache/logging/log4j/util/PropertiesUtil.java | 40 ++++++++--------
.../log4j/util/PropertyFilePropertySource.java | 2 +-
.../apache/logging/log4j/util/PropertySource.java | 10 ++--
.../apache/logging/log4j/util/ProviderUtil.java | 4 +-
.../logging/log4j/util/SortedArrayStringMap.java | 20 ++++----
.../apache/logging/log4j/util/StackLocator.java | 4 +-
.../logging/log4j/util/StackLocatorUtil.java | 2 +-
.../apache/logging/log4j/util/StringBuilders.java | 6 +--
.../org/apache/logging/log4j/util/Strings.java | 8 ++--
.../log4j/util/SystemPropertiesPropertySource.java | 2 +-
.../java/org/apache/logging/log4j/util/Timer.java | 2 +-
41 files changed, 200 insertions(+), 202 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
index d62ef25..e5aa572 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
@@ -33,7 +33,7 @@ public interface LogBuilder {
* @param marker The Marker to log.
* @return The LogBuilder.
*/
- default LogBuilder withMarker(Marker marker) {
+ default LogBuilder withMarker(final Marker marker) {
return this;
}
@@ -42,7 +42,7 @@ public interface LogBuilder {
* @param throwable The Throwable to log.
* @return the LogBuilder.
*/
- default LogBuilder withThrowable(Throwable throwable) {
+ default LogBuilder withThrowable(final Throwable throwable) {
return this;
}
@@ -60,7 +60,7 @@ public interface LogBuilder {
* @param location The stack trace element to include in the log event.
* @return The LogBuilder.
*/
- default LogBuilder withLocation(StackTraceElement location) {
+ default LogBuilder withLocation(final StackTraceElement location) {
return this;
}
@@ -68,14 +68,14 @@ public interface LogBuilder {
* Causes all the data collected to be logged along with the message.
Interface default method does nothing.
* @param message The message to log.
*/
- default void log(CharSequence message) {
+ default void log(final CharSequence message) {
}
/**
* Causes all the data collected to be logged along with the message.
Interface default method does nothing.
* @param message The message to log.
*/
- default void log(String message) {
+ default void log(final String message) {
}
/**
@@ -86,7 +86,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object... params) {
+ default void log(final String message, final Object... params) {
}
/**
@@ -95,28 +95,28 @@ public interface LogBuilder {
* @param message The message.
* @param params Parameters to the message.
*/
- default void log(String message, Supplier<?>... params) {
+ default void log(final String message, final Supplier<?>... params) {
}
/**
* Causes all the data collected to be logged along with the message.
Interface default method does nothing.
* @param message The message to log.
*/
- default void log(Message message) {
+ default void log(final Message message) {
}
/**
* Causes all the data collected to be logged along with the message.
Interface default method does nothing.
* @param messageSupplier The supplier of the message to log.
*/
- default void log(Supplier<Message> messageSupplier) {
+ default void log(final Supplier<Message> messageSupplier) {
}
/**
* Causes all the data collected to be logged along with the message.
Interface default method does nothing.
* @param message The message to log.
*/
- default void log(Object message) {
+ default void log(final Object message) {
}
/**
@@ -127,7 +127,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0) {
+ default void log(final String message, final Object p0) {
}
/**
@@ -139,7 +139,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1) {
+ default void log(final String message, final Object p0, final Object p1) {
}
/**
@@ -152,7 +152,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2) {
}
/**
@@ -166,7 +166,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3) {
}
/**
@@ -181,7 +181,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4) {
}
/**
@@ -197,7 +197,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5) {
}
/**
@@ -214,7 +214,7 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6) {
}
/**
@@ -232,8 +232,8 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6,
- Object p7) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6,
+ final Object p7) {
}
/**
@@ -252,8 +252,8 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6,
- Object p7, Object p8) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6,
+ final Object p7, final Object p8) {
}
/**
@@ -273,8 +273,8 @@ public interface LogBuilder {
*
* @see org.apache.logging.log4j.util.Unbox
*/
- default void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6,
- Object p7, Object p8, Object p9) {
+ default void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6,
+ final Object p7, final Object p8, final Object p9) {
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index 69ddb30..a3ee536 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -351,7 +351,7 @@ public class LogManager {
* @return a LoggerContext.
*/
protected static LoggerContext getContext(final String fqcn, final
ClassLoader loader,
- final boolean currentContext,
URI configLocation, String name) {
+ final boolean currentContext,
final URI configLocation, final String name) {
try {
return factory.getContext(fqcn, loader, null, currentContext,
configLocation, name);
} catch (final IllegalStateException ex) {
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
index aa0a4f8..0868363 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java
@@ -4208,8 +4208,8 @@ public interface Logger {
* @param throwable the exception to log, including its stack trace.
* @since 2.13.0
*/
- default void logMessage(Level level, Marker marker, String fqcn,
StackTraceElement location, Message message,
- Throwable throwable) {
+ default void logMessage(final Level level, final Marker marker, final
String fqcn, final StackTraceElement location, final Message message,
+ final Throwable throwable) {
}
@@ -4275,7 +4275,7 @@ public interface Logger {
* @return a LogBuilder.
* @since 2.13.0
*/
- default LogBuilder atLevel(Level level) {
+ default LogBuilder atLevel(final Level level) {
return LogBuilder.NOOP;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
b/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
index d643cd9..3394007 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
@@ -213,9 +213,9 @@ public final class ThreadContext {
ThreadContextMapFactory.init();
contextMap = null;
final PropertiesUtil managerProps = PropertiesUtil.getProperties();
- boolean disableAll = managerProps.getBooleanProperty(DISABLE_ALL);
+ final boolean disableAll =
managerProps.getBooleanProperty(DISABLE_ALL);
useStack = !(managerProps.getBooleanProperty(DISABLE_STACK) ||
disableAll);
- boolean useMap = !(managerProps.getBooleanProperty(DISABLE_MAP) ||
disableAll);
+ final boolean useMap = !(managerProps.getBooleanProperty(DISABLE_MAP)
|| disableAll);
contextStack = new DefaultThreadContextStack(useStack);
if (!useMap) {
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
index f4243ac..5f67261 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java
@@ -46,14 +46,14 @@ public class DefaultLogBuilder implements LogBuilder {
private volatile boolean inUse;
private final long threadId;
- public DefaultLogBuilder(Logger logger, Level level) {
+ public DefaultLogBuilder(final Logger logger, final Level level) {
this.logger = logger;
this.level = level;
this.threadId = Thread.currentThread().getId();
this.inUse = true;
}
- public DefaultLogBuilder(Logger logger) {
+ public DefaultLogBuilder(final Logger logger) {
this.logger = logger;
this.inUse = false;
this.threadId = Thread.currentThread().getId();
@@ -64,7 +64,7 @@ public class DefaultLogBuilder implements LogBuilder {
* @param level The logging level for this event.
* @return This LogBuilder instance.
*/
- public LogBuilder reset(Level level) {
+ public LogBuilder reset(final Level level) {
this.inUse = true;
this.level = level;
this.marker = null;
@@ -73,12 +73,12 @@ public class DefaultLogBuilder implements LogBuilder {
return this;
}
- public LogBuilder withMarker(Marker marker) {
+ public LogBuilder withMarker(final Marker marker) {
this.marker = marker;
return this;
}
- public LogBuilder withThrowable(Throwable throwable) {
+ public LogBuilder withThrowable(final Throwable throwable) {
this.throwable = throwable;
return this;
}
@@ -88,7 +88,7 @@ public class DefaultLogBuilder implements LogBuilder {
return this;
}
- public LogBuilder withLocation(StackTraceElement location) {
+ public LogBuilder withLocation(final StackTraceElement location) {
this.location = location;
return this;
}
@@ -98,122 +98,122 @@ public class DefaultLogBuilder implements LogBuilder {
}
@Override
- public void log(Message message) {
+ public void log(final Message message) {
if (isValid()) {
logMessage(message);
}
}
@Override
- public void log(CharSequence message) {
+ public void log(final CharSequence message) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message));
}
}
@Override
- public void log(String message) {
+ public void log(final String message) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message));
}
}
@Override
- public void log(String message, Object... params) {
+ public void log(final String message, final Object... params) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, params));
}
}
@Override
- public void log(String message, Supplier<?>... params) {
+ public void log(final String message, final Supplier<?>... params) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message,
LambdaUtil.getAll(params)));
}
}
@Override
- public void log(Supplier<Message> messageSupplier) {
+ public void log(final Supplier<Message> messageSupplier) {
if (isValid()) {
logMessage(messageSupplier.get());
}
}
@Override
- public void log(Object message) {
+ public void log(final Object message) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message));
}
}
@Override
- public void log(String message, Object p0) {
+ public void log(final String message, final Object p0) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0));
}
}
@Override
- public void log(String message, Object p0, Object p1) {
+ public void log(final String message, final Object p0, final Object p1) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3, p4));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3, p4, p5));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3, p4, p5, p6));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6,
- Object p7) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6,
+ final Object p7) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3, p4, p5, p6, p7));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6,
- Object p7, Object p8) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6,
+ final Object p7, final Object p8) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3, p4, p5, p6, p7, p8));
}
}
@Override
- public void log(String message, Object p0, Object p1, Object p2, Object
p3, Object p4, Object p5, Object p6,
- Object p7, Object p8, Object p9) {
+ public void log(final String message, final Object p0, final Object p1,
final Object p2, final Object p3, final Object p4, final Object p5, final
Object p6,
+ final Object p7, final Object p8, final Object p9) {
if (isValid()) {
logMessage(logger.getMessageFactory().newMessage(message, p0, p1,
p2, p3, p4, p5, p6, p7, p8, p9));
}
@@ -226,7 +226,7 @@ public class DefaultLogBuilder implements LogBuilder {
}
}
- private void logMessage(Message message) {
+ private void logMessage(final Message message) {
try {
logger.logMessage(level, marker, FQCN, location, message,
throwable);
} finally {
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultObjectInputFilter.java
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultObjectInputFilter.java
index 2245c1d..82494b3 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultObjectInputFilter.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultObjectInputFilter.java
@@ -45,7 +45,7 @@ public class DefaultObjectInputFilter implements
ObjectInputFilter {
delegate = null;
}
- public DefaultObjectInputFilter(ObjectInputFilter filter) {
+ public DefaultObjectInputFilter(final ObjectInputFilter filter) {
delegate = filter;
}
@@ -54,13 +54,13 @@ public class DefaultObjectInputFilter implements
ObjectInputFilter {
* @param filter The ObjectInputFilter.
* @return The DefaultObjectInputFilter.
*/
- public static DefaultObjectInputFilter newInstance(ObjectInputFilter
filter) {
+ public static DefaultObjectInputFilter newInstance(final ObjectInputFilter
filter) {
return new DefaultObjectInputFilter(filter);
}
@Override
- public Status checkInput(FilterInfo filterInfo) {
+ public Status checkInput(final FilterInfo filterInfo) {
Status status = null;
if (delegate != null) {
status = delegate.checkInput(filterInfo);
@@ -68,7 +68,7 @@ public class DefaultObjectInputFilter implements
ObjectInputFilter {
return status;
}
}
- ObjectInputFilter serialFilter =
ObjectInputFilter.Config.getSerialFilter();
+ final ObjectInputFilter serialFilter =
ObjectInputFilter.Config.getSerialFilter();
if (serialFilter != null) {
status = serialFilter.checkInput(filterInfo);
if (status != Status.UNDECIDED) {
@@ -77,7 +77,7 @@ public class DefaultObjectInputFilter implements
ObjectInputFilter {
}
}
if (filterInfo.serialClass() != null) {
- String name = filterInfo.serialClass().getName();
+ final String name = filterInfo.serialClass().getName();
if (isAllowedByDefault(name) || isRequiredPackage(name)) {
return Status.ALLOWED;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/LogManagerStatus.java
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/LogManagerStatus.java
index b793927..6f96ae9 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/internal/LogManagerStatus.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/internal/LogManagerStatus.java
@@ -23,7 +23,7 @@ public class LogManagerStatus {
private static boolean initialized = false;
- public static void setInitialized(boolean managerStatus) {
+ public static void setInitialized(final boolean managerStatus) {
initialized = managerStatus;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
index 3609d8e..ccd5895 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java
@@ -222,7 +222,7 @@ public class MapMessage<M extends MapMessage<M, V>, V>
implements MultiFormatStr
* @return The value of the element or null if the key is not present.
*/
public String get(final String key) {
- Object result = data.getValue(key);
+ final Object result = data.getValue(key);
return ParameterFormatter.deepToString(result);
}
@@ -435,7 +435,7 @@ public class MapMessage<M extends MapMessage<M, V>, V>
implements MultiFormatStr
asJava(sb, true);
}
- private void asJava(final StringBuilder sb, boolean quoted) {
+ private void asJava(final StringBuilder sb, final boolean quoted) {
sb.append('{');
for (int i = 0; i < data.size(); i++) {
if (i > 0) {
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
index fa7c672..abe07ba 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
@@ -31,7 +31,7 @@ public interface MessageFactory {
* a message object
* @return a new message
*/
- default Message newMessage(Object message) {
+ default Message newMessage(final Object message) {
return new ObjectMessage(message);
}
@@ -42,7 +42,7 @@ public interface MessageFactory {
* a message String
* @return a new message
*/
- default Message newMessage(String message) {
+ default Message newMessage(final String message) {
return new SimpleMessage(message);
}
@@ -64,7 +64,7 @@ public interface MessageFactory {
* @param charSequence the (potentially mutable) CharSequence
* @return a new message for the specified CharSequence
*/
- default Message newMessage(CharSequence charSequence) {
+ default Message newMessage(final CharSequence charSequence) {
return new SimpleMessage(charSequence);
}
@@ -76,7 +76,7 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0) {
+ default Message newMessage(final String message, final Object p0) {
return newMessage(message, new Object[] { p0 });
}
@@ -89,7 +89,7 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1) {
+ default Message newMessage(final String message, final Object p0, final
Object p1) {
return newMessage(message, new Object[] { p0, p1 });
}
@@ -103,7 +103,7 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2) {
return newMessage(message, new Object[] { p0, p1, p2 });
}
@@ -118,7 +118,7 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3) {
return newMessage(message, new Object[] { p0, p1, p2, p3 });
}
@@ -134,7 +134,7 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3, Object p4) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3, final Object p4) {
return newMessage(message, new Object[] { p0, p1, p2, p3, p4 });
}
@@ -151,7 +151,7 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3, Object p4, Object p5) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3, final Object p4, final Object p5) {
return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5 });
}
@@ -169,8 +169,8 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3, Object p4, Object p5,
- Object p6) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6) {
return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6
});
}
@@ -189,8 +189,8 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3, Object p4, Object p5,
- Object p6, Object p7) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7) {
return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6,
p7 });
}
@@ -210,8 +210,8 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3, Object p4, Object p5,
- Object p6, Object p7, Object p8) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7, final Object
p8) {
return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6,
p7, p8 });
}
@@ -232,8 +232,8 @@ public interface MessageFactory {
* @return a new message
* @see ParameterizedMessageFactory
*/
- default Message newMessage(String message, Object p0, Object p1, Object
p2, Object p3, Object p4, Object p5,
- Object p6, Object p7, Object p8, Object p9) {
+ default Message newMessage(final String message, final Object p0, final
Object p1, final Object p2, final Object p3, final Object p4, final Object p5,
+ final Object p6, final Object p7, final Object
p8, final Object p9) {
return newMessage(message, new Object[] { p0, p1, p2, p3, p4, p5, p6,
p7, p8, p9 });
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java
index 55982e0..b424ee7 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java
@@ -623,7 +623,7 @@ final class ParameterFormatter {
}
}
- private static Set<Object> getOrCreateDejaVu(Set<Object> dejaVu) {
+ private static Set<Object> getOrCreateDejaVu(final Set<Object> dejaVu) {
return dejaVu == null
? createDejaVu()
: dejaVu;
@@ -633,8 +633,8 @@ final class ParameterFormatter {
return Collections.newSetFromMap(new IdentityHashMap<>());
}
- private static Set<Object> cloneDejaVu(Set<Object> dejaVu) {
- Set<Object> clonedDejaVu = createDejaVu();
+ private static Set<Object> cloneDejaVu(final Set<Object> dejaVu) {
+ final Set<Object> clonedDejaVu = createDejaVu();
clonedDejaVu.addAll(dejaVu);
return clonedDejaVu;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
index 76917f3..9144223 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
@@ -104,7 +104,7 @@ public class ReusableObjectMessage implements
ReusableMessage, ParameterVisitabl
// go ahead and allocate the memory now;
// this saves an allocation in the future when this buffer is re-used
if (emptyReplacement.length == 0) {
- Object[] params = new Object[10]; // Default reusable parameter
buffer size
+ final Object[] params = new Object[10]; // Default reusable
parameter buffer size
params[0] = obj;
return params;
}
@@ -122,7 +122,7 @@ public class ReusableObjectMessage implements
ReusableMessage, ParameterVisitabl
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final
S state) {
action.accept(obj, 0, state);
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index 33fe81a..be3db8f 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -109,8 +109,8 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
- Object[] parameters = getParams();
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final
S state) {
+ final Object[] parameters = getParams();
for (short i = 0; i < argCount; i++) {
action.accept(parameters[i], i, state);
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
index 8c264aa..97af509 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
@@ -81,7 +81,7 @@ public class ReusableSimpleMessage implements
ReusableMessage, CharSequence, Par
}
@Override
- public <S> void forEachParameter(ParameterConsumer<S> action, S state) {
+ public <S> void forEachParameter(final ParameterConsumer<S> action, final
S state) {
}
@Override
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
index 7a617cd..89ebd92 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataCollectionMessage.java
@@ -31,7 +31,7 @@ public class StructuredDataCollectionMessage implements
StringBuilderFormattable
private final List<StructuredDataMessage> structuredDataMessageList;
- public StructuredDataCollectionMessage(List<StructuredDataMessage>
messages) {
+ public StructuredDataCollectionMessage(final List<StructuredDataMessage>
messages) {
this.structuredDataMessageList = messages;
}
@@ -42,15 +42,15 @@ public class StructuredDataCollectionMessage implements
StringBuilderFormattable
@Override
public String getFormattedMessage() {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
formatTo(sb);
return sb.toString();
}
@Override
public String getFormat() {
- StringBuilder sb = new StringBuilder();
- for (StructuredDataMessage msg : structuredDataMessageList) {
+ final StringBuilder sb = new StringBuilder();
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
if (msg.getFormat() != null) {
if (sb.length() > 0) {
sb.append(", ");
@@ -62,27 +62,27 @@ public class StructuredDataCollectionMessage implements
StringBuilderFormattable
}
@Override
- public void formatTo(StringBuilder buffer) {
- for (StructuredDataMessage msg : structuredDataMessageList) {
+ public void formatTo(final StringBuilder buffer) {
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
msg.formatTo(buffer);
}
}
@Override
public Object[] getParameters() {
- List<Object[]> objectList = new ArrayList<>();
+ final List<Object[]> objectList = new ArrayList<>();
int count = 0;
- for (StructuredDataMessage msg : structuredDataMessageList) {
- Object[] objects = msg.getParameters();
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
+ final Object[] objects = msg.getParameters();
if (objects != null) {
objectList.add(objects);
count += objects.length;
}
}
- Object[] objects = new Object[count];
+ final Object[] objects = new Object[count];
int index = 0;
- for (Object[] objs : objectList) {
- for (Object obj : objs) {
+ for (final Object[] objs : objectList) {
+ for (final Object obj : objs) {
objects[index++] = obj;
}
}
@@ -91,8 +91,8 @@ public class StructuredDataCollectionMessage implements
StringBuilderFormattable
@Override
public Throwable getThrowable() {
- for (StructuredDataMessage msg : structuredDataMessageList) {
- Throwable t = msg.getThrowable();
+ for (final StructuredDataMessage msg : structuredDataMessageList) {
+ final Throwable t = msg.getThrowable();
if (t != null) {
return t;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
index a5169aa..2b21e64 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
@@ -185,9 +185,9 @@ public class StructuredDataId implements Serializable,
StringBuilderFormattable
* @return a StructuredDataId.
*/
public StructuredDataId makeId(final String defaultId, final int
anEnterpriseNumber) {
- String id;
- String[] req;
- String[] opt;
+ final String id;
+ final String[] req;
+ final String[] opt;
if (anEnterpriseNumber <= 0) {
return this;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
index fba395f..2980ab5 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
@@ -253,7 +253,7 @@ public class StructuredDataMessage extends
MapMessage<StructuredDataMessage, Str
}
@Override
- public void formatTo(String[] formats, StringBuilder buffer) {
+ public void formatTo(final String[] formats, final StringBuilder buffer) {
asString(getFormat(formats), null, buffer);
}
@@ -355,7 +355,7 @@ public class StructuredDataMessage extends
MapMessage<StructuredDataMessage, Str
}
}
- private void asXml(StructuredDataId structuredDataId, StringBuilder sb) {
+ private void asXml(final StructuredDataId structuredDataId, final
StringBuilder sb) {
sb.append("<StructuredData>\n");
sb.append("<type>").append(type).append("</type>\n");
sb.append("<id>").append(structuredDataId).append("</id>\n");
@@ -386,7 +386,7 @@ public class StructuredDataMessage extends
MapMessage<StructuredDataMessage, Str
return asString(getFormat(formats), null);
}
- private Format getFormat(String[] formats) {
+ private Format getFormat(final String[] formats) {
if (formats != null && formats.length > 0) {
for (int i = 0; i < formats.length; i++) {
final String format = formats[i];
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
index db0bd05..d736e00 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
@@ -70,7 +70,7 @@ public class ThreadDumpMessage implements Message,
StringBuilderFormattable {
while (result == null && iterator.hasNext()) {
result = iterator.next();
}
- } catch (ServiceConfigurationError | LinkageError | Exception
unavailable) { // if java management classes not available
+ } catch (final ServiceConfigurationError | LinkageError | Exception
unavailable) { // if java management classes not available
StatusLogger.getLogger().info("ThreadDumpMessage uses
BasicThreadInfoFactory: " +
"could not load extended ThreadInfoFactory: {}",
unavailable.toString());
result = null;
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
index b91f3b2..fe21b3a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
@@ -205,7 +205,7 @@ public class SimpleLogger extends AbstractLogger {
// Append date-time if so configured
if (showDateTime) {
final Date now = new Date();
- String dateText;
+ final String dateText;
synchronized (dateFormatter) {
dateText = dateFormatter.format(now);
}
@@ -229,7 +229,7 @@ public class SimpleLogger extends AbstractLogger {
}
}
final Object[] params = msg.getParameters();
- Throwable t;
+ final Throwable t;
if (throwable == null && params != null && params.length > 0
&& params[params.length - 1] instanceof Throwable) {
t = (Throwable) params[params.length - 1];
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index fdf0f44..78a4261 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -2036,7 +2036,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, Serializable {
try {
incrementRecursionDepth();
log(level, marker, fqcn, location, message, throwable);
- } catch (Exception ex) {
+ } catch (final Exception ex) {
handleLogMessageException(ex, fqcn, message);
} finally {
decrementRecursionDepth();
@@ -2107,7 +2107,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, Serializable {
getRecursionDepthHolder()[0]++;
}
private static void decrementRecursionDepth() {
- int[] depth = getRecursionDepthHolder();
+ final int[] depth = getRecursionDepthHolder();
depth[0]--;
if (depth[0] < 0) {
throw new IllegalStateException("Recursion depth became negative:
" + depth[0]);
@@ -2144,7 +2144,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, Serializable {
@PerformanceSensitive
// NOTE: This is a hot method. Current implementation compiles to 15 bytes
of byte code.
// This is within the 35 byte MaxInlineSize threshold. Modify with care!
- private StackTraceElement getLocation(String fqcn) {
+ private StackTraceElement getLocation(final String fqcn) {
return requiresLocation() ? StackLocatorUtil.calcLocation(fqcn) : null;
}
@@ -2829,7 +2829,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, Serializable {
*/
@Override
public LogBuilder always() {
- DefaultLogBuilder builder = logBuilder.get();
+ final DefaultLogBuilder builder = logBuilder.get();
if (builder.isInUse()) {
return new DefaultLogBuilder(this);
}
@@ -2841,7 +2841,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, Serializable {
* @since 2.13.0
*/
@Override
- public LogBuilder atLevel(Level level) {
+ public LogBuilder atLevel(final Level level) {
if (isEnabled(level)) {
return (getLogBuilder(level).reset(level));
} else {
@@ -2849,25 +2849,25 @@ public abstract class AbstractLogger implements
ExtendedLogger, Serializable {
}
}
- private DefaultLogBuilder getLogBuilder(Level level) {
- DefaultLogBuilder builder = logBuilder.get();
+ private DefaultLogBuilder getLogBuilder(final Level level) {
+ final DefaultLogBuilder builder = logBuilder.get();
return Constants.ENABLE_THREADLOCALS && !builder.isInUse() ? builder :
new DefaultLogBuilder(this, level);
}
private void readObject (final ObjectInputStream s) throws
ClassNotFoundException, IOException {
s.defaultReadObject( );
try {
- Field f = this.getClass().getDeclaredField("logBuilder");
+ final Field f = this.getClass().getDeclaredField("logBuilder");
f.setAccessible(true);
f.set(this, new LocalLogBuilder(this));
- } catch (NoSuchFieldException | IllegalAccessException ex) {
+ } catch (final NoSuchFieldException | IllegalAccessException ex) {
StatusLogger.getLogger().warn("Unable to initialize LogBuilder");
}
}
private class LocalLogBuilder extends ThreadLocal<DefaultLogBuilder> {
private final AbstractLogger logger;
- LocalLogBuilder(AbstractLogger logger) {
+ LocalLogBuilder(final AbstractLogger logger) {
this.logger = logger;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
index 55746e9..2434955 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
@@ -55,7 +55,7 @@ public abstract class AbstractLoggerAdapter<L> implements
LoggerAdapter<L>, Logg
}
@Override
- public void contextShutdown(LoggerContext loggerContext) {
+ public void contextShutdown(final LoggerContext loggerContext) {
registry.remove(loggerContext);
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
index 862246e..97fb7b9 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
@@ -88,7 +88,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements
ReadOnlyThreadContextMap
if (parentValue == null) {
return null;
}
- StringMap stringMap = createStringMap(parentValue);
+ final StringMap stringMap = createStringMap(parentValue);
stringMap.freeze();
return stringMap;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index 1e69a83..4d05937 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -153,8 +153,7 @@ public class DefaultThreadContextMap implements
ThreadContextMap, ReadOnlyString
}
for (final Map.Entry<String, String> entry : map.entrySet()) {
//BiConsumer should be able to handle values of any type V. In our
case the values are of type String.
- @SuppressWarnings("unchecked")
- V value = (V) entry.getValue();
+ @SuppressWarnings("unchecked") final V value = (V)
entry.getValue();
action.accept(entry.getKey(), value);
}
}
@@ -167,8 +166,7 @@ public class DefaultThreadContextMap implements
ThreadContextMap, ReadOnlyString
}
for (final Map.Entry<String, String> entry : map.entrySet()) {
//TriConsumer should be able to handle values of any type V. In
our case the values are of type String.
- @SuppressWarnings("unchecked")
- V value = (V) entry.getValue();
+ @SuppressWarnings("unchecked") final V value = (V)
entry.getValue();
action.accept(entry.getKey(), value, state);
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
index 6bb346b..955bb34 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
@@ -35,7 +35,7 @@ public interface LoggerContext {
* @return The Object that is associated with the key, if any.
* @since 2.13.0
*/
- default Object getObject(String key) {
+ default Object getObject(final String key) {
return null;
}
@@ -46,7 +46,7 @@ public interface LoggerContext {
* @return The previous object or null.
* @since 2.13.0
*/
- default Object putObject(String key, Object value) {
+ default Object putObject(final String key, final Object value) {
return null;
}
@@ -57,7 +57,7 @@ public interface LoggerContext {
* @return The previous object or null.
* @since 2.13.0
*/
- default Object putObjectIfAbsent(String key, Object value) {
+ default Object putObjectIfAbsent(final String key, final Object value) {
return null;
}
@@ -67,7 +67,7 @@ public interface LoggerContext {
* @return The object if it was present, null if it was not.
* @since 2.13.0
*/
- default Object removeObject(String key) {
+ default Object removeObject(final String key) {
return null;
}
@@ -78,7 +78,7 @@ public interface LoggerContext {
* @return The object if it was present, null if it was not.
* @since 2.13.0
*/
- default boolean removeObject(String key, Object value) {
+ default boolean removeObject(final String key, final Object value) {
return false;
}
@@ -95,7 +95,7 @@ public interface LoggerContext {
* @return The logger.
* @since 2.14.0
*/
- default ExtendedLogger getLogger(Class<?> cls) {
+ default ExtendedLogger getLogger(final Class<?> cls) {
final String canonicalName = cls.getCanonicalName();
return getLogger(canonicalName != null ? canonicalName :
cls.getName());
}
@@ -117,7 +117,7 @@ public interface LoggerContext {
* @return The logger.
* @since 2.14.0
*/
- default ExtendedLogger getLogger(Class<?> cls, MessageFactory
messageFactory) {
+ default ExtendedLogger getLogger(final Class<?> cls, final MessageFactory
messageFactory) {
final String canonicalName = cls.getCanonicalName();
return getLogger(canonicalName != null ? canonicalName :
cls.getName(), messageFactory);
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
index 37391f9..61a30cc 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
@@ -33,9 +33,9 @@ public interface LoggerContextFactory {
* @param allContexts if true all LoggerContexts that can be located will
be shutdown.
* @since 2.13.0
*/
- default void shutdown(String fqcn, ClassLoader loader, boolean
currentContext, boolean allContexts) {
+ default void shutdown(final String fqcn, final ClassLoader loader, final
boolean currentContext, final boolean allContexts) {
if (hasContext(fqcn, loader, currentContext)) {
- LoggerContext ctx = getContext(fqcn, loader, null, currentContext);
+ final LoggerContext ctx = getContext(fqcn, loader, null,
currentContext);
if (ctx instanceof Terminable) {
((Terminable) ctx).terminate();
}
@@ -51,7 +51,7 @@ public interface LoggerContextFactory {
* @return true if a LoggerContext has been installed, false otherwise.
* @since 2.13.0
*/
- default boolean hasContext(String fqcn, ClassLoader loader, boolean
currentContext) {
+ default boolean hasContext(final String fqcn, final ClassLoader loader,
final boolean currentContext) {
return false;
}
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
index 5808cf8..591c4c2 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
@@ -220,7 +220,7 @@ public class Provider {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -228,7 +228,7 @@ public class Provider {
return false;
}
- Provider provider = (Provider) o;
+ final Provider provider = (Provider) o;
if (priority != null ? !priority.equals(provider.priority) :
provider.priority != null) {
return false;
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java
b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java
index 463d9d0..469610d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java
@@ -128,7 +128,7 @@ public class StatusData implements Serializable {
sb.append(SPACE);
sb.append(msg.getFormattedMessage());
final Object[] params = msg.getParameters();
- Throwable t;
+ final Throwable t;
if (throwable == null && params != null && params[params.length - 1]
instanceof Throwable) {
t = (Throwable) params[params.length - 1];
} else {
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
index 61e299a..45b9522 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
@@ -94,7 +94,7 @@ public final class Constants {
static int getMajorVersion(final String version) {
final String[] parts = version.split("-|\\.");
- boolean isJEP223;
+ final boolean isJEP223;
try {
final int token = Integer.parseInt(parts[0]);
isJEP223 = token != 1;
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
index f556f92..435f22c 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/util/FilteredObjectInputStream.java
@@ -56,7 +56,7 @@ public class FilteredObjectInputStream extends
ObjectInputStream {
this.allowedClasses = new HashSet<>();
}
- public FilteredObjectInputStream(InputStream in) throws IOException {
+ public FilteredObjectInputStream(final InputStream in) throws IOException {
super(in);
this.allowedClasses = new HashSet<>();
}
@@ -78,7 +78,7 @@ public class FilteredObjectInputStream extends
ObjectInputStream {
@SuppressWarnings("BanSerializableRead")
@Override
protected Class<?> resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
- String name = desc.getName();
+ final String name = desc.getName();
if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
throw new InvalidObjectException("Class is not allowed for
deserialization: " + name);
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 9c37943..3f9dd5b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -154,7 +154,7 @@ public final class LoaderUtil {
if (tcl != null) {
classLoaders.add(tcl);
}
- ModuleLayer layer = LoaderUtil.class.getModule().getLayer();
+ final ModuleLayer layer = LoaderUtil.class.getModule().getLayer();
if (layer == null) {
if (!isForceTccl()) {
accumulateClassLoaders(LoaderUtil.class.getClassLoader(),
classLoaders);
@@ -167,7 +167,7 @@ public final class LoaderUtil {
} else {
accumulateLayerClassLoaders(layer, classLoaders);
if (layer != ModuleLayer.boot()) {
- for (Module module : ModuleLayer.boot().modules()) {
+ for (final Module module : ModuleLayer.boot().modules()) {
accumulateClassLoaders(module.getClassLoader(),
classLoaders);
}
}
@@ -175,12 +175,12 @@ public final class LoaderUtil {
return classLoaders.toArray(new ClassLoader[0]);
}
- private static void accumulateLayerClassLoaders(ModuleLayer layer,
Collection<ClassLoader> classLoaders) {
- for (Module module : layer.modules()) {
+ private static void accumulateLayerClassLoaders(final ModuleLayer layer,
final Collection<ClassLoader> classLoaders) {
+ for (final Module module : layer.modules()) {
accumulateClassLoaders(module.getClassLoader(), classLoaders);
}
if (layer.parents().size() > 0) {
- for (ModuleLayer parent : layer.parents()) {
+ for (final ModuleLayer parent : layer.parents()) {
accumulateLayerClassLoaders(parent, classLoaders);
}
}
@@ -190,7 +190,7 @@ public final class LoaderUtil {
* Adds the provided loader to the loaders collection, and traverses up
the tree until either a null
* value or a classloader which has already been added is encountered.
*/
- private static void accumulateClassLoaders(ClassLoader loader,
Collection<ClassLoader> loaders) {
+ private static void accumulateClassLoaders(final ClassLoader loader, final
Collection<ClassLoader> loaders) {
// Some implementations may use null to represent the bootstrap class
loader.
if (loader != null && loaders.add(loader)) {
accumulateClassLoaders(loader.getParent(), loaders);
@@ -230,7 +230,7 @@ public final class LoaderUtil {
return Class.forName(className);
}
try {
- ClassLoader tccl = getThreadContextClassLoader();
+ final ClassLoader tccl = getThreadContextClassLoader();
if (tccl != null) {
return tccl.loadClass(className);
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
index e467413..6808768 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProcessIdUtil.java
@@ -23,7 +23,7 @@ public class ProcessIdUtil {
public static String getProcessId() {
try {
return Long.toString(ProcessHandle.current().pid());
- } catch(Exception ex) {
+ } catch(final Exception ex) {
return DEFAULT_PROCESSID;
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index 0c0318b..ac2216b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -165,8 +165,8 @@ public final class PropertiesUtil {
* @return The value or null if it is not found.
* @since 2.13.0
*/
- public Boolean getBooleanProperty(final String[] prefixes, String key,
Supplier<Boolean> supplier) {
- for (String prefix : prefixes) {
+ public Boolean getBooleanProperty(final String[] prefixes, final String
key, final Supplier<Boolean> supplier) {
+ for (final String prefix : prefixes) {
if (hasProperty(prefix + key)) {
return getBooleanProperty(prefix + key);
}
@@ -260,8 +260,8 @@ public final class PropertiesUtil {
* @return The value or null if it is not found.
* @since 2.13.0
*/
- public Integer getIntegerProperty(final String[] prefixes, String key,
Supplier<Integer> supplier) {
- for (String prefix : prefixes) {
+ public Integer getIntegerProperty(final String[] prefixes, final String
key, final Supplier<Integer> supplier) {
+ for (final String prefix : prefixes) {
if (hasProperty(prefix + key)) {
return getIntegerProperty(prefix + key, 0);
}
@@ -296,8 +296,8 @@ public final class PropertiesUtil {
* @return The value or null if it is not found.
* @since 2.13.0
*/
- public Long getLongProperty(final String[] prefixes, String key,
Supplier<Long> supplier) {
- for (String prefix : prefixes) {
+ public Long getLongProperty(final String[] prefixes, final String key,
final Supplier<Long> supplier) {
+ for (final String prefix : prefixes) {
if (hasProperty(prefix + key)) {
return getLongProperty(prefix + key, 0);
}
@@ -313,7 +313,7 @@ public final class PropertiesUtil {
* @return The value of the String as a Duration or the default value,
which may be null.
* @since 2.13.0
*/
- public Duration getDurationProperty(final String name, Duration
defaultValue) {
+ public Duration getDurationProperty(final String name, final Duration
defaultValue) {
final String prop = getStringProperty(name);
if (prop != null) {
return TimeUnit.getDuration(prop);
@@ -330,8 +330,8 @@ public final class PropertiesUtil {
* @return The value or null if it is not found.
* @since 2.13.0
*/
- public Duration getDurationProperty(final String[] prefixes, String key,
Supplier<Duration> supplier) {
- for (String prefix : prefixes) {
+ public Duration getDurationProperty(final String[] prefixes, final String
key, final Supplier<Duration> supplier) {
+ for (final String prefix : prefixes) {
if (hasProperty(prefix + key)) {
return getDurationProperty(prefix + key, null);
}
@@ -348,9 +348,9 @@ public final class PropertiesUtil {
* @return The value or null if it is not found.
* @since 2.13.0
*/
- public String getStringProperty(final String[] prefixes, String key,
Supplier<String> supplier) {
- for (String prefix : prefixes) {
- String result = getStringProperty(prefix + key);
+ public String getStringProperty(final String[] prefixes, final String key,
final Supplier<String> supplier) {
+ for (final String prefix : prefixes) {
+ final String result = getStringProperty(prefix + key);
if (result != null) {
return result;
}
@@ -425,17 +425,17 @@ public final class PropertiesUtil {
private final Map<List<CharSequence>, String> tokenized = new
ConcurrentHashMap<>();
private Environment(final PropertySource propertySource) {
- PropertyFilePropertySource sysProps = new
PropertyFilePropertySource(LOG4J_SYSTEM_PROPERTIES_FILE_NAME);
+ final PropertyFilePropertySource sysProps = new
PropertyFilePropertySource(LOG4J_SYSTEM_PROPERTIES_FILE_NAME);
try {
sysProps.forEach(new BiConsumer<String, String>() {
@Override
- public void accept(String key, String value) {
+ public void accept(final String key, final String value) {
if (System.getProperty(key) == null) {
System.setProperty(key, value);
}
}
});
- } catch (SecurityException ex) {
+ } catch (final SecurityException ex) {
// Access to System Properties is restricted so just skip it.
}
sources.add(propertySource);
@@ -588,7 +588,7 @@ public final class PropertiesUtil {
private final String[] descriptions;
private final ChronoUnit timeUnit;
- TimeUnit(String descriptions, ChronoUnit timeUnit) {
+ TimeUnit(final String descriptions, final ChronoUnit timeUnit) {
this.descriptions = descriptions.split(",");
this.timeUnit = timeUnit;
}
@@ -597,12 +597,12 @@ public final class PropertiesUtil {
return this.timeUnit;
}
- static Duration getDuration(String time) {
- String value = time.trim();
+ static Duration getDuration(final String time) {
+ final String value = time.trim();
TemporalUnit temporalUnit = ChronoUnit.MILLIS;
long timeVal = 0;
- for (TimeUnit timeUnit : values()) {
- for (String suffix : timeUnit.descriptions) {
+ for (final TimeUnit timeUnit : values()) {
+ for (final String suffix : timeUnit.descriptions) {
if (value.endsWith(suffix)) {
temporalUnit = timeUnit.timeUnit;
timeVal = Long.parseLong(value.substring(0,
value.length() - suffix.length()));
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
index 3adbb24..c4cf359 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java
@@ -37,7 +37,7 @@ public class PropertyFilePropertySource extends
PropertiesPropertySource {
for (final URL url : LoaderUtil.findResources(fileName)) {
try (final InputStream in = url.openStream()) {
props.load(in);
- } catch (IOException e) {
+ } catch (final IOException e) {
LowLevelLogUtil.logException("Unable to read " + url, e);
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
index 77ccd4b..8b30878 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
@@ -45,7 +45,7 @@ public interface PropertySource {
*
* @param action action to perform on each key/value pair
*/
- default void forEach(BiConsumer<String, String> action) {
+ default void forEach(final BiConsumer<String, String> action) {
}
/**
@@ -55,7 +55,7 @@ public interface PropertySource {
* @param tokens list of property name tokens
* @return a normalized property name using the given tokens
*/
- default CharSequence getNormalForm(Iterable<? extends CharSequence>
tokens) {
+ default CharSequence getNormalForm(final Iterable<? extends CharSequence>
tokens) {
return null;
}
@@ -65,7 +65,7 @@ public interface PropertySource {
* @return The value or null;
* @since 2.13.0
*/
- default String getProperty(String key) {
+ default String getProperty(final String key) {
return null;
}
@@ -76,7 +76,7 @@ public interface PropertySource {
* @return The value or null;
* @since 2.13.0
*/
- default boolean containsProperty(String key) {
+ default boolean containsProperty(final String key) {
return false;
}
@@ -117,7 +117,7 @@ public interface PropertySource {
if (CACHE.containsKey(value)) {
return CACHE.get(value);
}
- List<CharSequence> tokens = new ArrayList<>();
+ final List<CharSequence> tokens = new ArrayList<>();
final Matcher matcher = PROPERTY_TOKENIZER.matcher(value);
while (matcher.find()) {
tokens.add(matcher.group(1).toLowerCase());
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index 93fad64..2534b21 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -63,10 +63,10 @@ public final class ProviderUtil {
private static volatile ProviderUtil instance;
private ProviderUtil() {
- for (ClassLoader classLoader : LoaderUtil.getClassLoaders()) {
+ for (final ClassLoader classLoader : LoaderUtil.getClassLoaders()) {
try {
loadProviders(classLoader);
- } catch (Throwable ex) {
+ } catch (final Throwable ex) {
LOGGER.debug("Unable to retrieve provider from ClassLoader
{}", classLoader, ex);
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
index 1dec0c2..0882f6f 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
@@ -96,7 +96,7 @@ public class SortedArrayStringMap implements IndexedStringMap
{
Method[] methods = ObjectInputStream.class.getMethods();
Method setMethod = null;
Method getMethod = null;
- for (Method method : methods) {
+ for (final Method method : methods) {
if (method.getName().equals("setObjectInputFilter")) {
setMethod = method;
} else if (method.getName().equals("getObjectInputFilter")) {
@@ -106,16 +106,16 @@ public class SortedArrayStringMap implements
IndexedStringMap {
Method newMethod = null;
try {
if (setMethod != null) {
- Class<?> clazz =
Class.forName("org.apache.logging.log4j.internal.DefaultObjectInputFilter");
+ final Class<?> clazz =
Class.forName("org.apache.logging.log4j.internal.DefaultObjectInputFilter");
methods = clazz.getMethods();
- for (Method method : methods) {
+ for (final Method method : methods) {
if (method.getName().equals("newInstance") &&
Modifier.isStatic(method.getModifiers())) {
newMethod = method;
break;
}
}
}
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Ignore the exception
}
newObjectInputFilter = newMethod;
@@ -553,7 +553,7 @@ public class SortedArrayStringMap implements
IndexedStringMap {
return null;
}
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (ObjectOutputStream oos = new ObjectOutputStream(bout)) {
+ try (final ObjectOutputStream oos = new ObjectOutputStream(bout)) {
oos.writeObject(obj);
oos.flush();
return bout.toByteArray();
@@ -561,21 +561,21 @@ public class SortedArrayStringMap implements
IndexedStringMap {
}
@SuppressWarnings("BanSerializableRead")
- private static Object unmarshall(final byte[] data, ObjectInputStream
inputStream)
+ private static Object unmarshall(final byte[] data, final
ObjectInputStream inputStream)
throws IOException, ClassNotFoundException {
final ByteArrayInputStream bin = new ByteArrayInputStream(data);
Collection<String> allowedClasses = null;
- ObjectInputStream ois;
+ final ObjectInputStream ois;
if (inputStream instanceof FilteredObjectInputStream) {
allowedClasses = ((FilteredObjectInputStream)
inputStream).getAllowedClasses();
ois = new FilteredObjectInputStream(bin, allowedClasses);
} else {
try {
- Object obj = getObjectInputFilter.invoke(inputStream);
- Object filter = newObjectInputFilter.invoke(null, obj);
+ final Object obj = getObjectInputFilter.invoke(inputStream);
+ final Object filter = newObjectInputFilter.invoke(null, obj);
ois = new ObjectInputStream(bin);
setObjectInputFilter.invoke(ois, filter);
- } catch (IllegalAccessException | InvocationTargetException ex) {
+ } catch (final IllegalAccessException | InvocationTargetException
ex) {
throw new StreamCorruptedException("Unable to set
ObjectInputFilter on stream");
}
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
index 80299a1..15b981a 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java
@@ -81,8 +81,8 @@ public final class StackLocator {
if (PrivateSecurityManagerStackTraceUtil.isEnabled()) {
return PrivateSecurityManagerStackTraceUtil.getCurrentStackTrace();
}
- Stack<Class<?>> stack = new Stack<Class<?>>();
- List<Class<?>> classes = walker.walk(s -> s.map(f ->
f.getDeclaringClass()).collect(Collectors.toList()));
+ final Stack<Class<?>> stack = new Stack<Class<?>>();
+ final List<Class<?>> classes = walker.walk(s -> s.map(f ->
f.getDeclaringClass()).collect(Collectors.toList()));
stack.addAll(classes);
return stack;
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java
index c7b59e3..7fe2088 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java
@@ -93,7 +93,7 @@ public final class StackLocatorUtil {
public static StackTraceElement calcLocation(final String fqcnOfLogger) {
try {
return stackLocator.calcLocation(fqcnOfLogger);
- } catch (NoSuchElementException ex) {
+ } catch (final NoSuchElementException ex) {
if (!errorLogged) {
errorLogged = true;
StatusLogger.getLogger().warn("Unable to locate stack trace
element for {}", fqcnOfLogger, ex);
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
index 7ae03eb..d7ef460 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java
@@ -192,7 +192,7 @@ public final class StringBuilders {
}
}
- int lastChar = toAppendTo.length() - 1;
+ final int lastChar = toAppendTo.length() - 1;
toAppendTo.setLength(toAppendTo.length() + escapeCount);
int lastPos = toAppendTo.length() - 1;
@@ -241,7 +241,7 @@ public final class StringBuilders {
}
}
- private static int escapeAndDecrement(StringBuilder toAppendTo, int
lastPos, char c) {
+ private static int escapeAndDecrement(final StringBuilder toAppendTo, int
lastPos, final char c) {
toAppendTo.setCharAt(lastPos--, c);
toAppendTo.setCharAt(lastPos--, '\\');
return lastPos;
@@ -265,7 +265,7 @@ public final class StringBuilders {
}
}
- int lastChar = toAppendTo.length() - 1;
+ final int lastChar = toAppendTo.length() - 1;
toAppendTo.setLength(toAppendTo.length() + escapeCount);
int lastPos = toAppendTo.length() - 1;
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
index 1a1cded..09168d8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
@@ -68,7 +68,7 @@ public final class Strings {
return true;
}
for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
+ final char c = s.charAt(i);
if (!Character.isWhitespace(c)) {
return false;
}
@@ -303,13 +303,13 @@ public final class Strings {
* @param str2 the second string.
* @return the concatenated String.
*/
- public static String concat(String str1, String str2) {
+ public static String concat(final String str1, final String str2) {
if (isEmpty(str1)) {
return str2;
} else if (isEmpty(str2)) {
return str1;
}
- StringBuilder sb = tempStr.get();
+ final StringBuilder sb = tempStr.get();
try {
return sb.append(str1).append(str2).toString();
} finally {
@@ -329,7 +329,7 @@ public final class Strings {
if (count < 0) {
throw new IllegalArgumentException("count");
}
- StringBuilder sb = tempStr.get();
+ final StringBuilder sb = tempStr.get();
try {
for (int index = 0; index < count; index++) {
sb.append(str);
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
index 2509cd1..72a6cd1 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
@@ -38,7 +38,7 @@ public class SystemPropertiesPropertySource implements
PropertySource {
@Override
public void forEach(final BiConsumer<String, String> action) {
- Properties properties;
+ final Properties properties;
try {
properties = System.getProperties();
} catch (final SecurityException e) {
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
index 424aa3f..4052706 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Timer.java
@@ -275,7 +275,7 @@ public class Timer implements Serializable,
StringBuilderFormattable
int result;
result = (name != null ? name.hashCode() : 0);
result = 29 * result + (status != null ? status.hashCode() : 0);
- long time = startTime.get();
+ final long time = startTime.get();
result = 29 * result + (int) (time ^ (time >>> 32));
result = 29 * result + (int) (elapsedTime ^ (elapsedTime >>> 32));
return result;
