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/1eebba86 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1eebba86 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1eebba86
Branch: refs/heads/master Commit: 1eebba86b55afdd5658f5cc7a7342e9cd43c641a Parents: 31ddd8f Author: Gary Gregory <[email protected]> Authored: Sat Nov 12 01:12:21 2016 -0800 Committer: Gary Gregory <[email protected]> Committed: Sat Nov 12 01:12:21 2016 -0800 ---------------------------------------------------------------------- .../config/Log4j1ConfigurationConverter.java | 4 ++-- .../log4j/config/Log4j1ConfigurationParser.java | 4 ++-- .../config/Log4j1ConfigurationFactoryTest.java | 2 +- .../logging/log4j/spi/LoggerAdapterTest.java | 20 ++++++++++---------- .../logging/log4j/util/DeserializerHelper.java | 4 ++-- .../log4j/util/SortedArrayStringMapTest.java | 2 +- .../log4j/core/impl/JdkMapAdapterStringMap.java | 2 +- .../log4j/core/layout/PatternLayout.java | 2 +- .../log4j/core/lookup/StrSubstitutor.java | 2 +- .../net/ssl/AbstractKeyStoreConfiguration.java | 2 +- .../core/net/ssl/KeyStoreConfiguration.java | 2 +- .../log4j/core/net/ssl/SslConfiguration.java | 2 +- .../core/net/ssl/TrustStoreConfiguration.java | 2 +- .../log4j/core/util/InetAddressConverter.java | 2 +- .../log4j/FilterPerformanceComparison.java | 2 +- ...actoryPropertySetMissingConstructorTest.java | 4 ++-- .../impl/ContextDataFactoryPropertySetTest.java | 2 +- .../log4j/core/impl/ContextDataFactoryTest.java | 4 ++-- .../osgi/tests/AbstractLoadBundleTest.java | 4 ++-- .../org/apache/logging/slf4j/MDCContextMap.java | 2 +- 20 files changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java index dcb1ecb..aef822e 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java @@ -185,7 +185,7 @@ public final class Log4j1ConfigurationConverter { return FileVisitResult.CONTINUE; } }); - } catch (IOException e) { + } catch (final IOException e) { throw new ConfigurationException(e); } finally { verbose("OK = %,d, Failures = %,d, Total = %,d", countOKs.get(), countFails.get(), @@ -195,7 +195,7 @@ public final class Log4j1ConfigurationConverter { verbose("Reading %s", cla.getPathIn()); try (final InputStream input = getInputStream(); final OutputStream output = getOutputStream()) { convert(input, output); - } catch (IOException e) { + } catch (final IOException e) { throw new ConfigurationException(e); } verbose("Wrote %s", cla.getPathOut()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java index c453f61..112ab42 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java @@ -126,7 +126,7 @@ public class Log4j1ConfigurationParser { } private void buildProperties() { - for (Map.Entry<Object, Object> entry : new TreeMap<>(properties).entrySet()) { + for (final Map.Entry<Object, Object> entry : new TreeMap<>(properties).entrySet()) { final String key = entry.getKey().toString(); if (!key.startsWith("log4j.") && !key.equals(ROOTCATEGORY) && !key.equals(ROOTLOGGER)) { builder.addProperty(key, Objects.toString(entry.getValue(), Strings.EMPTY)); @@ -403,7 +403,7 @@ public class Log4j1ConfigurationParser { // Add Appenders to this logger final String[] sortedAppenderNames = Arrays.copyOfRange(split, 1, split.length); Arrays.sort(sortedAppenderNames); - for (String appenderName : sortedAppenderNames) { + for (final String appenderName : sortedAppenderNames) { newLogger.add(builder.newAppenderRef(appenderName)); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java index e9fc5cf..eb20696 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java @@ -163,7 +163,7 @@ public class Log4j1ConfigurationFactoryTest { public void testSystemProperties1() throws Exception { final Configuration configuration = getConfiguration("config-1.2/log4j-system-properties-1.properties"); final RollingFileAppender appender = configuration.getAppender("RFA"); - String tempFileName = System.getProperty("java.io.tmpdir") + "/hadoop.log"; + final String tempFileName = System.getProperty("java.io.tmpdir") + "/hadoop.log"; System.out.println("expected: " + tempFileName + " Actual: " + appender.getFileName()); assertEquals(tempFileName, appender.getFileName()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerAdapterTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerAdapterTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerAdapterTest.java index f53452c..8a56b40 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerAdapterTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerAdapterTest.java @@ -61,7 +61,7 @@ public class LoggerAdapterTest { resultMap.put(String.valueOf(index), new TestLogger()); doneSignal.countDown(); } - catch (Exception e) { + catch (final Exception e) { e.printStackTrace(); } } @@ -92,22 +92,22 @@ public class LoggerAdapterTest { */ @Test public synchronized void testGetLoggersInContextSynch() throws Exception { - TestLoggerAdapter adapter = new TestLoggerAdapter(); + final TestLoggerAdapter adapter = new TestLoggerAdapter(); - int num = 500; + final int num = 500; - CountDownLatch startSignal = new CountDownLatch(1); - CountDownLatch doneSignal = new CountDownLatch(num); + final CountDownLatch startSignal = new CountDownLatch(1); + final CountDownLatch doneSignal = new CountDownLatch(num); - RunnableThreadTest[] instances = new RunnableThreadTest[num]; + final RunnableThreadTest[] instances = new RunnableThreadTest[num]; LoggerContext lastUsedContext = null; for (int i = 0; i < num; i++) { if (i % 2 == 0) { //every other time create a new context lastUsedContext = new SimpleLoggerContext(); } - RunnableThreadTest runnable = new RunnableThreadTest(i, adapter, lastUsedContext, startSignal, doneSignal); - Thread thread = new Thread(runnable); + final RunnableThreadTest runnable = new RunnableThreadTest(i, adapter, lastUsedContext, startSignal, doneSignal); + final Thread thread = new Thread(runnable); thread.start(); instances[i] = runnable; } @@ -117,8 +117,8 @@ public class LoggerAdapterTest { for (int i = 0; i < num; i = i + 2) { //maps for the same context should be the same instance - Map<String, Logger> resultMap1 = instances[i].getResultMap(); - Map<String, Logger> resultMap2 = instances[i + 1].getResultMap(); + final Map<String, Logger> resultMap1 = instances[i].getResultMap(); + final Map<String, Logger> resultMap2 = instances[i + 1].getResultMap(); assertSame("not the same map for instances" + i + " and " + (i + 1) + ":", resultMap1, resultMap2); assertEquals(2, resultMap1.size()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java index 7e57027..20af4ec 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java @@ -33,13 +33,13 @@ public class DeserializerHelper { in = new ObjectInputStream(new FileInputStream(file)); final Object result = in.readObject(); System.out.println(result); - } catch (Throwable t) { + } catch (final Throwable t) { System.err.println("Could not deserialize."); throw t; // cause non-zero exit code } finally { try { in.close(); - } catch (Throwable t) { + } catch (final Throwable t) { System.err.println("Error while closing: " + t); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java index 244cc0a..4d86e82 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java @@ -111,7 +111,7 @@ public class SortedArrayStringMapTest { final Process process = new ProcessBuilder("java", "-cp", classpath, DeserializerHelper.class.getName(), file.getPath()).start(); final BufferedReader in = new BufferedReader(new InputStreamReader(process.getErrorStream())); - int exitValue = process.waitFor(); + final int exitValue = process.waitFor(); file.delete(); if (exitValue != 0) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java index 4efc6e8..4091276 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java @@ -190,7 +190,7 @@ class JdkMapAdapterStringMap implements StringMap { if (!(object instanceof JdkMapAdapterStringMap)) { return false; } - JdkMapAdapterStringMap other = (JdkMapAdapterStringMap) object; + final JdkMapAdapterStringMap other = (JdkMapAdapterStringMap) object; return map.equals(other.map) && immutable == other.immutable; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java index 2ec4254..183c29d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java @@ -133,7 +133,7 @@ public final class PatternLayout extends AbstractStringLayout { public static Serializer createSerializer(final Configuration configuration, final RegexReplacement replace, final String pattern, final String defaultPattern, final PatternSelector patternSelector, final boolean alwaysWriteExceptions, final boolean noConsoleNoAnsi) { - SerializerBuilder builder = newSerializerBuilder(); + final SerializerBuilder builder = newSerializerBuilder(); builder.withAlwaysWriteExceptions(alwaysWriteExceptions); builder.withConfiguration(configuration); builder.withDefaultPattern(defaultPattern); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java index 0500f17..a3a7916 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java @@ -392,7 +392,7 @@ public class StrSubstitutor implements ConfigurationAware { } private static Map<String, String> toTypeSafeMap(final Properties properties) { - Map<String, String> map = new HashMap<>(properties.size()); + final Map<String, String> map = new HashMap<>(properties.size()); for (final String name : properties.stringPropertyNames()) { map.put(name, properties.getProperty(name)); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java index 460cd4b..d893a1e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java @@ -93,7 +93,7 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore> if (getClass() != obj.getClass()) { return false; } - AbstractKeyStoreConfiguration other = (AbstractKeyStoreConfiguration) obj; + final AbstractKeyStoreConfiguration other = (AbstractKeyStoreConfiguration) obj; if (keyStore == null) { if (other.keyStore != null) { return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java index d2dac9c..b0a6226 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java @@ -97,7 +97,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration { if (getClass() != obj.getClass()) { return false; } - KeyStoreConfiguration other = (KeyStoreConfiguration) obj; + final KeyStoreConfiguration other = (KeyStoreConfiguration) obj; if (keyManagerFactoryAlgorithm == null) { if (other.keyManagerFactoryAlgorithm != null) { return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java index 7c381b6..c3f1b49 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java @@ -244,7 +244,7 @@ public class SslConfiguration { if (getClass() != obj.getClass()) { return false; } - SslConfiguration other = (SslConfiguration) obj; + final SslConfiguration other = (SslConfiguration) obj; if (keyStoreConfig == null) { if (other.keyStoreConfig != null) { return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java index d0f356e..a3c9bf8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java @@ -92,7 +92,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration { if (getClass() != obj.getClass()) { return false; } - TrustStoreConfiguration other = (TrustStoreConfiguration) obj; + final TrustStoreConfiguration other = (TrustStoreConfiguration) obj; if (trustManagerFactoryAlgorithm == null) { if (other.trustManagerFactoryAlgorithm != null) { return false; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/main/java/org/apache/logging/log4j/core/util/InetAddressConverter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/InetAddressConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/InetAddressConverter.java index 242fbc0..8dd02c8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/InetAddressConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/InetAddressConverter.java @@ -27,7 +27,7 @@ public class InetAddressConverter implements IStringConverter<InetAddress> { public InetAddress convert(final String host) { try { return InetAddress.getByName(host); - } catch (UnknownHostException e) { + } catch (final UnknownHostException e) { throw new IllegalArgumentException(host, e); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java b/log4j-core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java index 68cfad1..c6f691d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java @@ -85,7 +85,7 @@ public class FilterPerformanceComparison { private static void putContextData(final Map<String, String> contextData) { ThreadContext.putAll(contextData); - for (Map.Entry<String, String> entry : contextData.entrySet()) { + for (final Map.Entry<String, String> entry : contextData.entrySet()) { MDC.put(entry.getKey(), entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetMissingConstructorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetMissingConstructorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetMissingConstructorTest.java index 6e8d621..47c9c14 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetMissingConstructorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetMissingConstructorTest.java @@ -32,8 +32,8 @@ public class ContextDataFactoryPropertySetMissingConstructorTest { public void intArgReturnsSortedArrayStringMapIfPropertySpecifiedButMissingIntConstructor() throws Exception { System.setProperty("log4j2.ContextData", FactoryTestStringMapWithoutIntConstructor.class.getName()); assertTrue(ContextDataFactory.createContextData(2) instanceof SortedArrayStringMap); - SortedArrayStringMap actual = (SortedArrayStringMap) ContextDataFactory.createContextData(2); - Field thresholdField = SortedArrayStringMap.class.getDeclaredField("threshold"); + final SortedArrayStringMap actual = (SortedArrayStringMap) ContextDataFactory.createContextData(2); + final Field thresholdField = SortedArrayStringMap.class.getDeclaredField("threshold"); thresholdField.setAccessible(true); assertEquals(2, thresholdField.getInt(actual)); System.clearProperty("log4j2.ContextData"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetTest.java index 82d6126..dc308dc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetTest.java @@ -42,7 +42,7 @@ public class ContextDataFactoryPropertySetTest { @Test public void intArgSetsCapacityIfPropertySpecified() throws Exception { System.setProperty("log4j2.ContextData", FactoryTestStringMap.class.getName()); - FactoryTestStringMap actual = (FactoryTestStringMap) ContextDataFactory.createContextData(2); + final FactoryTestStringMap actual = (FactoryTestStringMap) ContextDataFactory.createContextData(2); assertEquals(2, actual.initialCapacity); System.clearProperty("log4j2.ContextData"); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryTest.java index aca1c27..5da1267 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryTest.java @@ -39,8 +39,8 @@ public class ContextDataFactoryTest { @Test public void intArgSetsCapacityIfNoPropertySpecified() throws Exception { - SortedArrayStringMap actual = (SortedArrayStringMap) ContextDataFactory.createContextData(2); - Field thresholdField = SortedArrayStringMap.class.getDeclaredField("threshold"); + final SortedArrayStringMap actual = (SortedArrayStringMap) ContextDataFactory.createContextData(2); + final Field thresholdField = SortedArrayStringMap.class.getDeclaredField("threshold"); thresholdField.setAccessible(true); assertEquals(2, thresholdField.getInt(actual)); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java ---------------------------------------------------------------------- diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java index 2f3e3ae..7288fba 100644 --- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java +++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java @@ -148,7 +148,7 @@ public abstract class AbstractLoadBundleTest { try { core.start(); } - catch (BundleException ex) { + catch (final BundleException ex) { final Throwable t = ex.getCause(); if (t != null) { @@ -156,7 +156,7 @@ public abstract class AbstractLoadBundleTest { if (t2 != null) { final String cause = t2.toString(); - boolean result = cause.equals("java.lang.ClassNotFoundException: org.apache.logging.log4j.Logger") // Equinox + final boolean result = cause.equals("java.lang.ClassNotFoundException: org.apache.logging.log4j.Logger") // Equinox || cause.equals("java.lang.ClassNotFoundException: org.apache.logging.log4j.Logger not found by org.apache.logging.log4j.core [2]"); // Felix Assert.assertFalse("org.apache.logging.log4j package is not properly imported in org.apache.logging.log4j.core bundle, check that the package is exported from api and is not split between api and core", result); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1eebba86/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java ---------------------------------------------------------------------- diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java index 03b8564..964ac52 100644 --- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java +++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java @@ -98,7 +98,7 @@ public class MDCContextMap implements ThreadContextMap3 { return EMPTY_CONTEXT_DATA; } final StringMap result = new SortedArrayStringMap(); - for (Entry<String, String> entry : copy.entrySet()) { + for (final Entry<String, String> entry : copy.entrySet()) { result.putValue(entry.getKey(), entry.getValue()); } return result;
