Add final modifier to local variables. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/078f8c87 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/078f8c87 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/078f8c87
Branch: refs/heads/master Commit: 078f8c877d7454527f100f4331a5c132e70eeb0c Parents: 7f555c8 Author: Gary Gregory <[email protected]> Authored: Thu Jul 6 03:16:08 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Jul 6 03:16:08 2017 -0700 ---------------------------------------------------------------------- .../log4j/message/ThreadDumpMessage.java | 4 +- .../org/apache/logging/log4j/spi/Provider.java | 2 +- .../apache/logging/log4j/util/Activator.java | 2 +- .../apache/logging/log4j/util/ProviderUtil.java | 4 +- .../log4j/util/SortedArrayStringMap.java | 4 +- .../log4j/message/ThreadDumpMessageTest.java | 2 +- .../logging/log4j/util/PropertiesUtilTest.java | 6 +- .../log4j/util/StackLocatorUtilTest.java | 4 +- .../logging/log4j/util/StringBuildersTest.java | 4 +- .../log4j/core/appender/FileManager.java | 2 +- .../core/appender/HttpURLConnectionManager.java | 12 +- .../log4j/core/appender/SocketAppender.java | 2 +- .../core/appender/mom/kafka/KafkaManager.java | 4 +- .../rolling/AbstractRolloverStrategy.java | 22 +- .../rolling/DefaultRolloverStrategy.java | 30 +- .../rolling/DirectWriteRolloverStrategy.java | 20 +- .../rolling/RollingRandomAccessFileManager.java | 2 +- .../rolling/TimeBasedTriggeringPolicy.java | 2 +- .../rolling/action/CommonsCompressAction.java | 2 +- .../core/config/ConfigurationScheduler.java | 12 +- .../config/plugins/convert/Base64Converter.java | 18 +- .../config/plugins/convert/HexConverter.java | 4 +- .../validators/ValidPortValidator.java | 2 +- .../layout/ByteBufferDestinationHelper.java | 4 +- .../logging/log4j/core/layout/GelfLayout.java | 2 +- .../log4j/core/layout/StringBuilderEncoder.java | 8 +- .../log4j/core/layout/TextEncoderHelper.java | 6 +- .../logging/log4j/core/net/JndiManager.java | 2 +- .../log4j/core/net/ssl/StoreConfiguration.java | 2 +- .../ExtendedThrowablePatternConverter.java | 2 +- .../pattern/RootThrowablePatternConverter.java | 2 +- .../core/pattern/ThrowablePatternConverter.java | 10 +- .../logging/log4j/core/util/CronExpression.java | 10 +- .../logging/log4j/core/util/FileUtils.java | 2 +- .../logging/log4j/core/util/JsonUtils.java | 2 +- .../logging/log4j/core/CronRolloverApp.java | 2 +- .../apache/logging/log4j/core/LogEventTest.java | 2 +- .../appender/AsyncAppenderNoLocationTest.java | 4 +- .../appender/FileAppenderPermissionsTest.java | 8 +- .../FileAppenderPermissionsXmlConfigTest.java | 4 +- .../core/appender/OutputStreamManagerTest.java | 4 +- .../appender/rolling/EligibleFilesTest.java | 6 +- .../RollingAppenderCronEvery2DirectTest.java | 4 +- .../rolling/RollingAppenderCronEvery2Test.java | 4 +- ...lingAppenderSizeCompressPermissionsTest.java | 6 +- .../RollingAppenderSizeNoCompressTest.java | 6 +- .../core/config/CompositeConfigurationTest.java | 6 +- .../log4j/core/config/LoggersPluginTest.java | 2 +- .../config/xml/XmlConigurationSecurity.java | 2 +- .../log4j/core/impl/Log4jLogEventTest.java | 2 +- .../log4j/core/impl/ThrowableProxyTest.java | 20 +- .../log4j/core/layout/GelfLayoutTest2.java | 8 +- .../log4j/core/lookup/StrSubstitutorTest.java | 2 +- .../pattern/ThrowablePatternConverterTest.java | 4 +- .../log4j/core/util/CronExpressionTest.java | 56 +- .../logging/log4j/core/util/JsonUtilsTest.java | 18 +- .../core/util/datetime/FixedDateFormatTest.java | 748 +++++++++---------- .../nosql/appender/cassandra/CassandraRule.java | 6 +- .../log4j/perf/jmh/Log4jLogEventBenchmark.java | 6 +- 59 files changed, 574 insertions(+), 574 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java ---------------------------------------------------------------------- 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 158c8f6..2229948 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 @@ -63,10 +63,10 @@ public class ThreadDumpMessage implements Message, StringBuilderFormattable { } private static ThreadInfoFactory initFactory(final ClassLoader classLoader) { - ServiceLoader<ThreadInfoFactory> serviceLoader = ServiceLoader.load(ThreadInfoFactory.class, classLoader); + final ServiceLoader<ThreadInfoFactory> serviceLoader = ServiceLoader.load(ThreadInfoFactory.class, classLoader); ThreadInfoFactory result = null; try { - Iterator<ThreadInfoFactory> iterator = serviceLoader.iterator(); + final Iterator<ThreadInfoFactory> iterator = serviceLoader.iterator(); while (result == null && iterator.hasNext()) { result = iterator.next(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java ---------------------------------------------------------------------- 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 e610398..7882410 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 @@ -192,7 +192,7 @@ public class Provider { @Override public String toString() { - StringBuilder result = new StringBuilder("Provider["); + final StringBuilder result = new StringBuilder("Provider["); if (!DEFAULT_PRIORITY.equals(priority)) { result.append("priority=").append(priority).append(", "); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java index f37bc44..c35dd21 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java @@ -84,7 +84,7 @@ public class Activator implements BundleActivator, SynchronousBundleListener { ProviderUtil.STARTUP_LOCK.lock(); lockingProviderUtil = true; final BundleWiring self = context.getBundle().adapt(BundleWiring.class); - List<BundleWire> required = self.getRequiredWires(LoggerContextFactory.class.getName()); + final List<BundleWire> required = self.getRequiredWires(LoggerContextFactory.class.getName()); for (final BundleWire wire : required) { loadProvider(wire.getProviderWiring()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java ---------------------------------------------------------------------- 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 b5be525..3bb5ad4 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 @@ -90,8 +90,8 @@ public final class ProviderUtil { } protected static void loadProviders(final ClassLoader cl) { - ServiceLoader<Provider> serviceLoader = ServiceLoader.load(Provider.class, cl); - for (Provider provider : serviceLoader) { + final ServiceLoader<Provider> serviceLoader = ServiceLoader.load(Provider.class, cl); + for (final Provider provider : serviceLoader) { if (validVersion(provider.getVersions())) { PROVIDERS.add(provider); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java ---------------------------------------------------------------------- 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 2a78b4e..621d18a 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 @@ -501,7 +501,7 @@ public class SortedArrayStringMap implements IndexedStringMap { if (obj == null) { return null; } - ByteArrayOutputStream bout = new ByteArrayOutputStream(); + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); try (ObjectOutputStream oos = new ObjectOutputStream(bout)) { oos.writeObject(obj); oos.flush(); @@ -510,7 +510,7 @@ public class SortedArrayStringMap implements IndexedStringMap { } private static Object unmarshall(final byte[] data) throws IOException, ClassNotFoundException { - ByteArrayInputStream bin = new ByteArrayInputStream(data); + final ByteArrayInputStream bin = new ByteArrayInputStream(data); try (ObjectInputStream ois = new ObjectInputStream(bin)) { return ois.readObject(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java index 451f712..8668d0a 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ThreadDumpMessageTest.java @@ -159,7 +159,7 @@ public class ThreadDumpMessageTest { started.countDown(); try { keepAlive.await(); - } catch (InterruptedException e) { + } catch (final InterruptedException e) { // ignored } finished = true; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java index f25162e..7a256e0 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java @@ -69,17 +69,17 @@ public class PropertiesUtilTest { @Test public void testGetCharsetProperty() throws Exception { - Properties p = new Properties(); + final Properties p = new Properties(); p.setProperty("e.1", StandardCharsets.US_ASCII.name()); p.setProperty("e.2", "wrong-charset-name"); - PropertiesUtil pu = new PropertiesUtil(p); + final PropertiesUtil pu = new PropertiesUtil(p); assertEquals(Charset.defaultCharset(), pu.getCharsetProperty("e.0")); assertEquals(StandardCharsets.US_ASCII, pu.getCharsetProperty("e.1")); try { pu.getCharsetProperty("e.2"); fail("No expected UnsupportedCharsetException"); - } catch (UnsupportedCharsetException ignored) { + } catch (final UnsupportedCharsetException ignored) { } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java index 83f19eb..abade29 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java @@ -91,8 +91,8 @@ public class StackLocatorUtilTest { @Test public void testLocateClass() { - ClassLocator locator = new ClassLocator(); - Class<?> clazz = locator.locateClass(); + final ClassLocator locator = new ClassLocator(); + final Class<?> clazz = locator.locateClass(); assertNotNull("Could not locate class", clazz); assertEquals("Incorrect class", this.getClass(), clazz); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java index 061cb8c..24d0e93 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/StringBuildersTest.java @@ -26,8 +26,8 @@ import static org.junit.Assert.*; public class StringBuildersTest { @Test public void trimToMaxSize() throws Exception { - StringBuilder sb = new StringBuilder(); - char[] value = new char[4 * 1024]; + final StringBuilder sb = new StringBuilder(); + final char[] value = new char[4 * 1024]; sb.append(value); assertTrue("needs trimming", sb.length() > Constants.MAX_REUSABLE_MESSAGE_SIZE); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java index 087dc5f..2898c7f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java @@ -420,7 +420,7 @@ public class FileManager extends OutputStreamManager { final int actualSize = data.bufferedIo ? data.bufferSize : Constants.ENCODER_BYTE_BUFFER_SIZE; final ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[actualSize]); final FileOutputStream fos = data.createOnDemand ? null : new FileOutputStream(file, data.append); - FileManager fm = new FileManager(data.getLoggerContext(), name, fos, data.append, data.locking, + final FileManager fm = new FileManager(data.getLoggerContext(), name, fos, data.append, data.locking, data.createOnDemand, data.advertiseURI, data.layout, data.filePermissions, data.fileOwner, data.fileGroup, writeHeader, byteBuffer); if (fos != null && fm.attributeViewEnabled) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java ---------------------------------------------------------------------- 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 80aec97..949eb64 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 @@ -75,7 +75,7 @@ public class HttpURLConnectionManager extends HttpManager { @Override public void send(final Layout<?> layout, final LogEvent event) throws IOException { - HttpURLConnection urlConnection = (HttpURLConnection)url.openConnection(); + final HttpURLConnection urlConnection = (HttpURLConnection)url.openConnection(); urlConnection.setAllowUserInteraction(false); urlConnection.setDoOutput(true); urlConnection.setDoInput(true); @@ -89,7 +89,7 @@ public class HttpURLConnectionManager extends HttpManager { if (layout.getContentType() != null) { urlConnection.setRequestProperty("Content-Type", layout.getContentType()); } - for (Property header : headers) { + for (final Property header : headers) { urlConnection.setRequestProperty( header.getName(), header.isValueNeedsLookup() ? getConfiguration().getStrSubstitutor().replace(event, header.getValue()) : header.getValue()); @@ -101,20 +101,20 @@ public class HttpURLConnectionManager extends HttpManager { ((HttpsURLConnection)urlConnection).setHostnameVerifier(LaxHostnameVerifier.INSTANCE); } - byte[] msg = layout.toByteArray(event); + final byte[] msg = layout.toByteArray(event); urlConnection.setFixedLengthStreamingMode(msg.length); urlConnection.connect(); try (OutputStream os = urlConnection.getOutputStream()) { os.write(msg); } - byte[] buffer = new byte[1024]; + final byte[] buffer = new byte[1024]; try (InputStream is = urlConnection.getInputStream()) { while (IOUtils.EOF != is.read(buffer)) { ; } - } catch (IOException e) { - StringBuilder errorMessage = new StringBuilder(); + } catch (final IOException e) { + final StringBuilder errorMessage = new StringBuilder(); try (InputStream es = urlConnection.getErrorStream()) { errorMessage.append(urlConnection.getResponseCode()); if (urlConnection.getResponseMessage() != null) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java index b433403..28da524 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java @@ -194,7 +194,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM public SocketAppender build() { boolean immediateFlush = isImmediateFlush(); final boolean bufferedIo = isBufferedIo(); - Layout<? extends Serializable> layout = getLayout(); + final Layout<? extends Serializable> layout = getLayout(); if (layout == null) { AbstractLifeCycle.LOGGER.error("No layout provided for SocketAppender"); return null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java index fde5ae4..2cfd366 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java @@ -96,9 +96,9 @@ public class KafkaManager extends AbstractManager { public void send(final byte[] msg) throws ExecutionException, InterruptedException, TimeoutException { if (producer != null) { - ProducerRecord<byte[], byte[]> newRecord = new ProducerRecord<>(topic, msg); + final ProducerRecord<byte[], byte[]> newRecord = new ProducerRecord<>(topic, msg); if (syncSend) { - Future<RecordMetadata> response = producer.send(newRecord); + final Future<RecordMetadata> response = producer.send(newRecord); response.get(timeoutMillis, TimeUnit.MILLISECONDS); } else { producer.send(newRecord, new Callback() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java index 42c8509..741afb8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java @@ -87,7 +87,7 @@ public abstract class AbstractRolloverStrategy implements RolloverStrategy { protected SortedMap<Integer, Path> getEligibleFiles(final RollingFileManager manager, final boolean isAscending) { final StringBuilder buf = new StringBuilder(); - String pattern = manager.getPatternProcessor().getPattern(); + final String pattern = manager.getPatternProcessor().getPattern(); manager.getPatternProcessor().formatFileName(strSubstitutor, buf, NotANumber.NAN); return getEligibleFiles(buf.toString(), pattern, isAscending); } @@ -97,8 +97,8 @@ public abstract class AbstractRolloverStrategy implements RolloverStrategy { } protected SortedMap<Integer, Path> getEligibleFiles(final String path, final String logfilePattern, final boolean isAscending) { - TreeMap<Integer, Path> eligibleFiles = new TreeMap<>(); - File file = new File(path); + final TreeMap<Integer, Path> eligibleFiles = new TreeMap<>(); + final File file = new File(path); File parent = file.getParentFile(); if (parent == null) { parent = new File("."); @@ -108,24 +108,24 @@ public abstract class AbstractRolloverStrategy implements RolloverStrategy { if (!logfilePattern.contains("%i")) { return eligibleFiles; } - Path dir = parent.toPath(); + final Path dir = parent.toPath(); String fileName = file.getName(); - int suffixLength = suffixLength(fileName); + final int suffixLength = suffixLength(fileName); if (suffixLength > 0) { fileName = fileName.substring(0, fileName.length() - suffixLength) + ".*"; } - String filePattern = fileName.replace(NotANumber.VALUE, "(\\d+)"); - Pattern pattern = Pattern.compile(filePattern); + final String filePattern = fileName.replace(NotANumber.VALUE, "(\\d+)"); + final Pattern pattern = Pattern.compile(filePattern); try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) { - for (Path entry: stream) { - Matcher matcher = pattern.matcher(entry.toFile().getName()); + for (final Path entry: stream) { + final Matcher matcher = pattern.matcher(entry.toFile().getName()); if (matcher.matches()) { - Integer index = Integer.parseInt(matcher.group(1)); + final Integer index = Integer.parseInt(matcher.group(1)); eligibleFiles.put(index, entry); } } - } catch (IOException ioe) { + } catch (final IOException ioe) { throw new LoggingException("Error reading folder " + dir + " " + ioe.getMessage(), ioe); } return isAscending? eligibleFiles : eligibleFiles.descendingMap(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java ---------------------------------------------------------------------- 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 a8f4a2e..480c3f7 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 @@ -416,29 +416,29 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { while (eligibleFiles.size() >= maxFiles) { try { LOGGER.debug("Eligible files: {}", eligibleFiles); - Integer key = eligibleFiles.firstKey(); + final Integer key = eligibleFiles.firstKey(); LOGGER.debug("Deleting {}", eligibleFiles.get(key).toFile().getAbsolutePath()); Files.delete(eligibleFiles.get(key)); eligibleFiles.remove(key); renameFiles = true; - } catch (IOException ioe) { + } catch (final IOException ioe) { LOGGER.error("Unable to delete {}, {}", eligibleFiles.firstKey(), ioe.getMessage(), ioe); break; } } final StringBuilder buf = new StringBuilder(); if (renameFiles) { - for (Map.Entry<Integer, Path> entry : eligibleFiles.entrySet()) { + for (final Map.Entry<Integer, Path> entry : eligibleFiles.entrySet()) { buf.setLength(0); // LOG4J2-531: directory scan & rollover must use same format manager.getPatternProcessor().formatFileName(strSubstitutor, buf, entry.getKey() - 1); - String currentName = entry.getValue().toFile().getName(); + final String currentName = entry.getValue().toFile().getName(); String renameTo = buf.toString(); - int suffixLength = suffixLength(renameTo); + final int suffixLength = suffixLength(renameTo); if (suffixLength > 0 && suffixLength(currentName) == 0) { renameTo = renameTo.substring(0, renameTo.length() - suffixLength); } - Action action = new FileRenameAction(entry.getValue().toFile(), new File(renameTo), true); + final Action action = new FileRenameAction(entry.getValue().toFile(), new File(renameTo), true); try { LOGGER.debug("DefaultRolloverStrategy.purgeAscending executing {}", action); if (!action.execute()) { @@ -471,26 +471,26 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { while (eligibleFiles.size() >= maxFiles) { try { - Integer key = eligibleFiles.firstKey(); + final Integer key = eligibleFiles.firstKey(); Files.delete(eligibleFiles.get(key)); eligibleFiles.remove(key); - } catch (IOException ioe) { + } catch (final IOException ioe) { LOGGER.error("Unable to delete {}, {}", eligibleFiles.firstKey(), ioe.getMessage(), ioe); break; } } final StringBuilder buf = new StringBuilder(); - for (Map.Entry<Integer, Path> entry : eligibleFiles.entrySet()) { + for (final Map.Entry<Integer, Path> entry : eligibleFiles.entrySet()) { buf.setLength(0); // LOG4J2-531: directory scan & rollover must use same format manager.getPatternProcessor().formatFileName(strSubstitutor, buf, entry.getKey() + 1); - String currentName = entry.getValue().toFile().getName(); + final String currentName = entry.getValue().toFile().getName(); String renameTo = buf.toString(); - int suffixLength = suffixLength(renameTo); + final int suffixLength = suffixLength(renameTo); if (suffixLength > 0 && suffixLength(currentName) == 0) { renameTo = renameTo.substring(0, renameTo.length() - suffixLength); } - Action action = new FileRenameAction(entry.getValue().toFile(), new File(renameTo), true); + final Action action = new FileRenameAction(entry.getValue().toFile(), new File(renameTo), true); try { LOGGER.debug("DefaultRolloverStrategy.purgeDescending executing {}", action); if (!action.execute()) { @@ -540,14 +540,14 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { final String compressedName = renameTo; Action compressAction = null; - FileExtension fileExtension = manager.getFileExtension(); + final FileExtension fileExtension = manager.getFileExtension(); if (fileExtension != null) { final File renameToFile = new File(renameTo); renameTo = renameTo.substring(0, renameTo.length() - fileExtension.length()); if (tempCompressedFilePattern != null) { buf.delete(0, buf.length()); tempCompressedFilePattern.formatFileName(strSubstitutor, buf, fileIndex); - String tmpCompressedName = buf.toString(); + final String tmpCompressedName = buf.toString(); final File tmpCompressedNameFile = new File(tmpCompressedName); if (tmpCompressedNameFile.getParentFile() != null) { tmpCompressedNameFile.getParentFile().mkdirs(); @@ -572,7 +572,7 @@ public class DefaultRolloverStrategy extends AbstractRolloverStrategy { if (compressAction != null && manager.isAttributeViewEnabled()) { // Propagate posix attribute view to compressed file // @formatter:off - Action posixAttributeViewAction = PosixViewAttributeAction.newBuilder() + final Action posixAttributeViewAction = PosixViewAttributeAction.newBuilder() .withBasePath(compressedName) .withFollowLinks(false) .withMaxDepth(1) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java index 6209460..8c30738 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java @@ -294,14 +294,14 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem } private int purge(final RollingFileManager manager) { - SortedMap<Integer, Path> eligibleFiles = getEligibleFiles(manager); + final SortedMap<Integer, Path> eligibleFiles = getEligibleFiles(manager); LOGGER.debug("Found {} eligible files, max is {}", eligibleFiles.size(), maxFiles); while (eligibleFiles.size() >= maxFiles) { try { - Integer key = eligibleFiles.firstKey(); + final Integer key = eligibleFiles.firstKey(); Files.delete(eligibleFiles.get(key)); eligibleFiles.remove(key); - } catch (IOException ioe) { + } catch (final IOException ioe) { LOGGER.error("Unable to delete {}", eligibleFiles.firstKey(), ioe); break; } @@ -312,12 +312,12 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem @Override public String getCurrentFileName(final RollingFileManager manager) { if (currentFileName == null) { - SortedMap<Integer, Path> eligibleFiles = getEligibleFiles(manager); + final SortedMap<Integer, Path> eligibleFiles = getEligibleFiles(manager); final int fileIndex = eligibleFiles.size() > 0 ? (nextIndex > 0 ? nextIndex : eligibleFiles.size()) : 1; final StringBuilder buf = new StringBuilder(255); manager.getPatternProcessor().formatFileName(strSubstitutor, buf, true, fileIndex); - int suffixLength = suffixLength(buf.toString()); - String name = suffixLength > 0 ? buf.substring(0, buf.length() - suffixLength) : buf.toString(); + final int suffixLength = suffixLength(buf.toString()); + final String name = suffixLength > 0 ? buf.substring(0, buf.length() - suffixLength) : buf.toString(); currentFileName = name; } return currentFileName; @@ -347,13 +347,13 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem String compressedName = sourceName; currentFileName = null; nextIndex = fileIndex + 1; - FileExtension fileExtension = manager.getFileExtension(); + final FileExtension fileExtension = manager.getFileExtension(); if (fileExtension != null) { compressedName += fileExtension.getExtension(); if (tempCompressedFilePattern != null) { - StringBuilder buf = new StringBuilder(); + final StringBuilder buf = new StringBuilder(); tempCompressedFilePattern.formatFileName(strSubstitutor, buf, fileIndex); - String tmpCompressedName = buf.toString(); + final String tmpCompressedName = buf.toString(); final File tmpCompressedNameFile = new File(tmpCompressedName); if (tmpCompressedNameFile.getParentFile() != null) { tmpCompressedNameFile.getParentFile().mkdirs(); @@ -373,7 +373,7 @@ public class DirectWriteRolloverStrategy extends AbstractRolloverStrategy implem if (compressAction != null && manager.isAttributeViewEnabled()) { // Propagate posix attribute view to compressed file // @formatter:off - Action posixAttributeViewAction = PosixViewAttributeAction.newBuilder() + final Action posixAttributeViewAction = PosixViewAttributeAction.newBuilder() .withBasePath(compressedName) .withFollowLinks(false) .withMaxDepth(1) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java index f9943ab..b203fd2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java @@ -204,7 +204,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager { LOGGER.trace("RandomAccessFile {} set length to 0", name); raf.setLength(0); } - RollingRandomAccessFileManager rrm = new RollingRandomAccessFileManager(data.getLoggerContext(), raf, name, data.pattern, + final RollingRandomAccessFileManager rrm = new RollingRandomAccessFileManager(data.getLoggerContext(), raf, name, data.pattern, NullOutputStream.getInstance(), data.append, data.immediateFlush, data.bufferSize, size, time, data.policy, data.strategy, data.advertiseURI, data.layout, data.filePermissions, data.fileOwner, data.fileGroup, writeHeader); if (rrm.isAttributeViewEnabled()) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java index 2c1ab5f..7f6ac79 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java @@ -47,7 +47,7 @@ public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy { @Override public TimeBasedTriggeringPolicy build() { - long maxRandomDelayMillis = TimeUnit.SECONDS.toMillis(maxRandomDelay); + final long maxRandomDelayMillis = TimeUnit.SECONDS.toMillis(maxRandomDelay); return new TimeBasedTriggeringPolicy(interval, modulate, maxRandomDelayMillis); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java index f0b5dd2..cc88a4b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/CommonsCompressAction.java @@ -120,7 +120,7 @@ public final class CommonsCompressAction extends AbstractAction { } else { LOGGER.warn("Unable to delete {} after {} compression. File did not exist", source.toString(), name); } - } catch (Exception ex) { + } catch (final Exception ex) { LOGGER.warn("Unable to delete {} after {} compression, {}", source.toString(), name, ex.getMessage()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java index 184414b..6ffb29d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java @@ -186,7 +186,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle { if (scheduledItems > 0) { LOGGER.debug("{} starting {} threads", SIMPLE_NAME, scheduledItems); scheduledItems = Math.min(scheduledItems, MAX_SCHEDULED_ITEMS); - ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(scheduledItems, + final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(scheduledItems, Log4jThreadFactory.createDaemonThreadFactory("Scheduled")); executor.setContinueExistingPeriodicTasksAfterShutdownPolicy(false); executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); @@ -217,12 +217,12 @@ public class ConfigurationScheduler extends AbstractLifeCycle { @Override public void run() { try { - long millis = scheduledFuture.getFireTime().getTime() - System.currentTimeMillis(); + final long millis = scheduledFuture.getFireTime().getTime() - System.currentTimeMillis(); if (millis > 0) { LOGGER.debug("Cron thread woke up {} millis early. Sleeping", millis); try { Thread.sleep(millis); - } catch (InterruptedException ie) { + } catch (final InterruptedException ie) { // Ignore the interruption. } } @@ -246,10 +246,10 @@ public class ConfigurationScheduler extends AbstractLifeCycle { @Override public String toString() { - StringBuilder sb = new StringBuilder("ConfigurationScheduler {"); - Queue<Runnable> queue = ((ScheduledThreadPoolExecutor) executorService).getQueue(); + final StringBuilder sb = new StringBuilder("ConfigurationScheduler {"); + final Queue<Runnable> queue = ((ScheduledThreadPoolExecutor) executorService).getQueue(); boolean first = true; - for (Runnable runnable : queue) { + for (final Runnable runnable : queue) { if (!first) { sb.append(", "); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java index f5aa603..c77797c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java @@ -20,17 +20,17 @@ public class Base64Converter { try { // Base64 is available in Java 8 and up. Class<?> clazz = LoaderUtil.loadClass("java.util.Base64"); - Method getDecoder = clazz.getMethod("getDecoder", null); + final Method getDecoder = clazz.getMethod("getDecoder", null); decoder = getDecoder.invoke(null, null); clazz = decoder.getClass(); method = clazz.getMethod("decode", String.class); - } catch (ClassNotFoundException ex) { + } catch (final ClassNotFoundException ex) { - } catch (NoSuchMethodException ex) { + } catch (final NoSuchMethodException ex) { - } catch (IllegalAccessException ex) { + } catch (final IllegalAccessException ex) { - } catch (InvocationTargetException ex) { + } catch (final InvocationTargetException ex) { } if (method == null) { @@ -38,9 +38,9 @@ public class Base64Converter { // DatatypeConverter is not in the default module in Java 9. final Class<?> clazz = LoaderUtil.loadClass("javax.xml.bind.DatatypeConverter"); method = clazz.getMethod("parseBase64Binary", String.class); - } catch (ClassNotFoundException ex) { + } catch (final ClassNotFoundException ex) { LOGGER.error("No Base64 Converter is available"); - } catch (NoSuchMethodException ex) { + } catch (final NoSuchMethodException ex) { } } @@ -52,9 +52,9 @@ public class Base64Converter { } else { try { return (byte[]) method.invoke(decoder, encoded); - } catch (IllegalAccessException ex) { + } catch (final IllegalAccessException ex) { LOGGER.error("Error decoding string - " + ex.getMessage()); - } catch (InvocationTargetException ex) { + } catch (final InvocationTargetException ex) { LOGGER.error("Error decoding string - " + ex.getMessage()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java index 210fcb4..63dc294 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/HexConverter.java @@ -7,8 +7,8 @@ package org.apache.logging.log4j.core.config.plugins.convert; public class HexConverter { public static byte[] parseHexBinary(final String s) { - int len = s.length(); - byte[] data = new byte[len / 2]; + final int len = s.length(); + final byte[] data = new byte[len / 2]; for (int i = 0; i < len; i += 2) { data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i+1), 16)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidator.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidator.java index de61bbb..a59742c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/validation/validators/ValidPortValidator.java @@ -47,7 +47,7 @@ public class ValidPortValidator implements ConstraintValidator<ValidPort> { LOGGER.error(annotation.message()); return false; } - int port = (int) value; + final int port = (int) value; if (port < 0 || port > 65535) { LOGGER.error(annotation.message()); return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java index d91ecfd..5a7ed5a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestinationHelper.java @@ -38,7 +38,7 @@ public final class ByteBufferDestinationHelper { public static void writeToUnsynchronized(final ByteBuffer source, final ByteBufferDestination destination) { ByteBuffer destBuff = destination.getByteBuffer(); while (source.remaining() > destBuff.remaining()) { - int originalLimit = source.limit(); + final int originalLimit = source.limit(); source.limit(Math.min(source.limit(), source.position() + destBuff.remaining())); destBuff.put(source); source.limit(originalLimit); @@ -61,7 +61,7 @@ public final class ByteBufferDestinationHelper { final ByteBufferDestination destination) { ByteBuffer buffer = destination.getByteBuffer(); while (length > buffer.remaining()) { - int chunk = buffer.remaining(); + final int chunk = buffer.remaining(); buffer.put(data, offset, chunk); offset += chunk; length -= chunk; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java index aeb523f..45c5f4f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java @@ -248,7 +248,7 @@ public final class GelfLayout extends AbstractStringLayout { this.host = host != null ? host : NetUtils.getLocalHostname(); this.additionalFields = additionalFields != null ? additionalFields : new KeyValuePair[0]; if (config == null) { - for (KeyValuePair additionalField : this.additionalFields) { + for (final KeyValuePair additionalField : this.additionalFields) { if (valueNeedsLookup(additionalField.getValue())) { throw new IllegalArgumentException("configuration needs to be set when there are additional fields with variables"); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java index 76aa016..fb02393 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java @@ -61,10 +61,10 @@ public class StringBuilderEncoder implements Encoder<StringBuilder> { @Override public void encode(final StringBuilder source, final ByteBufferDestination destination) { try { - Object[] threadLocalState = getThreadLocalState(); - CharsetEncoder charsetEncoder = (CharsetEncoder) threadLocalState[0]; - CharBuffer charBuffer = (CharBuffer) threadLocalState[1]; - ByteBuffer byteBuffer = (ByteBuffer) threadLocalState[2]; + final Object[] threadLocalState = getThreadLocalState(); + final CharsetEncoder charsetEncoder = (CharsetEncoder) threadLocalState[0]; + final CharBuffer charBuffer = (CharBuffer) threadLocalState[1]; + final ByteBuffer byteBuffer = (ByteBuffer) threadLocalState[2]; TextEncoderHelper.encodeText(charsetEncoder, charBuffer, byteBuffer, source, destination); } catch (final Exception ex) { logEncodeTextException(ex, source, destination); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java index 69cf8f2..327386f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java @@ -61,7 +61,7 @@ public class TextEncoderHelper { charBuf.clear(); text.getChars(0, text.length(), charBuf.array(), charBuf.arrayOffset()); charBuf.limit(text.length()); - CoderResult result = charsetEncoder.encode(charBuf, byteBuf, true); + final CoderResult result = charsetEncoder.encode(charBuf, byteBuf, true); writeEncodedText(charsetEncoder, charBuf, byteBuf, destination, result); } @@ -212,7 +212,7 @@ public class TextEncoderHelper { private static void throwException(final CoderResult result) { try { result.throwException(); - } catch (CharacterCodingException e) { + } catch (final CharacterCodingException e) { throw new IllegalStateException(e); } } @@ -250,7 +250,7 @@ public class TextEncoderHelper { // all callers already synchronize on destination but for safety ensure we are synchronized because // below calls to drain() may cause destination to swap in a new ByteBuffer object synchronized (destination) { - ByteBuffer destinationBuffer = destination.getByteBuffer(); + final ByteBuffer destinationBuffer = destination.getByteBuffer(); if (destinationBuffer != temp) { temp.flip(); ByteBufferDestinationHelper.writeToUnsynchronized(temp, destination); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java index 2384680..22ab3aa 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java @@ -82,7 +82,7 @@ public class JndiManager extends AbstractManager { final String securityPrincipal, final String securityCredentials, final Properties additionalProperties) { - Properties properties = createProperties(initialContextFactoryName, providerURL, urlPkgPrefixes, + final Properties properties = createProperties(initialContextFactoryName, providerURL, urlPkgPrefixes, securityPrincipal, securityCredentials, additionalProperties); return getManager(createManagerName(), FACTORY, properties); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java index bbdbe72..c298c9a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java @@ -81,7 +81,7 @@ public class StoreConfiguration<T> { if (getClass() != obj.getClass()) { return false; } - StoreConfiguration other = (StoreConfiguration) obj; + final StoreConfiguration other = (StoreConfiguration) obj; if (location == null) { if (other.location != null) { return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java index abbe338..0105f3c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java @@ -68,7 +68,7 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon super.format(event, toAppendTo); return; } - String suffix = getSuffix(event); + final String suffix = getSuffix(event); final String extStackTrace = proxy.getExtendedStackTraceAsString(options.getIgnorePackages(), options.getTextRenderer(), suffix); final int len = toAppendTo.length(); if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len - 1))) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java index 80beaf6..7a6acd5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverter.java @@ -68,7 +68,7 @@ public final class RootThrowablePatternConverter extends ThrowablePatternConvert super.format(event, toAppendTo); return; } - String suffix = getSuffix(event); + final String suffix = getSuffix(event); final String trace = proxy.getCauseStackTraceAsString(options.getIgnorePackages(), suffix); final int len = toAppendTo.length(); if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len - 1))) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java index 8e6a562..b14aad3 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java @@ -62,10 +62,10 @@ public class ThrowablePatternConverter extends LogEventPatternConverter { } if (this.options.getSuffix() != null) { final PatternParser parser = PatternLayout.createPatternParser(config); - List<PatternFormatter> parsedFormatters = parser.parse(this.options.getSuffix()); + final List<PatternFormatter> parsedFormatters = parser.parse(this.options.getSuffix()); // filter out nested formatters that will handle throwable boolean hasThrowableFormatter = false; - for (PatternFormatter formatter : parsedFormatters) { + for (final PatternFormatter formatter : parsedFormatters) { if (formatter.handlesThrowable()) { hasThrowableFormatter = true; } @@ -73,8 +73,8 @@ public class ThrowablePatternConverter extends LogEventPatternConverter { if (!hasThrowableFormatter) { this.formatters = parsedFormatters; } else { - List<PatternFormatter> formatters = new ArrayList<>(); - for (PatternFormatter formatter : parsedFormatters) { + final List<PatternFormatter> formatters = new ArrayList<>(); + for (final PatternFormatter formatter : parsedFormatters) { if (!formatter.handlesThrowable()) { formatters.add(formatter); } @@ -213,7 +213,7 @@ public class ThrowablePatternConverter extends LogEventPatternConverter { protected String getSuffix(final LogEvent event) { //noinspection ForLoopReplaceableByForEach - StringBuilder toAppendTo = new StringBuilder(); + final StringBuilder toAppendTo = new StringBuilder(); for (int i = 0, size = formatters.size(); i < size; i++) { formatters.get(i).format(event, toAppendTo); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java ---------------------------------------------------------------------- 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 f6ab76e..3c1dfc8 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 @@ -1570,14 +1570,14 @@ public final class CronExpression { } protected Date getTimeBefore(final Date targetDate) { - Calendar cl = Calendar.getInstance(getTimeZone()); + final Calendar cl = Calendar.getInstance(getTimeZone()); // to match this Date start = targetDate; - long minIncrement = findMinIncrement(); + final long minIncrement = findMinIncrement(); Date prevFireTime; do { - Date prevCheckDate = new Date(start.getTime() - minIncrement); + final Date prevCheckDate = new Date(start.getTime() - minIncrement); prevFireTime = getTimeAfter(prevCheckDate); if (prevFireTime == null || prevFireTime.before(MIN_DATE)) { return null; @@ -1614,13 +1614,13 @@ public final class CronExpression { int previous = 0; int min = Integer.MAX_VALUE; boolean first = true; - for (int value : set) { + for (final int value : set) { if (first) { previous = value; first = false; continue; } else { - int diff = value - previous; + final int diff = value - previous; if (diff < min) { min = diff; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java index c486d64..92578a6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java @@ -140,7 +140,7 @@ public final class FileUtils { * @throws IOException */ public static void makeParentDirs(final File file) throws IOException { - File parent = Objects.requireNonNull(file, "file").getCanonicalFile().getParentFile(); + final File parent = Objects.requireNonNull(file, "file").getCanonicalFile().getParentFile(); if (parent != null) { mkdir(parent, true); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java index ae18cc6..c23f4b3 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java @@ -31,7 +31,7 @@ public final class JsonUtils { */ private static final int[] ESC_CODES; static { - int[] table = new int[128]; + final int[] table = new int[128]; // Control chars need generic escape sequence for (int i = 0; i < 32; ++i) { // 04-Mar-2011, tatu: Used to use "-(i + 1)", replaced with constant http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java index 66f87bb..d149148 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/CronRolloverApp.java @@ -35,7 +35,7 @@ public class CronRolloverApp { logger.info("Hello"); Thread.sleep(1 * 1000); } - } catch (Exception e) { + } catch (final Exception e) { //e.printStackTrace(); logger.error("Excepcion general", e); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java index d2abfea..8a02d53 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventTest.java @@ -154,7 +154,7 @@ public class LogEventTest { @Test public void testLocation() { - StackTraceElement ste = TESTER.getEventSource(this.getClass().getName()); + final StackTraceElement ste = TESTER.getEventSource(this.getClass().getName()); assertNotNull("No StackTraceElement", ste); assertEquals("Incorrect event", this.getClass().getName(), ste.getClassName()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java index 17865a8..fdc95e9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java @@ -41,7 +41,7 @@ public class AsyncAppenderNoLocationTest { static { try { init = new LoggerContextRule("log4j-asynch-no-location.xml"); - } catch (Exception ex) { + } catch (final Exception ex) { ex.printStackTrace(); } } @@ -51,7 +51,7 @@ public class AsyncAppenderNoLocationTest { try { this.app = (ListAppender) init.getAppender("List"); assertNotNull("No List appender found", app); - } catch (Exception ex) { + } catch (final Exception ex) { System.out.println("init = " + init == null ? "null" : init); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java index 9e84726..8f67a27 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsTest.java @@ -135,9 +135,9 @@ public class FileAppenderPermissionsTest { public void testFileUserGroupAPI() throws Exception { final File file = new File(DIR, "AppenderTest-" + (1000 + fileIndex) + ".log"); final Path path = file.toPath(); - String user = findAUser(); + final String user = findAUser(); assertNotNull(user); - String group = findAGroup(user); + final String group = findAGroup(user); assertNotNull(group); final Layout<String> layout = PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) @@ -190,9 +190,9 @@ public class FileAppenderPermissionsTest { public static String findAGroup(final String user) throws IOException { String group = user; try (FileInputStream fis = new FileInputStream("/etc/group")) { - List<String> groups = org.apache.commons.io.IOUtils.readLines(fis, Charset.defaultCharset()); + final List<String> groups = org.apache.commons.io.IOUtils.readLines(fis, Charset.defaultCharset()); for (int i = 0; i < groups.size(); i++) { - String aGroup = groups.get(i); + final String aGroup = groups.get(i); if (!aGroup.startsWith(user) && aGroup.contains(user)) { group = aGroup.split(":")[0]; break; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java index 941e785..b041aa6 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderPermissionsXmlConfigTest.java @@ -53,9 +53,9 @@ public class FileAppenderPermissionsXmlConfigTest { @Test public void testFilePermissions() throws Exception { - Logger logger = loggerContextRule.getLogger(FileAppenderPermissionsTest.class); + final Logger logger = loggerContextRule.getLogger(FileAppenderPermissionsTest.class); for (int i = 0; i < 1000; ++i) { - String message = "This is test message number " + i; + final String message = "This is test message number " + i; logger.debug(message); } assertEquals("rw-------", PosixFilePermissions.toString( http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamManagerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamManagerTest.java index 381c04f..884d6b8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamManagerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamManagerTest.java @@ -41,9 +41,9 @@ public class OutputStreamManagerTest { @Test public void narrow() throws Exception { - Logger logger = LogManager.getLogger(OutputStreamManagerTest.class); + final Logger logger = LogManager.getLogger(OutputStreamManagerTest.class); logger.info("test"); - List<StatusData> statusData = StatusLogger.getLogger().getStatusData(); + final List<StatusData> statusData = StatusLogger.getLogger().getStatusData(); StatusData data = statusData.get(0); if (data.getMessage().getFormattedMessage().contains("WindowsAnsiOutputStream")) { data = statusData.get(1); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java index b0b2cd1..51fae36 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/EligibleFilesTest.java @@ -31,9 +31,9 @@ public class EligibleFilesTest { @Test public void runTest() throws Exception { - String path = "target/test-classes/rolloverPath/log4j.txt.20170112_09-" + NotANumber.VALUE + ".gz"; - TestRolloverStrategy strategy = new TestRolloverStrategy(); - Map<Integer, Path> files = strategy.findFilesInPath(path); + final String path = "target/test-classes/rolloverPath/log4j.txt.20170112_09-" + NotANumber.VALUE + ".gz"; + final TestRolloverStrategy strategy = new TestRolloverStrategy(); + final Map<Integer, Path> files = strategy.findFilesInPath(path); assertTrue("No files found", files.size() > 0); assertTrue("Incorrect number of files found. Should be 30, was " + files.size(), files.size() == 30); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2DirectTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2DirectTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2DirectTest.java index b0c9b0a..5fb4309 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2DirectTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2DirectTest.java @@ -51,8 +51,8 @@ public class RollingAppenderCronEvery2DirectTest { public void testAppender() throws Exception { // TODO Is there a better way to test than putting the thread to sleep all over the place? final Logger logger = loggerContextRule.getLogger(); - long end = System.currentTimeMillis() + 5000; - Random rand = new SecureRandom(); + final long end = System.currentTimeMillis() + 5000; + final Random rand = new SecureRandom(); rand.setSeed(end); int count = 1; do { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2Test.java index db8656a..228b97b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronEvery2Test.java @@ -53,8 +53,8 @@ public class RollingAppenderCronEvery2Test { final Logger logger = loggerContextRule.getLogger(); final File file = new File(FILE); assertTrue("Log file does not exist", file.exists()); - long end = System.currentTimeMillis() + 5000; - Random rand = new SecureRandom(); + final long end = System.currentTimeMillis() + 5000; + final Random rand = new SecureRandom(); rand.setSeed(end); int count = 1; do { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeCompressPermissionsTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeCompressPermissionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeCompressPermissionsTest.java index 0ea11f7..403b399 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeCompressPermissionsTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeCompressPermissionsTest.java @@ -63,7 +63,7 @@ public class RollingAppenderSizeCompressPermissionsTest { @Test public void testAppenderCompressPermissions() throws Exception { for (int i = 0; i < 500; ++i) { - String message = "This is test message number " + i; + final String message = "This is test message number " + i; logger.debug(message); if (i % 100 == 0) { Thread.sleep(500); @@ -78,8 +78,8 @@ public class RollingAppenderSizeCompressPermissionsTest { assertNotNull(files); int gzippedFiles1 = 0; int gzippedFiles2 = 0; - for (File file : files) { - FileExtension ext = FileExtension.lookupForFile(file.getName()); + for (final File file : files) { + final FileExtension ext = FileExtension.lookupForFile(file.getName()); if (ext != null) { if (file.getName().startsWith("test1")) { gzippedFiles1++; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeNoCompressTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeNoCompressTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeNoCompressTest.java index 03472ac..2c73dcb 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeNoCompressTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeNoCompressTest.java @@ -59,9 +59,9 @@ public class RollingAppenderSizeNoCompressTest { @Test public void testAppender() throws Exception { - List<String> messages = new ArrayList<>(); + final List<String> messages = new ArrayList<>(); for (int i=0; i < 1000; ++i) { - String message = "This is test message number " + i; + final String message = "This is test message number " + i; messages.add(message); logger.debug(message); if (i % 100 == 0) { @@ -75,7 +75,7 @@ public class RollingAppenderSizeNoCompressTest { assertTrue("Directory not created", dir.exists()); final File[] files = dir.listFiles(); assertNotNull(files); - for (File file : files) { + for (final File file : files) { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); try (FileInputStream fis = new FileInputStream(file)) { try { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java index d32f098..cadea6f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java @@ -168,8 +168,8 @@ public class CompositeConfigurationTest { public void evaluate() throws Throwable { final CompositeConfiguration config = (CompositeConfiguration) lcr.getConfiguration(); - List<AppenderRef> appenderRefList = config.getLogger("cat1").getAppenderRefs(); - AppenderRef appenderRef = getAppenderRef(appenderRefList, "STDOUT"); + final List<AppenderRef> appenderRefList = config.getLogger("cat1").getAppenderRefs(); + final AppenderRef appenderRef = getAppenderRef(appenderRefList, "STDOUT"); assertTrue("Expected cat1 STDOUT appenderRef to have a regex filter", appenderRef.getFilter() != null && appenderRef.getFilter() instanceof RegexFilter); } @@ -178,7 +178,7 @@ public class CompositeConfigurationTest { } private AppenderRef getAppenderRef(final List<AppenderRef> appenderRefList, final String refName) { - for (AppenderRef ref : appenderRefList) { + for (final AppenderRef ref : appenderRefList) { if (ref.getRef().equalsIgnoreCase(refName)) { return ref; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggersPluginTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggersPluginTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggersPluginTest.java index adf6b7a..27c903f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggersPluginTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggersPluginTest.java @@ -41,7 +41,7 @@ public class LoggersPluginTest { public void testEmptyAttribute() throws Exception { final Logger logger = LogManager.getLogger(); logger.info("Test"); - StatusData data = StatusLogger.getLogger().getStatusData().get(0); + final StatusData data = StatusLogger.getLogger().getStatusData().get(0); //System.out.println(data.getFormattedStatus()); assertEquals(Level.ERROR, data.getLevel()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConigurationSecurity.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConigurationSecurity.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConigurationSecurity.java index 4d45315..f7d1425 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConigurationSecurity.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConigurationSecurity.java @@ -28,7 +28,7 @@ public class XmlConigurationSecurity { @Test(timeout = 5000L) public void xmlSecurity() throws IOException { - LoggerContext context = Configurator.initialize("XmlConfigurationSecurity", "XmlConfigurationSecurity.xml"); + final LoggerContext context = Configurator.initialize("XmlConfigurationSecurity", "XmlConfigurationSecurity.xml"); assertNotNull(context.getConfiguration().getAppender("list")); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/078f8c87/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java index 75c2df8..069c34b 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java @@ -94,7 +94,7 @@ public class Log4jLogEventTest { @Test public void testToImmutableNotSame() { final LogEvent logEvent = new Log4jLogEvent.Builder().setMessage(new ReusableObjectMessage()).build(); - LogEvent immutable = logEvent.toImmutable(); + final LogEvent immutable = logEvent.toImmutable(); Assert.assertSame(logEvent, immutable); Assert.assertFalse(immutable.getMessage() instanceof ReusableMessage); }
