You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/09/08 14:50:55 UTC
[26/50] [abbrv] logging-log4j2 git commit: Add final modifier to
local variables.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
index f14d348..406809b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
@@ -45,14 +45,14 @@ public abstract class Log4j2_1482_Test {
private static final int LOOP_COUNT = 10;
static void assertFileContents(final int runNumber) throws IOException {
- Path path = Paths.get(FOLDER + "/audit.tmp");
- List<String> lines = Files.readAllLines(path, Charset.defaultCharset());
+ final Path path = Paths.get(FOLDER + "/audit.tmp");
+ final List<String> lines = Files.readAllLines(path, Charset.defaultCharset());
int i = 1;
final int size = lines.size();
- for (String string : lines) {
+ for (final String string : lines) {
if (string.startsWith(",,")) {
- Path folder = Paths.get(FOLDER);
- File[] files = folder.toFile().listFiles();
+ final Path folder = Paths.get(FOLDER);
+ final File[] files = folder.toFile().listFiles();
Arrays.sort(files);
System.out.println("Run " + runNumber + ": " + Arrays.toString(files));
Assert.fail(
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
index 57fe994..2d5a5be 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MessagePatternConverterTest.java
@@ -1,105 +1,105 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.core.pattern;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.DefaultConfiguration;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.message.SimpleMessage;
-import org.junit.Test;
-
-/**
- *
- */
-public class MessagePatternConverterTest {
-
- @Test
- public void testPattern() throws Exception {
- final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
- Message msg = new SimpleMessage("Hello!");
- LogEvent event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Unexpected result", "Hello!", sb.toString());
- event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(null).build();
- sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Incorrect length: " + sb, 0, sb.length());
- msg = new SimpleMessage(null);
- event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(msg).build();
- sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Incorrect length: " + sb, 4, sb.length());
- }
-
- @Test
- public void testPatternAndParameterizedMessageDateLookup() throws Exception {
- final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
- Message msg = new ParameterizedMessage("${date:now:buhu}");
- LogEvent event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Unexpected result", "${date:now:buhu}", sb.toString());
- }
-
- @Test
- public void testPatternWithConfiguration() throws Exception {
- final Configuration config = new DefaultConfiguration();
- final MessagePatternConverter converter = MessagePatternConverter.newInstance(config, null);
- Message msg = new SimpleMessage("Hello!");
- LogEvent event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(msg).build();
- StringBuilder sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Unexpected result", "Hello!", sb.toString());
- event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(null).build();
- sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Incorrect length: " + sb, 0, sb.length());
- msg = new SimpleMessage(null);
- event = Log4jLogEvent.newBuilder() //
- .setLoggerName("MyLogger") //
- .setLevel(Level.DEBUG) //
- .setMessage(msg).build();
- sb = new StringBuilder();
- converter.format(event, sb);
- assertEquals("Incorrect length: " + sb, 4, sb.length());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.pattern;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.DefaultConfiguration;
+import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.apache.logging.log4j.message.SimpleMessage;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class MessagePatternConverterTest {
+
+ @Test
+ public void testPattern() throws Exception {
+ final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
+ Message msg = new SimpleMessage("Hello!");
+ LogEvent event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(msg).build();
+ StringBuilder sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Unexpected result", "Hello!", sb.toString());
+ event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(null).build();
+ sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Incorrect length: " + sb, 0, sb.length());
+ msg = new SimpleMessage(null);
+ event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(msg).build();
+ sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Incorrect length: " + sb, 4, sb.length());
+ }
+
+ @Test
+ public void testPatternAndParameterizedMessageDateLookup() throws Exception {
+ final MessagePatternConverter converter = MessagePatternConverter.newInstance(null, null);
+ final Message msg = new ParameterizedMessage("${date:now:buhu}");
+ final LogEvent event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(msg).build();
+ final StringBuilder sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Unexpected result", "${date:now:buhu}", sb.toString());
+ }
+
+ @Test
+ public void testPatternWithConfiguration() throws Exception {
+ final Configuration config = new DefaultConfiguration();
+ final MessagePatternConverter converter = MessagePatternConverter.newInstance(config, null);
+ Message msg = new SimpleMessage("Hello!");
+ LogEvent event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(msg).build();
+ StringBuilder sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Unexpected result", "Hello!", sb.toString());
+ event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(null).build();
+ sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Incorrect length: " + sb, 0, sb.length());
+ msg = new SimpleMessage(null);
+ event = Log4jLogEvent.newBuilder() //
+ .setLoggerName("MyLogger") //
+ .setLevel(Level.DEBUG) //
+ .setMessage(msg).build();
+ sb = new StringBuilder();
+ converter.format(event, sb);
+ assertEquals("Incorrect length: " + sb, 4, sb.length());
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java
index e3ba5ff..f6433ed 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java
@@ -47,12 +47,13 @@ public class URLStreamHandlerFactoryRule implements TestRule {
private final URLStreamHandlerFactory newURLStreamHandlerFactory;
void clearURLHandlers() throws Exception {
- Field handlersFields = URL.class.getDeclaredField("handlers");
+ final Field handlersFields = URL.class.getDeclaredField("handlers");
if (handlersFields != null) {
if (!handlersFields.isAccessible()) {
handlersFields.setAccessible(true);
}
@SuppressWarnings("unchecked")
+ final
Hashtable<String, URLStreamHandler> handlers = (Hashtable<String, URLStreamHandler>) handlersFields
.get(null);
if (handlers != null) {
@@ -69,7 +70,7 @@ public class URLStreamHandlerFactoryRule implements TestRule {
Field factoryField = null;
int matches = 0;
URLStreamHandlerFactory oldFactory = null;
- for (Field field : URL.class.getDeclaredFields()) {
+ for (final Field field : URL.class.getDeclaredFields()) {
if (URLStreamHandlerFactory.class.equals(field.getType())) {
factoryField = field;
matches++;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
index da8b71a..07ac7fe 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
@@ -51,7 +51,7 @@ public class InMemoryAppender extends AbstractOutputStreamAppender<InMemoryAppen
public String toString() {
try {
return getOutputStream().toString();
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new IllegalStateException(e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
index ffb405d..1df6bed 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
@@ -270,10 +270,10 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF
if (agents == null || agents.length == 0) {
if (hosts != null && !hosts.isEmpty()) {
LOGGER.debug("Parsing agents from hosts parameter");
- String[] hostports = hosts.split(",");
+ final String[] hostports = hosts.split(",");
agents = new Agent[hostports.length];
for(int i = 0; i < hostports.length; ++i) {
- String[] h = hostports[i].split(":");
+ final String[] h = hostports[i].split(":");
agents[i] = Agent.createAgent(h[0], h.length > 1 ? h[1] : null);
}
} else {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4b60405/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 afc950d..5202ca7 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
@@ -34,7 +34,7 @@ public class MDCContextMap implements ThreadContextMap2 {
@Override
public void putAll(final Map<String, String> m) {
- for (Entry<String, String> entry : m.entrySet()) {
+ for (final Entry<String, String> entry : m.entrySet()) {
MDC.put(entry.getKey(), entry.getValue());
}
}