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 23eca6e General code clean-up (#502)
23eca6e is described below
commit 23eca6e69ee6f99859cc50869d474548ce1d73a7
Author: Arturo Bernal <[email protected]>
AuthorDate: Fri Jun 4 09:19:41 2021 +0200
General code clean-up (#502)
* Use Standard Charset object
* Remove Unnecessary enum modifier
* Make final var
* Avoid String concat loop. Use StringBuilder
* Remove Unnecessary interface modifier
* Simplify Statement
* Inline variable
---
.../core/appender/HttpURLConnectionManager.java | 3 ++-
.../appender/rolling/DefaultRolloverStrategy.java | 2 +-
.../log4j/core/appender/rolling/FileExtension.java | 2 +-
.../rolling/OnStartupTriggeringPolicy.java | 3 +--
.../core/appender/rolling/action/DeleteAction.java | 6 ++----
.../log4j/core/config/ConfigurationFactory.java | 12 ++++-------
.../log4j/core/config/ConfigurationSource.java | 6 +-----
.../logging/log4j/core/filter/ScriptFilter.java | 2 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 4 ++--
.../log4j/core/impl/ThreadContextDataInjector.java | 2 +-
.../org/apache/logging/log4j/core/jmx/Server.java | 3 +--
.../logging/log4j/core/layout/HtmlLayout.java | 4 ++--
.../log4j/core/layout/internal/ListChecker.java | 4 ++--
.../log4j/core/net/Rfc1349TrafficClass.java | 2 +-
.../log4j/core/pattern/DatePatternConverter.java | 6 +++---
.../logging/log4j/core/pattern/PatternParser.java | 2 +-
.../log4j/core/time/internal/CachedClock.java | 3 +--
.../core/time/internal/format/FixedDateFormat.java | 6 +++---
.../apache/logging/log4j/core/tools/Generate.java | 7 ++----
.../log4j/core/tools/picocli/CommandLine.java | 25 +++++++++++-----------
.../logging/log4j/core/util/CronExpression.java | 5 +----
.../log4j/core/FormatterLoggerManualExample.java | 2 +-
.../RandomRollingAppenderOnStartupTest.java | 1 -
.../rolling/RollingAppenderCronOnceADayTest.java | 5 +++--
.../log4j/core/async/perftest/PerfTestDriver.java | 6 +++---
.../async/perftest/PerfTestResultFormatter.java | 2 +-
.../log4j/core/config/InMemoryAdvertiser.java | 8 +++----
.../config/plugins/convert/TypeConvertersTest.java | 4 ++--
.../time/internal/format/FastDateParserTest.java | 5 ++---
29 files changed, 62 insertions(+), 80 deletions(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java
index 90c8550..9c66db2 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Objects;
import javax.net.ssl.HttpsURLConnection;
@@ -39,7 +40,7 @@ import org.apache.logging.log4j.core.util.IOUtils;
public class HttpURLConnectionManager extends HttpManager {
- private static final Charset CHARSET = Charset.forName("US-ASCII");
+ private static final Charset CHARSET = StandardCharsets.US_ASCII;
private final URL url;
private final boolean isHttps;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index 182afcb..0a2bbb7 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -121,7 +121,7 @@ public class DefaultRolloverStrategy extends
AbstractRolloverStrategy {
maxIndex = Integer.MAX_VALUE;
useMax = false;
} else {
- useMax = fileIndex == null ? true :
fileIndex.equalsIgnoreCase("max");
+ useMax = fileIndex == null ||
fileIndex.equalsIgnoreCase("max");
minIndex = MIN_WINDOW_SIZE;
if (min != null) {
minIndex = Integer.parseInt(min);
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
index d12d26a..2921e6a 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java
@@ -95,7 +95,7 @@ public enum FileExtension {
private final String extension;
- private FileExtension(final String extension) {
+ FileExtension(final String extension) {
Objects.requireNonNull(extension, "extension");
this.extension = extension;
}
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
index d7a2c74..5dd0bdc 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
@@ -58,9 +58,8 @@ public class OnStartupTriggeringPolicy extends
AbstractTriggeringPolicy {
final Class<?> runtimeMXBeanClass =
Loader.loadSystemClass("java.lang.management.RuntimeMXBean");
final Method getStartTime =
runtimeMXBeanClass.getMethod("getStartTime");
- final Long result = (Long) getStartTime.invoke(runtimeMXBean);
- return result;
+ return (Long) getStartTime.invoke(runtimeMXBean);
} catch (final Throwable t) {
StatusLogger.getLogger().error("Unable to call
ManagementFactory.getRuntimeMXBean().getStartTime(), "
+ "using system time for OnStartupTriggeringPolicy", t);
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
index 995d8d1..2d99791 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
@@ -95,8 +95,7 @@ public class DeleteAction extends AbstractPathAction {
private List<PathWithAttributes> callScript() throws IOException {
final List<PathWithAttributes> sortedPaths = getSortedPaths();
trace("Sorted paths:", sortedPaths);
- final List<PathWithAttributes> result =
scriptCondition.selectFilesToDelete(getBasePath(), sortedPaths);
- return result;
+ return scriptCondition.selectFilesToDelete(getBasePath(), sortedPaths);
}
private void deleteSelectedFiles(final List<PathWithAttributes>
selectedForDeletion) throws IOException {
@@ -160,8 +159,7 @@ public class DeleteAction extends AbstractPathAction {
List<PathWithAttributes> getSortedPaths() throws IOException {
final SortingVisitor sort = new SortingVisitor(pathSorter);
super.execute(sort);
- final List<PathWithAttributes> sortedPaths = sort.getSortedPaths();
- return sortedPaths;
+ return sort.getSortedPaths();
}
/**
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
index f89d11f..744a3d8 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
@@ -19,12 +19,12 @@ package org.apache.logging.log4j.core.config;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -601,13 +601,9 @@ public abstract class ConfigurationFactory extends
ConfigurationBuilderFactory {
final String[] pairs = configLocations.getQuery().split("&");
for (String pair : pairs) {
final int idx = pair.indexOf("=");
- try {
- final String key = idx > 0 ?
URLDecoder.decode(pair.substring(0, idx), "UTF-8") : pair;
- if (key.equalsIgnoreCase(OVERRIDE_PARAM)) {
- locations.add(URLDecoder.decode(pair.substring(idx
+ 1), "UTF-8"));
- }
- } catch (UnsupportedEncodingException ex) {
- LOGGER.warn("Invalid query parameter in {}",
configLocations);
+ final String key = idx > 0 ?
URLDecoder.decode(pair.substring(0, idx), StandardCharsets.UTF_8) : pair;
+ if (key.equalsIgnoreCase(OVERRIDE_PARAM)) {
+ locations.add(URLDecoder.decode(pair.substring(idx +
1), StandardCharsets.UTF_8));
}
}
return locations.toArray(new String[0]);
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 4db5ce3..439fbe6 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -322,11 +322,7 @@ public class ConfigurationSource {
if (ConfigurationFactory.isClassLoaderUri(configLocation)) {
final ClassLoader loader =
LoaderUtil.getThreadContextClassLoader();
final String path =
ConfigurationFactory.extractClassLoaderUriPath(configLocation);
- final ConfigurationSource source = fromResource(path, loader);
- if (source != null) {
- return source;
- }
- return null;
+ return fromResource(path, loader);
}
if (!configLocation.isAbsolute()) { // LOG4J2-704 avoid confusing
error message thrown by uri.toURL()
ConfigurationFactory.LOGGER.error("File not found in file system
or classpath: {}", configLocation.toString());
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
index 98cf189..6600ae9 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
@@ -71,7 +71,7 @@ public final class ScriptFilter extends AbstractFilter {
bindings.putAll(configuration.getProperties());
bindings.put("substitutor", configuration.getStrSubstitutor());
final Object object =
configuration.getScriptManager().execute(script.getName(), bindings);
- return object == null || !Boolean.TRUE.equals(object) ? onMismatch :
onMatch;
+ return !Boolean.TRUE.equals(object) ? onMismatch : onMatch;
}
@Override
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 d7cbac2..ed9237d 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
@@ -763,10 +763,10 @@ public class Log4jLogEvent implements LogEvent {
if (threadPriority != that.threadPriority) {
return false;
}
- if (thrown != null ? !thrown.equals(that.thrown) : that.thrown !=
null) {
+ if (!Objects.equals(thrown, that.thrown)) {
return false;
}
- if (thrownProxy != null ? !thrownProxy.equals(that.thrownProxy) :
that.thrownProxy != null) {
+ if (!Objects.equals(thrownProxy, that.thrownProxy)) {
return false;
}
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
index ace66ef..b203897 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
@@ -54,7 +54,7 @@ import org.apache.logging.log4j.util.StringMap;
*/
public class ThreadContextDataInjector {
- private static Logger LOGGER = StatusLogger.getLogger();
+ private static final Logger LOGGER = StatusLogger.getLogger();
/**
* ContextDataProviders loaded via OSGi.
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
index cc92d71..26cb705 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
@@ -227,8 +227,7 @@ public final class Server {
private static ContextSelector getContextSelector() {
final LoggerContextFactory factory = LogManager.getFactory();
if (factory instanceof Log4jContextFactory) {
- final ContextSelector selector = ((Log4jContextFactory)
factory).getSelector();
- return selector;
+ return ((Log4jContextFactory) factory).getSelector();
}
return null;
}
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index b94da52..700b81d 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -72,13 +72,13 @@ public final class HtmlLayout extends AbstractStringLayout {
private final DatePatternConverter datePatternConverter;
/**Possible font sizes */
- public static enum FontSize {
+ public enum FontSize {
SMALLER("smaller"), XXSMALL("xx-small"), XSMALL("x-small"),
SMALL("small"), MEDIUM("medium"), LARGE("large"),
XLARGE("x-large"), XXLARGE("xx-large"), LARGER("larger");
private final String size;
- private FontSize(final String size) {
+ FontSize(final String size) {
this.size = size;
}
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/internal/ListChecker.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/internal/ListChecker.java
index e6ba975..f815f44 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/internal/ListChecker.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/internal/ListChecker.java
@@ -22,14 +22,14 @@ package org.apache.logging.log4j.core.layout.internal;
public interface ListChecker {
- static final NoopChecker NOOP_CHECKER = new NoopChecker();
+ NoopChecker NOOP_CHECKER = new NoopChecker();
boolean check(final String key);
/**
* Does nothing.
*/
- public class NoopChecker implements ListChecker {
+ class NoopChecker implements ListChecker {
@Override
public boolean check(final String key) {
return true;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
index 8144e45..6f73341 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
@@ -39,7 +39,7 @@ public enum Rfc1349TrafficClass {
private final int trafficClass;
- private Rfc1349TrafficClass(final int trafficClass) {
+ Rfc1349TrafficClass(final int trafficClass) {
this.trafficClass = trafficClass;
}
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 fa7edfe..a0c013d 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
@@ -145,9 +145,9 @@ public final class DatePatternConverter extends
LogEventPatternConverter impleme
}
private final class CachedTime {
- public long epochSecond;
- public int nanoOfSecond;
- public String formatted;
+ public final long epochSecond;
+ public final int nanoOfSecond;
+ public final String formatted;
public CachedTime(final Instant instant) {
this.epochSecond = instant.getEpochSecond();
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 21c3ffb..5b32dec 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
@@ -76,7 +76,7 @@ public final class PatternParser {
/**
* Max state.
*/
- MAX_STATE;
+ MAX_STATE
}
private static final Logger LOGGER = StatusLogger.getLogger();
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
index bfca654..dd38791 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/CachedClock.java
@@ -41,8 +41,7 @@ public final class CachedClock implements Clock {
@Override
public void run() {
while (true) {
- final long time = System.currentTimeMillis();
- millis = time;
+ millis = System.currentTimeMillis();
// avoid explicit dependency on sun.misc.Util
LockSupport.parkNanos(1000 * 1000);
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
index 4316a59..a37cdd8 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/internal/format/FixedDateFormat.java
@@ -324,11 +324,11 @@ public class FixedDateFormat {
*/
HHCMM(':', true, 6);
- private FixedTimeZoneFormat() {
+ FixedTimeZoneFormat() {
this(NONE, true, 4);
}
- private FixedTimeZoneFormat(final char timeSeparatorChar, final
boolean minutes, final int length) {
+ FixedTimeZoneFormat(final char timeSeparatorChar, final boolean
minutes, final int length) {
this.timeSeparatorChar = timeSeparatorChar;
this.timeSeparatorCharLen = timeSeparatorChar != NONE ? 1 : 0;
this.useMinutes = minutes;
@@ -685,7 +685,7 @@ public class FixedDateFormat {
return pos;
}
- static int[] TABLE = {
+ static final int[] TABLE = {
100000, // 0
10000, // 1
1000, // 2
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
index 6234859..d53bb85 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
@@ -50,7 +50,7 @@ public final class Generate {
static final String PACKAGE_DECLARATION = "package %s;%n%n";
- static enum Type {
+ enum Type {
CUSTOM {
@Override
String imports() {
@@ -1073,10 +1073,7 @@ public final class Generate {
}
static boolean validate(final String[] args) {
- if (args.length < 2) {
- return false;
- }
- return true;
+ return args.length >= 2;
}
private static void usage(final PrintStream out, final Class<?> generator)
{
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
index 7c9daab..ce04f44 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
@@ -361,7 +361,7 @@ public class CommandLine {
* @see RunLast
* @see RunAll
* @since 2.0 */
- public static interface IParseResultHandler {
+ public interface IParseResultHandler {
/** Processes a List of {@code CommandLine} objects resulting from
successfully
* {@linkplain #parse(String...) parsing} the command line arguments
and optionally returns a list of results.
* @param parsedCommands the {@code CommandLine} objects that resulted
from successfully parsing the command line arguments
@@ -384,7 +384,7 @@ public class CommandLine {
* </p>
* @see DefaultExceptionHandler
* @since 2.0 */
- public static interface IExceptionHandler {
+ public interface IExceptionHandler {
/** Handles a {@code ParameterException} that occurred while
{@linkplain #parse(String...) parsing} the command
* line arguments and optionally returns a list of results.
* @param ex the ParameterException describing the problem that
occurred while parsing the command line arguments,
@@ -1747,8 +1747,7 @@ public class CommandLine {
variable = max == Integer.MAX_VALUE;
min = variable ? 0 : max;
}
- Range result = new Range(min, max, variable, unspecified, range);
- return result;
+ return new Range(min, max, variable, unspecified, range);
}
private static int parseInt(String str, int defaultValue) {
try {
@@ -2592,12 +2591,12 @@ public class CommandLine {
Range indexRange = Range.parameterIndex(field);
Help.IParamLabelRenderer labelRenderer =
Help.createMinimalParamLabelRenderer();
String sep = "";
- String names = "";
+ StringBuilder names = new StringBuilder();
int count = 0;
for (int i = indexRange.min; i <
positionalParametersFields.size(); i++) {
if
(Range.parameterArity(positionalParametersFields.get(i)).min > 0) {
- names += sep +
labelRenderer.renderParameterLabel(positionalParametersFields.get(i),
- Help.Ansi.OFF,
Collections.<IStyle>emptyList());
+
names.append(sep).append(labelRenderer.renderParameterLabel(positionalParametersFields.get(i),
+ Help.Ansi.OFF,
Collections.<IStyle>emptyList()));
sep = ", ";
count++;
}
@@ -4257,7 +4256,7 @@ public class CommandLine {
ON,
/** Forced OFF: never emit ANSI escape code regardless of the
platform. */
OFF;
- static Text EMPTY_TEXT = OFF.new Text(0);
+ static final Text EMPTY_TEXT = OFF.new Text(0);
static final boolean isWindows =
System.getProperty("os.name").startsWith("Windows");
static final boolean isXterm = System.getenv("TERM") != null &&
System.getenv("TERM").startsWith("xterm");
static final boolean ISATTY = calcTTY();
@@ -4402,8 +4401,10 @@ public class CommandLine {
public String off() { return CSI + (fgbg + 1) + "m"; }
}
private static class StyledSection {
- int startIndex, length;
- String startStyles, endStyles;
+ final int startIndex;
+ final int length;
+ final String startStyles;
+ final String endStyles;
StyledSection(int start, int len, String style1, String
style2) {
startIndex = start; length = len; startStyles = style1;
endStyles = style2;
}
@@ -4668,8 +4669,8 @@ public class CommandLine {
static TraceLevel lookup(String key) { return key == null ? WARN :
empty(key) || "true".equalsIgnoreCase(key) ? INFO : valueOf(key); }
}
private static class Tracer {
- TraceLevel level =
TraceLevel.lookup(System.getProperty("picocli.trace"));
- PrintStream stream = System.err;
+ private final TraceLevel level =
TraceLevel.lookup(System.getProperty("picocli.trace"));
+ private final PrintStream stream = System.err;
void warn (String msg, Object... params) { TraceLevel.WARN.print(this,
msg, params); }
void info (String msg, Object... params) { TraceLevel.INFO.print(this,
msg, params); }
void debug(String msg, Object... params) {
TraceLevel.DEBUG.print(this, msg, params); }
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
index da580ff..c6816d8 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
@@ -1411,10 +1411,7 @@ public final class CronExpression {
daysToAdd = dow + (7 - cDow);
}
- boolean dayShifted = false;
- if (daysToAdd > 0) {
- dayShifted = true;
- }
+ final boolean dayShifted = daysToAdd > 0;
day += daysToAdd;
int weekOfMonth = day / 7;
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/FormatterLoggerManualExample.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/FormatterLoggerManualExample.java
index 63cd0c7..8370b56 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/FormatterLoggerManualExample.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/FormatterLoggerManualExample.java
@@ -42,7 +42,7 @@ public class FormatterLoggerManualExample {
*/
public static void main(final String[] args) {
try (final LoggerContext ctx =
Configurator.initialize(FormatterLoggerManualExample.class.getName(),
- "target/test-classes/log4j2-console.xml");) {
+ "target/test-classes/log4j2-console.xml")) {
final User user = new User();
logger.debug("User %s with birthday %s", user.getName(),
user.getBirthdayCalendar());
logger.debug("User %1$s with birthday %2$tm %2$te, %2$tY",
user.getName(), user.getBirthdayCalendar());
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
index b397eb2..7ca502a 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
@@ -33,7 +33,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
/**
*
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
index b05b093..615c4e4 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -61,7 +62,7 @@ public class RollingAppenderCronOnceADayTest {
@BeforeClass
public static void beforeClass() throws Exception {
final Path src = FileSystems.getDefault().getPath(TARGET_TEST_CLASSES,
CONFIG);
- String content = new String(Files.readAllBytes(src), UTF_8);
+ String content = new String(Files.readAllBytes(src),
StandardCharsets.UTF_8);
final Calendar cal = Calendar.getInstance();
cal.add(Calendar.SECOND, CRON_DELAY);
remainingTime = cal.getTimeInMillis() - System.currentTimeMillis();
@@ -71,7 +72,7 @@ public class RollingAppenderCronOnceADayTest {
cal.get(Calendar.HOUR_OF_DAY));
content = content.replace("@CRON_EXPR@", cronExpression);
Files.write(FileSystems.getDefault()
- .getPath(TARGET_TEST_CLASSES, CONFIG_TARGET),
content.getBytes(UTF_8));
+ .getPath(TARGET_TEST_CLASSES, CONFIG_TARGET),
content.getBytes(StandardCharsets.UTF_8));
StatusLogger.getLogger().debug("Cron expression will be " +
cronExpression + " in " + remainingTime + "ms");
}
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
index 2be6499..485bba5 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
@@ -36,7 +36,7 @@ import
org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
public class PerfTestDriver {
private static final String DEFAULT_WAIT_STRATEGY = "Block";
- static enum WaitStrategy {
+ enum WaitStrategy {
Sleep, Yield, Block;
public static WaitStrategy get() {
@@ -192,14 +192,14 @@ public class PerfTestDriver {
}
}
- static enum Runner {
+ enum Runner {
Log4j12(RunLog4j1.class), //
Log4j2(RunLog4j2.class), //
Logback(RunLogback.class);
private final Class<? extends IPerfTestRunner> implementationClass;
- private Runner(final Class<? extends IPerfTestRunner> cls) {
+ Runner(final Class<? extends IPerfTestRunner> cls) {
this.implementationClass = cls;
}
}
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
index 43069c6..7102158 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestResultFormatter.java
@@ -151,7 +151,7 @@ class PerfTestResultFormatter {
private Comparator<String> sort() {
return new Comparator<String>() {
- List<String> expected = Arrays.asList("1 thread", "2 threads",
+ final List<String> expected = Arrays.asList("1 thread", "2
threads",
"4 threads", "8 threads", "16 threads", "32 threads",
"64 threads");
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
index 875ec5f..0b06280 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/InMemoryAdvertiser.java
@@ -25,24 +25,24 @@ import org.apache.logging.log4j.core.net.Advertiser;
@Plugin(name = "memory", category = Core.CATEGORY_NAME, elementType =
"advertiser", printObject = false)
public class InMemoryAdvertiser implements Advertiser {
- private static Map<Object, Map<String, String>> properties = new
HashMap<>();
+ private static final Map<Object, Map<String, String>> PROPERTIES = new
HashMap<>();
public static Map<Object, Map<String, String>> getAdvertisedEntries()
{
final Map<Object, Map<String, String>> result = new HashMap<>();
- result.putAll(properties);
+ result.putAll(PROPERTIES);
return result;
}
@Override
public Object advertise(final Map<String, String> newEntry) {
final Object object = new Object();
- properties.put(object, new HashMap<>(newEntry));
+ PROPERTIES.put(object, new HashMap<>(newEntry));
return object;
}
@Override
public void unadvertise(final Object advertisedObject) {
- properties.remove(advertisedObject);
+ PROPERTIES.remove(advertisedObject);
}
}
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
index 37a66f5..6e5e62f 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConvertersTest.java
@@ -152,11 +152,11 @@ public class TypeConvertersTest {
{ "123", "123".getBytes(Charset.defaultCharset()), null,
byte[].class },
{ "0xC773218C7EC8EE99", byteArray, null, byte[].class },
{ "0xc773218c7ec8ee99", byteArray, null, byte[].class },
- { "Base64:cGxlYXN1cmUu", "pleasure.".getBytes("US-ASCII"),
null, byte[].class },
+ { "Base64:cGxlYXN1cmUu",
"pleasure.".getBytes(StandardCharsets.US_ASCII), null, byte[].class },
// JRE
// JRE Charset
{ "UTF-8", StandardCharsets.UTF_8, null, Charset.class },
- { "ASCII", Charset.forName("ASCII"), "UTF-8", Charset.class },
+ { "ASCII", StandardCharsets.US_ASCII, "UTF-8", Charset.class },
{ "Not a real charset", StandardCharsets.UTF_8, "UTF-8",
Charset.class },
{ null, StandardCharsets.UTF_8, "UTF-8", Charset.class },
{ null, null, null, Charset.class },
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
index c76c187..2c1c9a6 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/time/internal/format/FastDateParserTest.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.time.internal.format;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -628,12 +627,12 @@ public class FastDateParserTest {
return cal;
}
- private static enum Expected1806 {
+ private enum Expected1806 {
India(INDIA, "+05", "+0530", "+05:30", true),
Greenwich(GMT, "Z", "Z", "Z", false),
NewYork(NEW_YORK, "-05", "-0500", "-05:00", false);
- private Expected1806(final TimeZone zone, final String one, final
String two, final String three, final boolean hasHalfHourOffset) {
+ Expected1806(final TimeZone zone, final String one, final String two,
final String three, final boolean hasHalfHourOffset) {
this.zone = zone;
this.one = one;
this.two = two;
