Add final modifier to lvar. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ba07f0d3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ba07f0d3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ba07f0d3
Branch: refs/heads/feature/LOG4J2-1430 Commit: ba07f0d3935faccbefb567ac6237170ea1846f5c Parents: be2393e Author: ggregory <ggreg...@apache.org> Authored: Fri Jun 17 10:27:36 2016 -0700 Committer: ggregory <ggreg...@apache.org> Committed: Fri Jun 17 10:27:36 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/util/Unbox.java | 4 ++-- .../appender/AsyncAppenderQueueFullPolicyTest.java | 2 +- .../rolling/OnStartupTriggeringPolicyTest.java | 16 ++++++++-------- .../rolling/RandomRollingAppenderOnStartupTest.java | 6 +++--- .../rolling/RollingAppenderOnStartupTest.java | 6 +++--- .../appender/rolling/RollingAppenderSizeTest.java | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba07f0d3/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java index d0bb16f..acf154c 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java @@ -75,14 +75,14 @@ public class Unbox { ringBuffer.set(array); current.set(new int[1]); } - int[] index = current.get(); + final int[] index = current.get(); final StringBuilder result = array[MASK & index[0]++]; result.setLength(0); return result; } public boolean isBoxedPrimitive(final StringBuilder text) { - StringBuilder[] array = ringBuffer.get(); + final StringBuilder[] array = ringBuffer.get(); if (array == null) { return false; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba07f0d3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java index a5adf83..b4da847 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java @@ -58,7 +58,7 @@ public class AsyncAppenderQueueFullPolicyTest { blockingAppender = (BlockingAppender) context.getAppender("Block"); asyncAppender = (AsyncAppender) context.getAppender("Async"); - Field field = AsyncAppender.class.getDeclaredField("asyncQueueFullPolicy"); + final Field field = AsyncAppender.class.getDeclaredField("asyncQueueFullPolicy"); field.setAccessible(true); policy = new CountingAsyncQueueFullPolicy(); field.set(asyncAppender, policy); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba07f0d3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java index bfec1c8..ad1e5c7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java @@ -41,22 +41,22 @@ public class OnStartupTriggeringPolicyTest { @Test public void testPolicy() throws Exception { - Configuration configuration = new DefaultConfiguration(); - Path target = Paths.get(TARGET_FILE); - Path rolled = Paths.get(ROLLED_FILE); + final Configuration configuration = new DefaultConfiguration(); + final Path target = Paths.get(TARGET_FILE); + final Path rolled = Paths.get(ROLLED_FILE); Files.deleteIfExists(target); Files.deleteIfExists(rolled); - InputStream is = new ByteArrayInputStream(TEST_DATA.getBytes("UTF-8")); + final InputStream is = new ByteArrayInputStream(TEST_DATA.getBytes("UTF-8")); Files.copy(is, target); is.close(); - long size = Files.size(target); + final long size = Files.size(target); assertTrue(size > 0); final PatternLayout layout = PatternLayout.newBuilder().withPattern("%msg") .withConfiguration(configuration).build(); - RolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(null, null, null, "0", null, true, + final RolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(null, null, null, "0", null, true, configuration); - OnStartupTriggeringPolicy policy = OnStartupTriggeringPolicy.createPolicy(); - RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true, false, + final OnStartupTriggeringPolicy policy = OnStartupTriggeringPolicy.createPolicy(); + final RollingFileManager manager = RollingFileManager.getFileManager(TARGET_FILE, TARGET_PATTERN, true, false, policy, strategy, null, layout, 8192, true); manager.initialize(); assertTrue(Files.exists(target)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba07f0d3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java index b9232db..963a010 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java @@ -74,7 +74,7 @@ public class RandomRollingAppenderOnStartupTest { public static void beforeClass() throws Exception { if (Files.exists(Paths.get("target/onStartup"))) { try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) { - for (Path path : directoryStream) { + for (final Path path : directoryStream) { Files.delete(path); } Files.delete(Paths.get(DIR)); @@ -86,11 +86,11 @@ public class RandomRollingAppenderOnStartupTest { public static void afterClass() throws Exception { long size = 0; try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) { - for (Path path : directoryStream) { + for (final Path path : directoryStream) { if (size == 0) { size = Files.size(path); } else { - long fileSize = Files.size(path); + final long fileSize = Files.size(path); assertTrue("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize, size == fileSize); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba07f0d3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java index f06056d..536a5ea 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java @@ -79,7 +79,7 @@ public class RollingAppenderOnStartupTest { public static void beforeClass() throws Exception { if (Files.exists(Paths.get("target/onStartup"))) { try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) { - for (Path path : directoryStream) { + for (final Path path : directoryStream) { Files.delete(path); } Files.delete(Paths.get(DIR)); @@ -91,11 +91,11 @@ public class RollingAppenderOnStartupTest { public static void afterClass() throws Exception { long size = 0; try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) { - for (Path path : directoryStream) { + for (final Path path : directoryStream) { if (size == 0) { size = Files.size(path); } else { - long fileSize = Files.size(path); + final long fileSize = Files.size(path); assertTrue("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize, size == fileSize); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba07f0d3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java index 1ce7d2f..2229531 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java @@ -145,12 +145,12 @@ public class RollingAppenderSizeTest { if (Files.exists(Paths.get(DIR))) { String fileName = null; try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) { - for (Path path : directoryStream) { + for (final Path path : directoryStream) { fileName = path.toFile().getName(); Files.delete(path); } Files.delete(Paths.get(DIR)); - } catch (IOException ioe) { + } catch (final IOException ioe) { fail("Unable to delete " + fileName + " due to " + ioe.getClass().getSimpleName() + ": " + ioe.getMessage()); }