You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/09/07 03:00:27 UTC
[1/2] logging-log4j2 git commit: Add final modifier to method
parameters
Repository: logging-log4j2
Updated Branches:
refs/heads/master c513f1333 -> 19c92876f
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 91f9bcb..a52921d 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
@@ -112,7 +112,7 @@ public class JndiManager extends AbstractManager {
}
@Override
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
JndiCloser.closeSilently(this.context);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index 73e2230..ec5c64a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -60,7 +60,7 @@ public class SslSocketManager extends TcpSocketManager {
public SslSocketManager(final String name, final OutputStream os, final Socket sock,
final SslConfiguration sslConfig, final InetAddress inetAddress, final String host, final int port,
final int connectTimeoutMillis, final int delay, final boolean immediateFail,
- final Layout<? extends Serializable> layout, int bufferSize) {
+ final Layout<? extends Serializable> layout, final int bufferSize) {
super(name, os, sock, inetAddress, host, port, connectTimeoutMillis, delay, immediateFail, layout, bufferSize);
this.sslConfig = sslConfig;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index a1b8f2d..73933f7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -79,7 +79,7 @@ public class TcpSocketManager extends AbstractSocketManager {
*/
public TcpSocketManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress,
final String host, final int port, final int connectTimeoutMillis, final int delay,
- final boolean immediateFail, final Layout<? extends Serializable> layout, int bufferSize) {
+ final boolean immediateFail, final Layout<? extends Serializable> layout, final int bufferSize) {
super(name, os, inetAddress, host, port, layout, true, bufferSize);
this.connectTimeoutMillis = connectTimeoutMillis;
this.reconnectionDelay = delay;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HtmlTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HtmlTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HtmlTextRenderer.java
index e13bae6..13ba63c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HtmlTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HtmlTextRenderer.java
@@ -21,17 +21,17 @@ package org.apache.logging.log4j.core.pattern;
*/
public final class HtmlTextRenderer implements TextRenderer {
- public HtmlTextRenderer(String[] formats) {
+ public HtmlTextRenderer(final String[] formats) {
// TODO Auto-generated constructor stub
}
@Override
- public void render(String input, StringBuilder output, String styleName) {
+ public void render(final String input, final StringBuilder output, final String styleName) {
// TODO Auto-generated method stub
}
@Override
- public void render(StringBuilder input, StringBuilder output) {
+ public void render(final StringBuilder input, final StringBuilder output) {
// TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
index b9ac604..f71e230 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
@@ -1,332 +1,332 @@
-/*
- * 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.fusesource.jansi.AnsiRenderer.Code.BG_RED;
-import static org.fusesource.jansi.AnsiRenderer.Code.BOLD;
-import static org.fusesource.jansi.AnsiRenderer.Code.RED;
-import static org.fusesource.jansi.AnsiRenderer.Code.WHITE;
-import static org.fusesource.jansi.AnsiRenderer.Code.YELLOW;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.logging.log4j.status.StatusLogger;
-import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.AnsiRenderer;
-import org.fusesource.jansi.AnsiRenderer.Code;
-
-/**
- * Renders an input as ANSI escaped output.
- *
- * Uses the JAnsi rendering syntax as the default to render a message into an ANSI escaped string.
- *
- * The default syntax for embedded ANSI codes is:
- *
- * <pre>
- * @|<em>code</em>(,<em>code</em>)* <em>text</em>|@
- * </pre>
- *
- * For example, to render the message {@code "Hello"} in green, use:
- *
- * <pre>
- * @|green Hello|@
- * </pre>
- *
- * To render the message {@code "Hello"} in bold and red, use:
- *
- * <pre>
- * @|bold,red Warning!|@
- * </pre>
- *
- * You can also define custom style names in the configuration with the syntax:
- *
- * <pre>
- * %message{ansi}{StyleName=value(,value)*( StyleName=value(,value)*)*}%n
- * </pre>
- *
- * For example:
- *
- * <pre>
- * %message{ansi}{WarningStyle=red,bold KeyStyle=white ValueStyle=blue}%n
- * </pre>
- *
- * The call site can look like this:
- *
- * <pre>
- * logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue());
- * </pre>
- *
- * Note: This class originally copied and then heavily modified code from JAnsi's AnsiRenderer (which is licensed as
- * Apache 2.0.)
- *
- * @see AnsiRenderer
- */
-public final class JAnsiTextRenderer implements TextRenderer {
-
- public static final Map<String, Code[]> DefaultExceptionStyleMap;
- static final Map<String, Code[]> DefaultMessageStyleMap;
- private static final Map<String, Map<String, Code[]>> PrefedinedStyleMaps;
-
- private static void put(Map<String, Code[]> map, String name, Code... codes) {
- map.put(name, codes);
- }
-
- static {
- Map<String, Map<String, Code[]>> tempPreDefs = new HashMap<>();
- // Default style: Spock
- {
- // TODO Should the keys be in an enum?
- Map<String, Code[]> map = new HashMap<>();
- put(map, "Prefix", WHITE);
- put(map, "Name", BG_RED, WHITE);
- put(map, "NameMessageSeparator", BG_RED, WHITE);
- put(map, "Message", BG_RED, WHITE, BOLD);
- put(map, "At", WHITE);
- put(map, "CauseLabel", WHITE);
- put(map, "Text", WHITE);
- put(map, "More", WHITE);
- put(map, "Suppressed", WHITE);
- // StackTraceElement
- put(map, "StackTraceElement.ClassName", YELLOW);
- put(map, "StackTraceElement.ClassMethodSeparator", YELLOW);
- put(map, "StackTraceElement.MethodName", YELLOW);
- put(map, "StackTraceElement.NativeMethod", YELLOW);
- put(map, "StackTraceElement.FileName", RED);
- put(map, "StackTraceElement.LineNumber", RED);
- put(map, "StackTraceElement.Container", RED);
- put(map, "StackTraceElement.ContainerSeparator", WHITE);
- put(map, "StackTraceElement.UnknownSource", RED);
- // ExtraClassInfo
- put(map, "ExtraClassInfo.Inexact", YELLOW);
- put(map, "ExtraClassInfo.Container", YELLOW);
- put(map, "ExtraClassInfo.ContainerSeparator", YELLOW);
- put(map, "ExtraClassInfo.Location", YELLOW);
- put(map, "ExtraClassInfo.Version", YELLOW);
- // Save
- DefaultExceptionStyleMap = Collections.unmodifiableMap(map);
- tempPreDefs.put("Spock", DefaultExceptionStyleMap);
- }
- // Style: Kirk
- {
- // TODO Should the keys be in an enum?
- Map<String, Code[]> map = new HashMap<>();
- put(map, "Prefix", WHITE);
- put(map, "Name", BG_RED, YELLOW, BOLD);
- put(map, "NameMessageSeparator", BG_RED, YELLOW);
- put(map, "Message", BG_RED, WHITE, BOLD);
- put(map, "At", WHITE);
- put(map, "CauseLabel", WHITE);
- put(map, "Text", WHITE);
- put(map, "More", WHITE);
- put(map, "Suppressed", WHITE);
- // StackTraceElement
- put(map, "StackTraceElement.ClassName", BG_RED, WHITE);
- put(map, "StackTraceElement.ClassMethodSeparator", BG_RED, YELLOW);
- put(map, "StackTraceElement.MethodName", BG_RED, YELLOW);
- put(map, "StackTraceElement.NativeMethod", BG_RED, YELLOW);
- put(map, "StackTraceElement.FileName", RED);
- put(map, "StackTraceElement.LineNumber", RED);
- put(map, "StackTraceElement.Container", RED);
- put(map, "StackTraceElement.ContainerSeparator", WHITE);
- put(map, "StackTraceElement.UnknownSource", RED);
- // ExtraClassInfo
- put(map, "ExtraClassInfo.Inexact", YELLOW);
- put(map, "ExtraClassInfo.Container", WHITE);
- put(map, "ExtraClassInfo.ContainerSeparator", WHITE);
- put(map, "ExtraClassInfo.Location", YELLOW);
- put(map, "ExtraClassInfo.Version", YELLOW);
- // Save
- tempPreDefs.put("Kirk", Collections.unmodifiableMap(map));
- }
- {
- Map<String, Code[]> temp = new HashMap<>();
- // TODO
- DefaultMessageStyleMap = Collections.unmodifiableMap(temp);
- }
- PrefedinedStyleMaps = Collections.unmodifiableMap(tempPreDefs);
- }
-
- private final String beginToken;
- private final int beginTokenLen;
- private final String endToken;
- private final int endTokenLen;
- private final Map<String, Code[]> styleMap;
-
- public JAnsiTextRenderer(final String[] formats, Map<String, Code[]> defaultStyleMap) {
- String tempBeginToken = AnsiRenderer.BEGIN_TOKEN;
- String tempEndToken = AnsiRenderer.END_TOKEN;
- Map<String, Code[]> map;
- if (formats.length > 1) {
- final String allStylesStr = formats[1];
- // Style def split
- final String[] allStyleAssignmentsArr = allStylesStr.split(" ");
- map = new HashMap<>(allStyleAssignmentsArr.length + defaultStyleMap.size());
- map.putAll(defaultStyleMap);
- for (final String styleAssignmentStr : allStyleAssignmentsArr) {
- final String[] styleAssignmentArr = styleAssignmentStr.split("=");
- if (styleAssignmentArr.length != 2) {
- StatusLogger.getLogger().warn("{} parsing style \"{}\", expected format: StyleName=Code(,Code)*",
- getClass().getSimpleName(), styleAssignmentStr);
- } else {
- final String styleName = styleAssignmentArr[0];
- final String codeListStr = styleAssignmentArr[1];
- final String[] codeNames = codeListStr.split(",");
- if (codeNames.length == 0) {
- StatusLogger.getLogger().warn(
- "{} parsing style \"{}\", expected format: StyleName=Code(,Code)*",
- getClass().getSimpleName(), styleAssignmentStr);
- } else {
- switch (styleName) {
- case "BeginToken":
- tempBeginToken = codeNames[0];
- break;
- case "EndToken":
- tempEndToken = codeNames[0];
- break;
- case "StyleMapName":
- final String predefinedMapName = codeNames[0];
- Map<String, Code[]> predefinedMap = PrefedinedStyleMaps.get(predefinedMapName);
- if (predefinedMap != null) {
- map.putAll(predefinedMap);
- } else {
- StatusLogger.getLogger().warn("Unknown predefined map name {}, pick one of {}",
- predefinedMapName, null);
- }
- break;
- default:
- final Code[] codes = new Code[codeNames.length];
- for (int i = 0; i < codes.length; i++) {
- codes[i] = toCode(codeNames[i]);
- }
- map.put(styleName, codes);
- }
- }
- }
- }
- } else {
- map = defaultStyleMap;
- }
- styleMap = map;
- beginToken = tempBeginToken;
- endToken = tempEndToken;
- beginTokenLen = tempBeginToken.length();
- endTokenLen = tempEndToken.length();
- }
-
- public Map<String, Code[]> getStyleMap() {
- return styleMap;
- }
-
- private void render(final Ansi ansi, final Code code) {
- if (code.isColor()) {
- if (code.isBackground()) {
- ansi.bg(code.getColor());
- } else {
- ansi.fg(code.getColor());
- }
- } else if (code.isAttribute()) {
- ansi.a(code.getAttribute());
- }
- }
-
- private void render(final Ansi ansi, final Code... codes) {
- for (final Code code : codes) {
- render(ansi, code);
- }
- }
-
- /**
- * Renders the given text with the given names which can be ANSI code names or Log4j style names.
- *
- * @param text
- * The text to render
- * @param names
- * ANSI code names or Log4j style names.
- * @return A rendered string containing ANSI codes.
- */
- private String render(final String text, final String... names) {
- final Ansi ansi = Ansi.ansi();
- for (final String name : names) {
- final Code[] codes = styleMap.get(name);
- if (codes != null) {
- render(ansi, codes);
- } else {
- render(ansi, toCode(name));
- }
- }
- return ansi.a(text).reset().toString();
- }
-
- // EXACT COPY OF StringBuilder version of the method but typed as String for input
- @Override
- public void render(final String input, final StringBuilder output, final String styleName)
- throws IllegalArgumentException {
- output.append(render(input, styleName));
- }
-
- @Override
- public void render(final StringBuilder input, final StringBuilder output) throws IllegalArgumentException {
- int i = 0;
- int j, k;
-
- while (true) {
- j = input.indexOf(beginToken, i);
- if (j == -1) {
- if (i == 0) {
- output.append(input);
- return;
- }
- output.append(input.substring(i, input.length()));
- return;
- }
- output.append(input.substring(i, j));
- k = input.indexOf(endToken, j);
-
- if (k == -1) {
- output.append(input);
- return;
- }
- j += beginTokenLen;
- final String spec = input.substring(j, k);
-
- final String[] items = spec.split(AnsiRenderer.CODE_TEXT_SEPARATOR, 2);
- if (items.length == 1) {
- output.append(input);
- return;
- }
- final String replacement = render(items[1], items[0].split(","));
-
- output.append(replacement);
-
- i = k + endTokenLen;
- }
- }
-
- private Code toCode(final String name) {
- return Code.valueOf(name.toUpperCase(Locale.ENGLISH));
- }
-
- @Override
- public String toString() {
- return "JAnsiMessageRenderer [beginToken=" + beginToken + ", beginTokenLen=" + beginTokenLen + ", endToken="
- + endToken + ", endTokenLen=" + endTokenLen + ", styleMap=" + styleMap + "]";
- }
-
-}
+/*
+ * 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.fusesource.jansi.AnsiRenderer.Code.BG_RED;
+import static org.fusesource.jansi.AnsiRenderer.Code.BOLD;
+import static org.fusesource.jansi.AnsiRenderer.Code.RED;
+import static org.fusesource.jansi.AnsiRenderer.Code.WHITE;
+import static org.fusesource.jansi.AnsiRenderer.Code.YELLOW;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.logging.log4j.status.StatusLogger;
+import org.fusesource.jansi.Ansi;
+import org.fusesource.jansi.AnsiRenderer;
+import org.fusesource.jansi.AnsiRenderer.Code;
+
+/**
+ * Renders an input as ANSI escaped output.
+ *
+ * Uses the JAnsi rendering syntax as the default to render a message into an ANSI escaped string.
+ *
+ * The default syntax for embedded ANSI codes is:
+ *
+ * <pre>
+ * @|<em>code</em>(,<em>code</em>)* <em>text</em>|@
+ * </pre>
+ *
+ * For example, to render the message {@code "Hello"} in green, use:
+ *
+ * <pre>
+ * @|green Hello|@
+ * </pre>
+ *
+ * To render the message {@code "Hello"} in bold and red, use:
+ *
+ * <pre>
+ * @|bold,red Warning!|@
+ * </pre>
+ *
+ * You can also define custom style names in the configuration with the syntax:
+ *
+ * <pre>
+ * %message{ansi}{StyleName=value(,value)*( StyleName=value(,value)*)*}%n
+ * </pre>
+ *
+ * For example:
+ *
+ * <pre>
+ * %message{ansi}{WarningStyle=red,bold KeyStyle=white ValueStyle=blue}%n
+ * </pre>
+ *
+ * The call site can look like this:
+ *
+ * <pre>
+ * logger.info("@|KeyStyle {}|@ = @|ValueStyle {}|@", entry.getKey(), entry.getValue());
+ * </pre>
+ *
+ * Note: This class originally copied and then heavily modified code from JAnsi's AnsiRenderer (which is licensed as
+ * Apache 2.0.)
+ *
+ * @see AnsiRenderer
+ */
+public final class JAnsiTextRenderer implements TextRenderer {
+
+ public static final Map<String, Code[]> DefaultExceptionStyleMap;
+ static final Map<String, Code[]> DefaultMessageStyleMap;
+ private static final Map<String, Map<String, Code[]>> PrefedinedStyleMaps;
+
+ private static void put(final Map<String, Code[]> map, final String name, final Code... codes) {
+ map.put(name, codes);
+ }
+
+ static {
+ Map<String, Map<String, Code[]>> tempPreDefs = new HashMap<>();
+ // Default style: Spock
+ {
+ // TODO Should the keys be in an enum?
+ Map<String, Code[]> map = new HashMap<>();
+ put(map, "Prefix", WHITE);
+ put(map, "Name", BG_RED, WHITE);
+ put(map, "NameMessageSeparator", BG_RED, WHITE);
+ put(map, "Message", BG_RED, WHITE, BOLD);
+ put(map, "At", WHITE);
+ put(map, "CauseLabel", WHITE);
+ put(map, "Text", WHITE);
+ put(map, "More", WHITE);
+ put(map, "Suppressed", WHITE);
+ // StackTraceElement
+ put(map, "StackTraceElement.ClassName", YELLOW);
+ put(map, "StackTraceElement.ClassMethodSeparator", YELLOW);
+ put(map, "StackTraceElement.MethodName", YELLOW);
+ put(map, "StackTraceElement.NativeMethod", YELLOW);
+ put(map, "StackTraceElement.FileName", RED);
+ put(map, "StackTraceElement.LineNumber", RED);
+ put(map, "StackTraceElement.Container", RED);
+ put(map, "StackTraceElement.ContainerSeparator", WHITE);
+ put(map, "StackTraceElement.UnknownSource", RED);
+ // ExtraClassInfo
+ put(map, "ExtraClassInfo.Inexact", YELLOW);
+ put(map, "ExtraClassInfo.Container", YELLOW);
+ put(map, "ExtraClassInfo.ContainerSeparator", YELLOW);
+ put(map, "ExtraClassInfo.Location", YELLOW);
+ put(map, "ExtraClassInfo.Version", YELLOW);
+ // Save
+ DefaultExceptionStyleMap = Collections.unmodifiableMap(map);
+ tempPreDefs.put("Spock", DefaultExceptionStyleMap);
+ }
+ // Style: Kirk
+ {
+ // TODO Should the keys be in an enum?
+ Map<String, Code[]> map = new HashMap<>();
+ put(map, "Prefix", WHITE);
+ put(map, "Name", BG_RED, YELLOW, BOLD);
+ put(map, "NameMessageSeparator", BG_RED, YELLOW);
+ put(map, "Message", BG_RED, WHITE, BOLD);
+ put(map, "At", WHITE);
+ put(map, "CauseLabel", WHITE);
+ put(map, "Text", WHITE);
+ put(map, "More", WHITE);
+ put(map, "Suppressed", WHITE);
+ // StackTraceElement
+ put(map, "StackTraceElement.ClassName", BG_RED, WHITE);
+ put(map, "StackTraceElement.ClassMethodSeparator", BG_RED, YELLOW);
+ put(map, "StackTraceElement.MethodName", BG_RED, YELLOW);
+ put(map, "StackTraceElement.NativeMethod", BG_RED, YELLOW);
+ put(map, "StackTraceElement.FileName", RED);
+ put(map, "StackTraceElement.LineNumber", RED);
+ put(map, "StackTraceElement.Container", RED);
+ put(map, "StackTraceElement.ContainerSeparator", WHITE);
+ put(map, "StackTraceElement.UnknownSource", RED);
+ // ExtraClassInfo
+ put(map, "ExtraClassInfo.Inexact", YELLOW);
+ put(map, "ExtraClassInfo.Container", WHITE);
+ put(map, "ExtraClassInfo.ContainerSeparator", WHITE);
+ put(map, "ExtraClassInfo.Location", YELLOW);
+ put(map, "ExtraClassInfo.Version", YELLOW);
+ // Save
+ tempPreDefs.put("Kirk", Collections.unmodifiableMap(map));
+ }
+ {
+ Map<String, Code[]> temp = new HashMap<>();
+ // TODO
+ DefaultMessageStyleMap = Collections.unmodifiableMap(temp);
+ }
+ PrefedinedStyleMaps = Collections.unmodifiableMap(tempPreDefs);
+ }
+
+ private final String beginToken;
+ private final int beginTokenLen;
+ private final String endToken;
+ private final int endTokenLen;
+ private final Map<String, Code[]> styleMap;
+
+ public JAnsiTextRenderer(final String[] formats, final Map<String, Code[]> defaultStyleMap) {
+ String tempBeginToken = AnsiRenderer.BEGIN_TOKEN;
+ String tempEndToken = AnsiRenderer.END_TOKEN;
+ Map<String, Code[]> map;
+ if (formats.length > 1) {
+ final String allStylesStr = formats[1];
+ // Style def split
+ final String[] allStyleAssignmentsArr = allStylesStr.split(" ");
+ map = new HashMap<>(allStyleAssignmentsArr.length + defaultStyleMap.size());
+ map.putAll(defaultStyleMap);
+ for (final String styleAssignmentStr : allStyleAssignmentsArr) {
+ final String[] styleAssignmentArr = styleAssignmentStr.split("=");
+ if (styleAssignmentArr.length != 2) {
+ StatusLogger.getLogger().warn("{} parsing style \"{}\", expected format: StyleName=Code(,Code)*",
+ getClass().getSimpleName(), styleAssignmentStr);
+ } else {
+ final String styleName = styleAssignmentArr[0];
+ final String codeListStr = styleAssignmentArr[1];
+ final String[] codeNames = codeListStr.split(",");
+ if (codeNames.length == 0) {
+ StatusLogger.getLogger().warn(
+ "{} parsing style \"{}\", expected format: StyleName=Code(,Code)*",
+ getClass().getSimpleName(), styleAssignmentStr);
+ } else {
+ switch (styleName) {
+ case "BeginToken":
+ tempBeginToken = codeNames[0];
+ break;
+ case "EndToken":
+ tempEndToken = codeNames[0];
+ break;
+ case "StyleMapName":
+ final String predefinedMapName = codeNames[0];
+ Map<String, Code[]> predefinedMap = PrefedinedStyleMaps.get(predefinedMapName);
+ if (predefinedMap != null) {
+ map.putAll(predefinedMap);
+ } else {
+ StatusLogger.getLogger().warn("Unknown predefined map name {}, pick one of {}",
+ predefinedMapName, null);
+ }
+ break;
+ default:
+ final Code[] codes = new Code[codeNames.length];
+ for (int i = 0; i < codes.length; i++) {
+ codes[i] = toCode(codeNames[i]);
+ }
+ map.put(styleName, codes);
+ }
+ }
+ }
+ }
+ } else {
+ map = defaultStyleMap;
+ }
+ styleMap = map;
+ beginToken = tempBeginToken;
+ endToken = tempEndToken;
+ beginTokenLen = tempBeginToken.length();
+ endTokenLen = tempEndToken.length();
+ }
+
+ public Map<String, Code[]> getStyleMap() {
+ return styleMap;
+ }
+
+ private void render(final Ansi ansi, final Code code) {
+ if (code.isColor()) {
+ if (code.isBackground()) {
+ ansi.bg(code.getColor());
+ } else {
+ ansi.fg(code.getColor());
+ }
+ } else if (code.isAttribute()) {
+ ansi.a(code.getAttribute());
+ }
+ }
+
+ private void render(final Ansi ansi, final Code... codes) {
+ for (final Code code : codes) {
+ render(ansi, code);
+ }
+ }
+
+ /**
+ * Renders the given text with the given names which can be ANSI code names or Log4j style names.
+ *
+ * @param text
+ * The text to render
+ * @param names
+ * ANSI code names or Log4j style names.
+ * @return A rendered string containing ANSI codes.
+ */
+ private String render(final String text, final String... names) {
+ final Ansi ansi = Ansi.ansi();
+ for (final String name : names) {
+ final Code[] codes = styleMap.get(name);
+ if (codes != null) {
+ render(ansi, codes);
+ } else {
+ render(ansi, toCode(name));
+ }
+ }
+ return ansi.a(text).reset().toString();
+ }
+
+ // EXACT COPY OF StringBuilder version of the method but typed as String for input
+ @Override
+ public void render(final String input, final StringBuilder output, final String styleName)
+ throws IllegalArgumentException {
+ output.append(render(input, styleName));
+ }
+
+ @Override
+ public void render(final StringBuilder input, final StringBuilder output) throws IllegalArgumentException {
+ int i = 0;
+ int j, k;
+
+ while (true) {
+ j = input.indexOf(beginToken, i);
+ if (j == -1) {
+ if (i == 0) {
+ output.append(input);
+ return;
+ }
+ output.append(input.substring(i, input.length()));
+ return;
+ }
+ output.append(input.substring(i, j));
+ k = input.indexOf(endToken, j);
+
+ if (k == -1) {
+ output.append(input);
+ return;
+ }
+ j += beginTokenLen;
+ final String spec = input.substring(j, k);
+
+ final String[] items = spec.split(AnsiRenderer.CODE_TEXT_SEPARATOR, 2);
+ if (items.length == 1) {
+ output.append(input);
+ return;
+ }
+ final String replacement = render(items[1], items[0].split(","));
+
+ output.append(replacement);
+
+ i = k + endTokenLen;
+ }
+ }
+
+ private Code toCode(final String name) {
+ return Code.valueOf(name.toUpperCase(Locale.ENGLISH));
+ }
+
+ @Override
+ public String toString() {
+ return "JAnsiMessageRenderer [beginToken=" + beginToken + ", beginTokenLen=" + beginTokenLen + ", endToken="
+ + endToken + ", endTokenLen=" + endTokenLen + ", styleMap=" + styleMap + "]";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
index 1fd2d2b..2287133 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java
@@ -57,7 +57,7 @@ public final class MessagePatternConverter extends LogEventPatternConverter {
this.textRenderer = loadMessageRenderer(noLookupsIdx >= 0 ? ArrayUtils.remove(options, noLookupsIdx) : options);
}
- private int loadNoLookups(String[] options) {
+ private int loadNoLookups(final String[] options) {
if (options != null) {
for (int i = 0; i < options.length; i++) {
final String option = options[i];
@@ -69,7 +69,7 @@ public final class MessagePatternConverter extends LogEventPatternConverter {
return -1;
}
- private TextRenderer loadMessageRenderer(String[] options) {
+ private TextRenderer loadMessageRenderer(final String[] options) {
if (options != null) {
for (String option : options) {
switch (option.toUpperCase(Locale.ROOT)) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
index 9e26bba..5233432 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java
@@ -28,12 +28,12 @@ public final class PlainTextRenderer implements TextRenderer {
}
@Override
- public void render(String input, StringBuilder output, String styleName) {
+ public void render(final String input, final StringBuilder output, final String styleName) {
output.append(input);
}
@Override
- public void render(StringBuilder input, StringBuilder output) {
+ public void render(final StringBuilder input, final StringBuilder output) {
output.append(input);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
index 6b75a83..52916b1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
@@ -44,7 +44,7 @@ public class ExecutorServices {
* @return {@code true} if the given executor terminated and {@code false} if the timeout elapsed before
* termination.
*/
- public static boolean shutdown(ExecutorService executorService, long timeout, TimeUnit timeUnit, String source) {
+ public static boolean shutdown(final ExecutorService executorService, final long timeout, final TimeUnit timeUnit, final String source) {
if (executorService == null || executorService.isTerminated()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
index cded615..d982dea 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.java
@@ -177,7 +177,7 @@ public class FixedDateFormat {
* @param tz the time zone to use
* @return the {@code FastDateFormat} object for formatting the date part of the pattern or {@code null}
*/
- public FastDateFormat getFastDateFormat(TimeZone tz) {
+ public FastDateFormat getFastDateFormat(final TimeZone tz) {
return getDatePattern() == null ? null : FastDateFormat.getInstance(getDatePattern(), tz);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
index 989f861..0bc391d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
@@ -65,7 +65,7 @@ public class FileAppenderTest {
private static final Path PATH = Paths.get(FILE_NAME);
private static final int THREADS = 2;
- public FileAppenderTest(boolean createOnDemand) {
+ public FileAppenderTest(final boolean createOnDemand) {
super();
this.createOnDemand = createOnDemand;
}
@@ -176,7 +176,7 @@ public class FileAppenderTest {
testMultipleLockingAppenderThreads(false, threadCount);
}
- private void testMultipleLockingAppenderThreads(final boolean lock, int threadCount)
+ private void testMultipleLockingAppenderThreads(final boolean lock, final int threadCount)
throws InterruptedException, Exception {
final ExecutorService threadPool = Executors.newFixedThreadPool(threadCount);
final Exception[] exceptionRef = new Exception[1];
@@ -228,8 +228,8 @@ public class FileAppenderTest {
verifyFile(logEventCount * processCount);
}
- private static void writer(final boolean locking, final int logEventCount, final String name, boolean createOnDemand,
- boolean concurrent) throws Exception {
+ private static void writer(final boolean locking, final int logEventCount, final String name, final boolean createOnDemand,
+ final boolean concurrent) throws Exception {
final Layout<String> layout = createPatternLayout();
// @formatter:off
final FileAppender appender = FileAppender.newBuilder()
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
index aad7d27..09ac0c6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
@@ -41,7 +41,7 @@ import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
public class JsonCompleteFileAppenderTest {
- public JsonCompleteFileAppenderTest(Class<ContextSelector> contextSelector) {
+ public JsonCompleteFileAppenderTest(final Class<ContextSelector> contextSelector) {
this.loggerContextRule = new LoggerContextRule("JsonCompleteFileAppenderTest.xml", contextSelector);
this.cleanFiles = new CleanFiles(logFile);
this.ruleChain = RuleChain.outerRule(cleanFiles).around(loggerContextRule);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 231da77..45a6074 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -118,7 +118,7 @@ public class SocketAppenderTest {
testTcpAppender(tcpServer, logger, Constants.ENCODER_BYTE_BUFFER_SIZE);
}
- static void testTcpAppender(TcpSocketTestServer tcpTestServer, final Logger logger, final int bufferSize)
+ static void testTcpAppender(final TcpSocketTestServer tcpTestServer, final Logger logger, final int bufferSize)
throws Exception {
// @formatter:off
final SocketAppender appender = SocketAppender.newBuilder()
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
index 8309ddf..1260d71 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
@@ -43,7 +43,7 @@ import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
public class XmlCompleteFileAppenderTest {
- public XmlCompleteFileAppenderTest(Class<ContextSelector> contextSelector) {
+ public XmlCompleteFileAppenderTest(final Class<ContextSelector> contextSelector) {
this.loggerContextRule = new LoggerContextRule("XmlCompleteFileAppenderTest.xml", contextSelector);
this.cleanFiles = new CleanFiles(logFile);
this.ruleChain = RuleChain.outerRule(cleanFiles).around(loggerContextRule);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
index de07b51..ccf7ad1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
@@ -118,7 +118,7 @@ public class RoutingAppenderWithPurgingTest {
}
- private void assertFileExistance(String... files) {
+ private void assertFileExistance(final String... files) {
for (String file : files) {
assertTrue("File should exist - " + file + " file ", new File(file).exists());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java
index 9b2adff..a36b20c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunConversant.java
@@ -25,7 +25,7 @@ import com.conversantmedia.util.concurrent.SpinPolicy;
public class RunConversant extends AbstractRunQueue {
@Override
- BlockingQueue<String> createQueue(int capacity) {
+ BlockingQueue<String> createQueue(final int capacity) {
return DisruptorBlockingQueueFactory.<String>createFactory(SpinPolicy.SPINNING).create(capacity);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
index a5a632c..7fe753b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/RunJCTools.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.async.JCToolsBlockingQueueFactory.WaitStrat
public class RunJCTools extends AbstractRunQueue {
@Override
- BlockingQueue<String> createQueue(int capacity) {
+ BlockingQueue<String> createQueue(final int capacity) {
return JCToolsBlockingQueueFactory.<String>createFactory(WaitStrategy.SPIN).create(capacity);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
index 4bd1af9..6559572 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
@@ -46,14 +46,14 @@ public class ResolverUtilCustomProtocolTest {
static class NoopURLStreamHandlerFactory implements URLStreamHandlerFactory {
@Override
- public URLStreamHandler createURLStreamHandler(String protocol) {
+ public URLStreamHandler createURLStreamHandler(final String protocol) {
return new URLStreamHandler() {
@Override
- protected URLConnection openConnection(URL url) {
+ protected URLConnection openConnection(final URL url) {
return open(url, null);
}
- private URLConnection open(URL url, Proxy proxy) {
+ private URLConnection open(final URL url, final Proxy proxy) {
return new URLConnection(url) {
@Override
public void connect() throws IOException {
@@ -63,7 +63,7 @@ public class ResolverUtilCustomProtocolTest {
}
@Override
- protected URLConnection openConnection(URL url, Proxy proxy) {
+ protected URLConnection openConnection(final URL url, final Proxy proxy) {
return open(url, proxy);
}
@@ -78,32 +78,32 @@ public class ResolverUtilCustomProtocolTest {
static class SingleURLClassLoader extends ClassLoader {
private final URL url;
- public SingleURLClassLoader(URL url) {
+ public SingleURLClassLoader(final URL url) {
this.url = url;
}
- public SingleURLClassLoader(URL url, ClassLoader parent) {
+ public SingleURLClassLoader(final URL url, final ClassLoader parent) {
super(parent);
this.url = url;
}
@Override
- protected URL findResource(String name) {
+ protected URL findResource(final String name) {
return url;
}
@Override
- public URL getResource(String name) {
+ public URL getResource(final String name) {
return findResource(name);
}
@Override
- public Enumeration<URL> getResources(String name) throws IOException {
+ public Enumeration<URL> getResources(final String name) throws IOException {
return findResources(name);
}
@Override
- protected Enumeration<URL> findResources(String name) throws IOException {
+ protected Enumeration<URL> findResources(final String name) throws IOException {
return Collections.enumeration(Arrays.asList(findResource(name)));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
index c0f1e3a..b5b894f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
@@ -165,7 +165,7 @@ public class ResolverUtilTest {
resolverUtil.getClasses().iterator().next());
}
- static URLClassLoader compileJarAndCreateClassLoader(String suffix) throws IOException, Exception {
+ static URLClassLoader compileJarAndCreateClassLoader(final String suffix) throws IOException, Exception {
File workDir = compile(suffix);
File jarFile = new File(workDir, "customplugin" + suffix + ".jar");
URI jarURI = jarFile.toURI();
@@ -174,12 +174,12 @@ public class ResolverUtilTest {
return URLClassLoader.newInstance(new URL[] {jarURI.toURL()});
}
- static URLClassLoader compileAndCreateClassLoader(String suffix) throws IOException {
+ static URLClassLoader compileAndCreateClassLoader(final String suffix) throws IOException {
final File workDir = compile(suffix);
return URLClassLoader.newInstance(new URL[] {workDir.toURI().toURL()});
}
- static File compile(String suffix) throws IOException {
+ static File compile(final String suffix) throws IOException {
final File orig = new File("target/test-classes/customplugin/FixedStringLayout.java.source");
final File workDir = new File("target/resolverutil" + suffix);
final File f = new File(workDir, "customplugin" + suffix + "/FixedString" + suffix + "Layout.java");
@@ -197,7 +197,7 @@ public class ResolverUtilTest {
return workDir;
}
- static void createJar(URI jarURI, File workDir, File f) throws Exception {
+ static void createJar(final URI jarURI, final File workDir, final File f) throws Exception {
Map<String, String> env = new HashMap<>();
env.put("create", "true");
URI uri = URI.create("jar:file://" + jarURI.getRawPath());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
index c331a29..9f3d0b6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptionsTest.java
@@ -123,7 +123,7 @@ public final class ThrowableFormatOptionsTest {
testFullAnsiEmptyConfig(tfo);
}
- private void testFullAnsiEmptyConfig(ThrowableFormatOptions tfo) {
+ private void testFullAnsiEmptyConfig(final ThrowableFormatOptions tfo) {
TextRenderer textRenderer = tfo.getTextRenderer();
Assert.assertNotNull(textRenderer);
Assert.assertTrue(textRenderer instanceof JAnsiTextRenderer);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
index 3bae771..9c0b861 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
@@ -137,12 +137,12 @@ public class ThrowableProxyTest {
private final Permissions permissions;
- public SimplePolicy(Permissions permissions) {
+ public SimplePolicy(final Permissions permissions) {
this.permissions = permissions;
}
@Override
- public PermissionCollection getPermissions(CodeSource codesource) {
+ public PermissionCollection getPermissions(final CodeSource codesource) {
return permissions;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_CoreTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_CoreTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_CoreTest.java
index 24a38b6..da023df 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_CoreTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_CoreTest.java
@@ -6,7 +6,7 @@ import org.apache.logging.log4j.Logger;
public class Log4j2_1482_CoreTest extends Log4j2_1482_Test {
@Override
- protected void log(int runNumber) {
+ protected void log(final int runNumber) {
if (runNumber == 2) {
// System.out.println("Set a breakpoint here.");
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 d25a6ac..f14d348 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
@@ -44,7 +44,7 @@ public abstract class Log4j2_1482_Test {
private static final int LOOP_COUNT = 10;
- static void assertFileContents(int runNumber) throws IOException {
+ static void assertFileContents(final int runNumber) throws IOException {
Path path = Paths.get(FOLDER + "/audit.tmp");
List<String> lines = Files.readAllLines(path, Charset.defaultCharset());
int i = 1;
@@ -66,7 +66,7 @@ public abstract class Log4j2_1482_Test {
protected abstract void log(int runNumber) ;
- private void loopingRun(int loopCount) throws IOException {
+ private void loopingRun(final int loopCount) throws IOException {
for (int i = 1; i <= loopCount; i++) {
try (LoggerContext loggerContext = Configurator.initialize(getClass().getName(),
CONFIG_LOCATION)) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
index 39a2324..917416e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
@@ -48,7 +48,7 @@ public class CleanFiles extends AbstractExternalFileCleaner {
}
@Override
- protected boolean clean(Path path, int tryIndex) throws IOException {
+ protected boolean clean(final Path path, final int tryIndex) throws IOException {
return Files.deleteIfExists(path);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
index 5bddd12..09704ec 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
@@ -69,7 +69,7 @@ public class CleanFolders extends AbstractExternalFileCleaner {
}
@Override
- protected boolean clean(Path path, int tryIndex) throws IOException {
+ protected boolean clean(final Path path, final int tryIndex) throws IOException {
cleanFolder(path);
return true;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
index 9434f25..cc0b343 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
*/
public class LoggerContextRule implements TestRule {
- public static LoggerContextRule createShutdownTimeoutLoggerContextRule(String config) {
+ public static LoggerContextRule createShutdownTimeoutLoggerContextRule(final String config) {
return new LoggerContextRule(config, 10, TimeUnit.SECONDS);
}
@@ -95,7 +95,7 @@ public class LoggerContextRule implements TestRule {
this.shutdownTimeUnit = shutdownTimeUnit;
}
- public LoggerContextRule(String config, int shutdownTimeout, TimeUnit shutdownTimeUnit) {
+ public LoggerContextRule(final String config, final int shutdownTimeout, final TimeUnit shutdownTimeUnit) {
this(config, null, shutdownTimeout, shutdownTimeUnit);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 ac08bb3..e3ba5ff 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
@@ -40,7 +40,7 @@ public class URLStreamHandlerFactoryRule implements TestRule {
this(null);
}
- public URLStreamHandlerFactoryRule(URLStreamHandlerFactory newURLStreamHandlerFactory) {
+ public URLStreamHandlerFactoryRule(final URLStreamHandlerFactory newURLStreamHandlerFactory) {
this.newURLStreamHandlerFactory = newURLStreamHandlerFactory;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 bdad7e4..ffb405d 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
@@ -165,7 +165,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF
* @return A Flume Avro Appender.
*/
@PluginFactory
- public static FlumeAppender createAppender(@PluginElement("Agents") Agent[] agents,
+ public static FlumeAppender createAppender(@PluginElement("Agents") final Agent[] agents,
@PluginElement("Properties") final Property[] properties,
@PluginAttribute("hosts") final String hosts,
@PluginAttribute("embedded") final String embedded,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
index 11815cb..6e3bddb 100644
--- a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
+++ b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
@@ -51,14 +51,14 @@ public class CustomConfiguration extends AbstractConfiguration {
*/
public static final String DEFAULT_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
- public CustomConfiguration(LoggerContext loggerContext) {
+ public CustomConfiguration(final LoggerContext loggerContext) {
this(loggerContext, ConfigurationSource.NULL_SOURCE);
}
/**
* Constructor to create the default configuration.
*/
- public CustomConfiguration(LoggerContext loggerContext, final ConfigurationSource source) {
+ public CustomConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
super(loggerContext, source);
setName(CONFIG_NAME);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java
index d621e76..8934f29 100644
--- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java
+++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j2_1482_Slf4jTest.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
public class Log4j2_1482_Slf4jTest extends Log4j2_1482_Test {
@Override
- protected void log(int runNumber) {
+ protected void log(final int runNumber) {
if (runNumber == 2) {
// System.out.println("Set a breakpoint here.");
}
[2/2] logging-log4j2 git commit: Add final modifier to method
parameters
Posted by gg...@apache.org.
Add final modifier to method parameters
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/19c92876
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/19c92876
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/19c92876
Branch: refs/heads/master
Commit: 19c92876f957a8439fa9c21ea6b9c13aced0c006
Parents: c513f13
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Sep 6 23:00:21 2016 -0400
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Sep 6 23:00:21 2016 -0400
----------------------------------------------------------------------
.../config/Log4j1ConfigurationConverter.java | 2 +-
.../log4j/config/Log4j1ConfigurationParser.java | 12 +-
.../apache/log4j/layout/Log4j1XmlLayout.java | 2 +-
.../pattern/Log4j1MdcPatternConverterTest.java | 2 +-
.../logging/log4j/core/AbstractLifeCycle.java | 2 +-
.../logging/log4j/core/LoggerContext.java | 6 +-
.../log4j/core/appender/AbstractAppender.java | 6 +-
.../log4j/core/appender/AbstractManager.java | 2 +-
.../appender/AbstractOutputStreamAppender.java | 2 +-
.../log4j/core/appender/AsyncAppender.java | 20 +-
.../core/appender/ConfigurationFactoryData.java | 2 +-
.../log4j/core/appender/FileManager.java | 6 +-
.../core/appender/OutputStreamManager.java | 4 +-
.../core/appender/RandomAccessFileManager.java | 6 +-
.../core/appender/RollingFileAppender.java | 10 +-
.../log4j/core/appender/WriterManager.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../core/appender/mom/jeromq/JeroMqManager.java | 2 +-
.../core/appender/mom/kafka/KafkaManager.java | 2 +-
.../appender/rolling/CronTriggeringPolicy.java | 2 +-
.../rolling/OnStartupTriggeringPolicy.java | 2 +-
.../core/appender/rolling/PatternProcessor.java | 2 +-
.../appender/rolling/RollingFileManager.java | 6 +-
.../rolling/RollingRandomAccessFileManager.java | 4 +-
.../core/async/ArrayBlockingQueueFactory.java | 2 +-
.../async/DisruptorBlockingQueueFactory.java | 2 +-
.../core/async/JCToolsBlockingQueueFactory.java | 2 +-
.../core/async/LinkedTransferQueueFactory.java | 2 +-
.../core/config/AbstractConfiguration.java | 2 +-
.../core/config/ConfigurationScheduler.java | 2 +-
.../log4j/core/config/CronScheduledFuture.java | 2 +-
.../config/builder/impl/BuiltConfiguration.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 14 +-
.../properties/PropertiesConfiguration.java | 2 +-
.../PropertiesConfigurationBuilder.java | 2 +-
.../PropertiesConfigurationFactory.java | 2 +-
.../log4j/core/filter/AbstractFilterable.java | 2 +-
.../log4j/core/impl/ExtendedClassInfo.java | 2 +-
.../core/impl/ExtendedStackTraceElement.java | 4 +-
.../log4j/core/impl/ThrowableFormatOptions.java | 592 ++++++++---------
.../logging/log4j/core/impl/ThrowableProxy.java | 14 +-
.../log4j/core/net/DatagramSocketManager.java | 2 +-
.../logging/log4j/core/net/JndiManager.java | 2 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../log4j/core/net/TcpSocketManager.java | 2 +-
.../log4j/core/pattern/HtmlTextRenderer.java | 6 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 664 +++++++++----------
.../core/pattern/MessagePatternConverter.java | 4 +-
.../log4j/core/pattern/PlainTextRenderer.java | 4 +-
.../log4j/core/util/ExecutorServices.java | 2 +-
.../core/util/datetime/FixedDateFormat.java | 2 +-
.../log4j/core/appender/FileAppenderTest.java | 8 +-
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../log4j/core/appender/SocketAppenderTest.java | 2 +-
.../appender/XmlCompleteFileAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 2 +-
.../core/async/perftest/RunConversant.java | 2 +-
.../log4j/core/async/perftest/RunJCTools.java | 2 +-
.../util/ResolverUtilCustomProtocolTest.java | 20 +-
.../config/plugins/util/ResolverUtilTest.java | 8 +-
.../core/impl/ThrowableFormatOptionsTest.java | 2 +-
.../log4j/core/impl/ThrowableProxyTest.java | 4 +-
.../log4j/core/layout/Log4j2_1482_CoreTest.java | 2 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 4 +-
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../logging/log4j/junit/CleanFolders.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 4 +-
.../junit/URLStreamHandlerFactoryRule.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 2 +-
.../configuration/CustomConfiguration.java | 4 +-
.../logging/slf4j/Log4j2_1482_Slf4jTest.java | 2 +-
72 files changed, 764 insertions(+), 764 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 ab09f4b..3cfb888 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
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
*/
public final class Log4j1ConfigurationConverter {
- public static void main(String[] args) throws IOException {
+ public static void main(final String[] args) throws IOException {
try (InputStream input = args.length > 0 ? new FileInputStream(args[0]) : System.in;
OutputStream output = args.length > 1 ? new FileOutputStream(args[1]) : System.out) {
ConfigurationBuilder<BuiltConfiguration> builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(input);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 9356584..d857877 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
@@ -176,22 +176,22 @@ public class Log4j1ConfigurationParser {
builder.add(appenderBuilder);
}
- private void buildAttribute(String componentName, ComponentBuilder componentBuilder,
- String sourceAttributeName, String targetAttributeName) {
+ private void buildAttribute(final String componentName, final ComponentBuilder componentBuilder,
+ final String sourceAttributeName, final String targetAttributeName) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName);
if (attributeValue != null) {
componentBuilder.addAttribute(targetAttributeName, attributeValue);
}
}
- private void buildAttributeWithDefault(String componentName, ComponentBuilder componentBuilder,
- String sourceAttributeName, String targetAttributeName, String defaultValue) {
+ private void buildAttributeWithDefault(final String componentName, final ComponentBuilder componentBuilder,
+ final String sourceAttributeName, final String targetAttributeName, final String defaultValue) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName, defaultValue);
componentBuilder.addAttribute(targetAttributeName, attributeValue);
}
- private void buildMandatoryAttribute(String componentName, ComponentBuilder componentBuilder,
- String sourceAttributeName, String targetAttributeName) {
+ private void buildMandatoryAttribute(final String componentName, final ComponentBuilder componentBuilder,
+ final String sourceAttributeName, final String targetAttributeName) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName);
if (attributeValue != null) {
componentBuilder.addAttribute(targetAttributeName, attributeValue);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
index 1df66d5..8d0fba9 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
@@ -53,7 +53,7 @@ public final class Log4j1XmlLayout extends AbstractStringLayout {
return new Log4j1XmlLayout(locationInfo, properties);
}
- private Log4j1XmlLayout(boolean locationInfo, boolean properties) {
+ private Log4j1XmlLayout(final boolean locationInfo, final boolean properties) {
super(StandardCharsets.UTF_8);
this.locationInfo = locationInfo;
this.properties = properties;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
index 32ac89f..e997aee 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
@@ -62,7 +62,7 @@ public class Log4j1MdcPatternConverterTest {
test(contextMap, expected, new String[] {"key1"});
}
- private void test(Map<String, String> contextMap, String expected, String[] options) {
+ private void test(final Map<String, String> contextMap, final String expected, final String[] options) {
final LogEvent event = Log4jLogEvent.newBuilder()
.setLoggerName("MyLogger")
.setLevel(Level.DEBUG)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
index 33aabd1..71cc13d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLifeCycle.java
@@ -127,7 +127,7 @@ public class AbstractLifeCycle implements LifeCycle {
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
this.state = LifeCycle.State.STOPPED;
return true;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 248b591..1fbc855 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -302,7 +302,7 @@ public class LoggerContext extends AbstractLifeCycle
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
LOGGER.debug("Stopping LoggerContext[name={}, {}]...", getName(), this);
configLock.lock();
final boolean shutdownEs;
@@ -685,7 +685,7 @@ public class LoggerContext extends AbstractLifeCycle
* scheduled for execution
* @throws NullPointerException if the task is null
*/
- public Future<?> submit(Runnable task) {
+ public Future<?> submit(final Runnable task) {
return executorService.submit(task);
}
@@ -701,7 +701,7 @@ public class LoggerContext extends AbstractLifeCycle
* @throws NullPointerException
* if the task is null
*/
- public Future<?> submitDaemon(Runnable task) {
+ public Future<?> submitDaemon(final Runnable task) {
return executorServiceDeamons.submit(task);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
index 8df298f..069392c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
@@ -66,17 +66,17 @@ public abstract class AbstractAppender extends AbstractFilterable implements App
return layout;
}
- public B withName(String name) {
+ public B withName(final String name) {
this.name = name;
return asBuilder();
}
- public B withIgnoreExceptions(boolean ignoreExceptions) {
+ public B withIgnoreExceptions(final boolean ignoreExceptions) {
this.ignoreExceptions = ignoreExceptions;
return asBuilder();
}
- public B withLayout(Layout<? extends Serializable> layout) {
+ public B withLayout(final Layout<? extends Serializable> layout) {
this.layout = layout;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
index dfe7ffd..edd82a2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
@@ -144,7 +144,7 @@ public abstract class AbstractManager implements AutoCloseable {
* @param timeout TODO
* @param timeUnit TODO
*/
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
// This default implementation does nothing.
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 4d16be8..1ff4cb9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -60,7 +60,7 @@ public abstract class AbstractOutputStreamAppender<M extends OutputStreamManager
return immediateFlush;
}
- public B withImmediateFlush(boolean immediateFlush) {
+ public B withImmediateFlush(final boolean immediateFlush) {
this.immediateFlush = immediateFlush;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index 4e85d67..ff75f77 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -308,52 +308,52 @@ public final class AsyncAppender extends AbstractAppender {
@PluginElement(BlockingQueueFactory.ELEMENT_TYPE)
private BlockingQueueFactory<LogEvent> blockingQueueFactory = new ArrayBlockingQueueFactory<>();
- public Builder setAppenderRefs(AppenderRef[] appenderRefs) {
+ public Builder setAppenderRefs(final AppenderRef[] appenderRefs) {
this.appenderRefs = appenderRefs;
return this;
}
- public Builder setErrorRef(String errorRef) {
+ public Builder setErrorRef(final String errorRef) {
this.errorRef = errorRef;
return this;
}
- public Builder setBlocking(boolean blocking) {
+ public Builder setBlocking(final boolean blocking) {
this.blocking = blocking;
return this;
}
- public Builder setShutdownTimeout(long shutdownTimeout) {
+ public Builder setShutdownTimeout(final long shutdownTimeout) {
this.shutdownTimeout = shutdownTimeout;
return this;
}
- public Builder setBufferSize(int bufferSize) {
+ public Builder setBufferSize(final int bufferSize) {
this.bufferSize = bufferSize;
return this;
}
- public Builder setName(String name) {
+ public Builder setName(final String name) {
this.name = name;
return this;
}
- public Builder setIncludeLocation(boolean includeLocation) {
+ public Builder setIncludeLocation(final boolean includeLocation) {
this.includeLocation = includeLocation;
return this;
}
- public Builder setFilter(Filter filter) {
+ public Builder setFilter(final Filter filter) {
this.filter = filter;
return this;
}
- public Builder setConfiguration(Configuration configuration) {
+ public Builder setConfiguration(final Configuration configuration) {
this.configuration = configuration;
return this;
}
- public Builder setIgnoreExceptions(boolean ignoreExceptions) {
+ public Builder setIgnoreExceptions(final boolean ignoreExceptions) {
this.ignoreExceptions = ignoreExceptions;
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
index e2c20d4..cadfea0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConfigurationFactoryData.java
@@ -29,7 +29,7 @@ public class ConfigurationFactoryData {
*/
public final Configuration configuration;
- public ConfigurationFactoryData(Configuration configuration) {
+ public ConfigurationFactoryData(final Configuration configuration) {
super();
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 cb8e2ed..6c0427a 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
@@ -76,7 +76,7 @@ public class FileManager extends OutputStreamManager {
/**
* @since 2.7
*/
- protected FileManager(LoggerContext loggerContext, final String fileName, final OutputStream os, final boolean append, final boolean locking,
+ protected FileManager(final LoggerContext loggerContext, final String fileName, final OutputStream os, final boolean append, final boolean locking,
final boolean createOnDemand, final String advertiseURI, final Layout<? extends Serializable> layout,
final boolean writeHeader, final ByteBuffer buffer) {
super(loggerContext, os, fileName, createOnDemand, layout, writeHeader, buffer);
@@ -102,7 +102,7 @@ public class FileManager extends OutputStreamManager {
*/
public static FileManager getFileManager(final String fileName, final boolean append, boolean locking,
final boolean bufferedIo, final boolean createOnDemand, final String advertiseUri,
- final Layout<? extends Serializable> layout, final int bufferSize, Configuration configuration) {
+ final Layout<? extends Serializable> layout, final int bufferSize, final Configuration configuration) {
if (locking && bufferedIo) {
locking = false;
@@ -220,7 +220,7 @@ public class FileManager extends OutputStreamManager {
*/
public FactoryData(final boolean append, final boolean locking, final boolean bufferedIo, final int bufferSize,
final boolean createOnDemand, final String advertiseURI, final Layout<? extends Serializable> layout,
- Configuration configuration) {
+ final Configuration configuration) {
super(configuration);
this.append = append;
this.locking = locking;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
index f42cc72..af4e11e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
@@ -76,7 +76,7 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe
/**
* @since 2.7
*/
- protected OutputStreamManager(final LoggerContext loggerContext, OutputStream os, final String streamName,
+ protected OutputStreamManager(final LoggerContext loggerContext, final OutputStream os, final String streamName,
final boolean createOnDemand, final Layout<? extends Serializable> layout, final boolean writeHeader,
final ByteBuffer byteBuffer) {
super(loggerContext, streamName);
@@ -131,7 +131,7 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe
* Default hook to write footer during close.
*/
@Override
- public void releaseSub(long timeout, TimeUnit timeUnit) {
+ public void releaseSub(final long timeout, final TimeUnit timeUnit) {
writeFooter();
closeOutputStream();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
index 6aca266..68a6f81 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
@@ -44,7 +44,7 @@ public class RandomAccessFileManager extends OutputStreamManager {
private final RandomAccessFile randomAccessFile;
private final ThreadLocal<Boolean> isEndOfBatch = new ThreadLocal<>();
- protected RandomAccessFileManager(LoggerContext loggerContext, final RandomAccessFile file, final String fileName,
+ protected RandomAccessFileManager(final LoggerContext loggerContext, final RandomAccessFile file, final String fileName,
final OutputStream os, final int bufferSize, final String advertiseURI,
final Layout<? extends Serializable> layout, final boolean writeHeader) {
super(loggerContext, os, fileName, false, layout, writeHeader, ByteBuffer.wrap(new byte[bufferSize]));
@@ -69,7 +69,7 @@ public class RandomAccessFileManager extends OutputStreamManager {
*/
public static RandomAccessFileManager getFileManager(final String fileName, final boolean append,
final boolean isFlush, final int bufferSize, final String advertiseURI,
- final Layout<? extends Serializable> layout, Configuration configuration) {
+ final Layout<? extends Serializable> layout, final Configuration configuration) {
return (RandomAccessFileManager) getManager(fileName, new FactoryData(append,
isFlush, bufferSize, advertiseURI, layout, configuration), FACTORY);
}
@@ -158,7 +158,7 @@ public class RandomAccessFileManager extends OutputStreamManager {
* @param configuration The configuration.
*/
public FactoryData(final boolean append, final boolean immediateFlush, final int bufferSize,
- final String advertiseURI, final Layout<? extends Serializable> layout, Configuration configuration) {
+ final String advertiseURI, final Layout<? extends Serializable> layout, final Configuration configuration) {
super(configuration);
this.append = append;
this.immediateFlush = immediateFlush;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index 44ab7f3..726c2d2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -216,17 +216,17 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
return strategy;
}
- public B withFilePattern(String filePattern) {
+ public B withFilePattern(final String filePattern) {
this.filePattern = filePattern;
return asBuilder();
}
- public B withPolicy(TriggeringPolicy policy) {
+ public B withPolicy(final TriggeringPolicy policy) {
this.policy = policy;
return asBuilder();
}
- public B withStrategy(RolloverStrategy strategy) {
+ public B withStrategy(final RolloverStrategy strategy) {
this.strategy = strategy;
return asBuilder();
}
@@ -335,8 +335,8 @@ public final class RollingFileAppender extends AbstractOutputStreamAppender<Roll
final String bufferSizeStr,
final String immediateFlush,
final TriggeringPolicy policy,
- RolloverStrategy strategy,
- Layout<? extends Serializable> layout,
+ final RolloverStrategy strategy,
+ final Layout<? extends Serializable> layout,
final Filter filter,
final String ignore,
final String advertise,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
index 5a95794..323a9fe 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
@@ -99,7 +99,7 @@ public class WriterManager extends AbstractManager {
* Default hook to write footer during close.
*/
@Override
- public void releaseSub(long timeout, TimeUnit timeUnit) {
+ public void releaseSub(final long timeout, final TimeUnit timeUnit) {
writeFooter();
closeWriter();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index 26f0070..5f46bf4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -171,7 +171,7 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
}
@Override
- public final void releaseSub(long timeout, TimeUnit timeUnit) {
+ public final void releaseSub(final long timeout, final TimeUnit timeUnit) {
this.shutdown();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
index 2d8dfda..a36d3fb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
@@ -125,7 +125,7 @@ public class JmsManager extends AbstractManager {
}
@Override
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
try {
this.session.close();
} catch (final JMSException ignored) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
index c460d93..f731d61 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
@@ -105,7 +105,7 @@ public class JeroMqManager extends AbstractManager {
}
@Override
- protected void releaseSub(long timeout, TimeUnit timeUnit) {
+ protected void releaseSub(final long timeout, final TimeUnit timeUnit) {
publisher.close();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 58c4ba2..d991d7e 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
@@ -43,7 +43,7 @@ public class KafkaManager extends AbstractManager {
private final String topic;
- public KafkaManager(LoggerContext loggerContext, final String name, final String topic, final Property[] properties) {
+ public KafkaManager(final LoggerContext loggerContext, final String name, final String topic, final Property[] properties) {
super(loggerContext, name);
this.topic = topic;
config.setProperty("key.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
index 8d8bba7..54998dc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
@@ -141,7 +141,7 @@ public final class CronTriggeringPolicy extends AbstractLifeCycle implements Tri
}
@Override
- public boolean stop(long timeout, TimeUnit timeUnit) {
+ public boolean stop(final long timeout, final TimeUnit timeUnit) {
setStopping();
boolean canceled = true;
if (future != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
index ae7e439..36639ae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
@@ -36,7 +36,7 @@ public class OnStartupTriggeringPolicy extends AbstractLifeCycle implements Trig
private final long minSize;
- private OnStartupTriggeringPolicy(long minSize) {
+ private OnStartupTriggeringPolicy(final long minSize) {
this.minSize = minSize;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
index ba7934e..ca13769 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
@@ -96,7 +96,7 @@ public class PatternProcessor {
return prevFileTime;
}
- public void setPrevFileTime(long prevFileTime) {
+ public void setPrevFileTime(final long prevFileTime) {
this.prevFileTime = prevFileTime;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index be5f2cb..1fc08a0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -85,7 +85,7 @@ public class RollingFileManager extends FileManager {
/**
* @since 2.7
*/
- protected RollingFileManager(LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os,
+ protected RollingFileManager(final LoggerContext loggerContext, final String fileName, final String pattern, final OutputStream os,
final boolean append, final boolean createOnDemand, final long size, final long time,
final TriggeringPolicy triggeringPolicy, final RolloverStrategy rolloverStrategy,
final String advertiseURI, final Layout<? extends Serializable> layout, final boolean writeHeader, final ByteBuffer buffer) {
@@ -144,7 +144,7 @@ public class RollingFileManager extends FileManager {
return renameEmptyFiles;
}
- public void setRenameEmptyFiles(boolean renameEmptyFiles) {
+ public void setRenameEmptyFiles(final boolean renameEmptyFiles) {
this.renameEmptyFiles = renameEmptyFiles;
}
@@ -175,7 +175,7 @@ public class RollingFileManager extends FileManager {
}
@Override
- public void releaseSub(long timeout, TimeUnit timeUnit) {
+ public void releaseSub(final long timeout, final TimeUnit timeUnit) {
triggeringPolicy.stop(timeout, timeUnit);
super.releaseSub(timeout, timeUnit);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 f27d445..564934f 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
@@ -82,7 +82,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
public static RollingRandomAccessFileManager getRollingRandomAccessFileManager(final String fileName,
final String filePattern, final boolean isAppend, final boolean immediateFlush, final int bufferSize,
final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI,
- final Layout<? extends Serializable> layout, Configuration configuration) {
+ final Layout<? extends Serializable> layout, final Configuration configuration) {
return (RollingRandomAccessFileManager) getManager(fileName, new FactoryData(filePattern, isAppend,
immediateFlush, bufferSize, policy, strategy, advertiseURI, layout, configuration), FACTORY);
}
@@ -231,7 +231,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
*/
public FactoryData(final String pattern, final boolean append, final boolean immediateFlush,
final int bufferSize, final TriggeringPolicy policy, final RolloverStrategy strategy,
- final String advertiseURI, final Layout<? extends Serializable> layout, Configuration configuration) {
+ final String advertiseURI, final Layout<? extends Serializable> layout, final Configuration configuration) {
super(configuration);
this.pattern = pattern;
this.append = append;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
index dcad78a..2303e1c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/ArrayBlockingQueueFactory.java
@@ -15,7 +15,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "ArrayBlockingQueue", category = Node.CATEGORY, elementType = BlockingQueueFactory.ELEMENT_TYPE)
public class ArrayBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
@Override
- public BlockingQueue<E> create(int capacity) {
+ public BlockingQueue<E> create(final int capacity) {
return new ArrayBlockingQueue<>(capacity);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
index 9b85ae6..2a45402 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java
@@ -24,7 +24,7 @@ public class DisruptorBlockingQueueFactory<E> implements BlockingQueueFactory<E>
}
@Override
- public BlockingQueue<E> create(int capacity) {
+ public BlockingQueue<E> create(final int capacity) {
return new DisruptorBlockingQueue<>(capacity, spinPolicy);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
index 9ae140d..2b83858 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
@@ -57,7 +57,7 @@ public class JCToolsBlockingQueueFactory<E> implements BlockingQueueFactory<E> {
public int drainTo(final Collection<? super E> c, final int maxElements) {
return drain(new Consumer<E>() {
@Override
- public void accept(E e) {
+ public void accept(final E e) {
c.add(e);
}
}, maxElements);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
index 6ab24e7..0d4628e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/LinkedTransferQueueFactory.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Plugin(name = "LinkedTransferQueue", category = Node.CATEGORY, elementType = BlockingQueueFactory.ELEMENT_TYPE)
public class LinkedTransferQueueFactory<E> implements BlockingQueueFactory<E> {
@Override
- public BlockingQueue<E> create(int capacity) {
+ public BlockingQueue<E> create(final int capacity) {
return new LinkedTransferQueue<>();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index 8b656a6..c6373c1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -130,7 +130,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
/**
* Constructor.
*/
- protected AbstractConfiguration(LoggerContext loggerContext, final ConfigurationSource configurationSource) {
+ protected AbstractConfiguration(final LoggerContext loggerContext, final ConfigurationSource configurationSource) {
this.loggerContext = new WeakReference<>(loggerContext);
// The loggerContext is null for the NullConfiguration class.
// this.loggerContext = new WeakReference(Objects.requireNonNull(loggerContext, "loggerContext is null"));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/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 a17166d..89ebcd5 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
@@ -153,7 +153,7 @@ public class ConfigurationScheduler extends AbstractLifeCycle {
return executorService.scheduleWithFixedDelay(command, initialDelay, delay, unit);
}
- public long nextFireInterval(Date fireDate) {
+ public long nextFireInterval(final Date fireDate) {
return fireDate.getTime() - new Date().getTime();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
index 948c23b..4afb46f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
@@ -85,7 +85,7 @@ public class CronScheduledFuture<V> implements ScheduledFuture<V> {
private final ScheduledFuture<?> scheduledFuture;
private final Date runDate;
- FutureData(ScheduledFuture<?> future, Date runDate) {
+ FutureData(final ScheduledFuture<?> future, final Date runDate) {
this.scheduledFuture = future;
this.runDate = runDate;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
index ca35d12..aa7761c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
@@ -54,7 +54,7 @@ public class BuiltConfiguration extends AbstractConfiguration {
private Component scriptsComponent;
private String contentType = "text";
- public BuiltConfiguration(LoggerContext loggerContext, final ConfigurationSource source, final Component rootComponent) {
+ public BuiltConfiguration(final LoggerContext loggerContext, final ConfigurationSource source, final Component rootComponent) {
super(loggerContext, source);
statusConfig = new StatusConfiguration().withVerboseClasses(VERBOSE_CLASSES).withStatus(getDefaultStatus());
for (final Component component : rootComponent.getComponents()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 8a700a4..58474cb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -226,7 +226,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return sw.toString();
}
- private void writeXmlConfiguration(XMLStreamWriter xmlWriter) throws XMLStreamException {
+ private void writeXmlConfiguration(final XMLStreamWriter xmlWriter) throws XMLStreamException {
xmlWriter.writeStartDocument();
xmlWriter.writeCharacters(EOL);
@@ -275,13 +275,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeEndDocument();
}
- private void writeXmlSection(XMLStreamWriter xmlWriter, Component component) throws XMLStreamException {
+ private void writeXmlSection(final XMLStreamWriter xmlWriter, final Component component) throws XMLStreamException {
if (!component.getAttributes().isEmpty() || !component.getComponents().isEmpty() || component.getValue() != null) {
writeXmlComponent(xmlWriter, component, 1);
}
}
- private void writeXmlComponent(XMLStreamWriter xmlWriter, Component component, int nesting) throws XMLStreamException {
+ private void writeXmlComponent(final XMLStreamWriter xmlWriter, final Component component, final int nesting) throws XMLStreamException {
if (!component.getComponents().isEmpty() || component.getValue() != null) {
writeXmlIndent(xmlWriter, nesting);
xmlWriter.writeStartElement(component.getPluginType());
@@ -307,13 +307,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeCharacters(EOL);
}
- private void writeXmlIndent(XMLStreamWriter xmlWriter, int nesting) throws XMLStreamException {
+ private void writeXmlIndent(final XMLStreamWriter xmlWriter, final int nesting) throws XMLStreamException {
for (int i = 0; i < nesting; i++) {
xmlWriter.writeCharacters(INDENT);
}
}
- private void writeXmlAttributes(XMLStreamWriter xmlWriter, Component component) throws XMLStreamException {
+ private void writeXmlAttributes(final XMLStreamWriter xmlWriter, final Component component) throws XMLStreamException {
for (Map.Entry<String, String> attribute : component.getAttributes().entrySet()) {
xmlWriter.writeAttribute(attribute.getKey(), attribute.getValue());
}
@@ -526,13 +526,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public ConfigurationBuilder<T> setDestination(String destination) {
+ public ConfigurationBuilder<T> setDestination(final String destination) {
this.destination = destination;
return this;
}
@Override
- public void setLoggerContext(LoggerContext loggerContext) {
+ public void setLoggerContext(final LoggerContext loggerContext) {
this.loggerContext = loggerContext;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
index b89b30c..ff6f467 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfiguration.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
public class PropertiesConfiguration extends BuiltConfiguration implements Reconfigurable {
// ctor is called through reflection.
- public PropertiesConfiguration(LoggerContext loggerContext, final ConfigurationSource source, final Component root) {
+ public PropertiesConfiguration(final LoggerContext loggerContext, final ConfigurationSource source, final Component root) {
super(loggerContext, source, root);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
index e35599c..63b093f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
@@ -369,7 +369,7 @@ public class PropertiesConfigurationBuilder extends ConfigurationBuilderFactory
return loggerBuilder;
}
- public PropertiesConfigurationBuilder setLoggerContext(LoggerContext loggerContext) {
+ public PropertiesConfigurationBuilder setLoggerContext(final LoggerContext loggerContext) {
this.loggerContext = loggerContext;
return this;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
index 2263267..d5e1aa9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
@@ -42,7 +42,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
}
@Override
- public PropertiesConfiguration getConfiguration(LoggerContext loggerContext, final ConfigurationSource source) {
+ public PropertiesConfiguration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
final Properties properties = new Properties();
try (final InputStream configStream = source.getInputStream()) {
properties.load(configStream);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
index 92b8eee..278a02a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java
@@ -48,7 +48,7 @@ public abstract class AbstractFilterable extends AbstractLifeCycle implements Fi
return (B) this;
}
- public B withFilter(Filter filter) {
+ public B withFilter(final Filter filter) {
this.filter = filter;
return asBuilder();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
index 280a574..44d42f9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedClassInfo.java
@@ -102,7 +102,7 @@ public final class ExtendedClassInfo implements Serializable {
return result;
}
- public void renderOn(StringBuilder output, TextRenderer textRenderer) {
+ public void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
if (!this.exact) {
textRenderer.render("~", output, "ExtraClassInfo.Inexact");
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
index 4648ed8..06183e4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ExtendedStackTraceElement.java
@@ -133,13 +133,13 @@ public final class ExtendedStackTraceElement implements Serializable {
return this.stackTraceElement.isNativeMethod();
}
- void renderOn(StringBuilder output, TextRenderer textRenderer) {
+ void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
render(this.stackTraceElement, output, textRenderer);
textRenderer.render(" ", output, "Text");
this.extraClassInfo.renderOn(output, textRenderer);
}
- private void render(StackTraceElement stElement, StringBuilder output, TextRenderer textRenderer) {
+ private void render(final StackTraceElement stElement, final StringBuilder output, final TextRenderer textRenderer) {
final String fileName = stElement.getFileName();
final int lineNumber = stElement.getLineNumber();
textRenderer.render(getClassName(), output, "StackTraceElement.ClassName");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
index 9890347..565f15c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
@@ -1,296 +1,296 @@
-/*
- * 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.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-import org.apache.logging.log4j.core.pattern.JAnsiTextRenderer;
-import org.apache.logging.log4j.core.pattern.TextRenderer;
-import org.apache.logging.log4j.core.pattern.PlainTextRenderer;
-import org.apache.logging.log4j.core.util.Constants;
-import org.apache.logging.log4j.core.util.Loader;
-import org.apache.logging.log4j.core.util.Patterns;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.util.Strings;
-
-/**
- * Contains options which control how a {@link Throwable} pattern is formatted.
- */
-public final class ThrowableFormatOptions {
-
- private static final int DEFAULT_LINES = Integer.MAX_VALUE;
-
- /**
- * Default instance of {@code ThrowableFormatOptions}.
- */
- protected static final ThrowableFormatOptions DEFAULT = new ThrowableFormatOptions();
-
- /**
- * Format the whole stack trace.
- */
- private static final String FULL = "full";
-
- /**
- * Do not format the exception.
- */
- private static final String NONE = "none";
-
- /**
- * Format only the first line of the throwable.
- */
- private static final String SHORT = "short";
-
- /**
- * ANSI renderer
- */
- private final TextRenderer textRenderer;
-
- /**
- * The number of lines to write.
- */
- private final int lines;
-
- /**
- * The stack trace separator.
- */
- private final String separator;
-
- /**
- * The list of packages to filter.
- */
- private final List<String> ignorePackages;
-
- public static final String CLASS_NAME = "short.className";
- public static final String METHOD_NAME = "short.methodName";
- public static final String LINE_NUMBER = "short.lineNumber";
- public static final String FILE_NAME = "short.fileName";
- public static final String MESSAGE = "short.message";
- public static final String LOCALIZED_MESSAGE = "short.localizedMessage";
-
- /**
- * Constructs the options for printing stack trace.
- *
- * @param lines
- * The number of lines.
- * @param separator
- * The stack trace separator.
- * @param ignorePackages
- * The packages to filter.
- * @param textRenderer
- * The ANSI renderer
- */
- protected ThrowableFormatOptions(final int lines, final String separator, final List<String> ignorePackages,
- TextRenderer textRenderer) {
- this.lines = lines;
- this.separator = separator == null ? Constants.LINE_SEPARATOR : separator;
- this.ignorePackages = ignorePackages;
- this.textRenderer = textRenderer == null ? PlainTextRenderer.getInstance() : textRenderer;
- }
-
- /**
- * Constructs the options for printing stack trace.
- *
- * @param packages
- * The packages to filter.
- */
- protected ThrowableFormatOptions(final List<String> packages) {
- this(DEFAULT_LINES, null, packages, null);
- }
-
- /**
- * Constructs the options for printing stack trace.
- */
- protected ThrowableFormatOptions() {
- this(DEFAULT_LINES, null, null, null);
- }
-
- /**
- * Returns the number of lines to write.
- *
- * @return The number of lines to write.
- */
- public int getLines() {
- return this.lines;
- }
-
- /**
- * Returns the stack trace separator.
- *
- * @return The stack trace separator.
- */
- public String getSeparator() {
- return this.separator;
- }
-
- /**
- * Returns the message rendered.
- *
- * @return the message rendered.
- */
- public TextRenderer getTextRenderer() {
- return textRenderer;
- }
-
- /**
- * Returns the list of packages to ignore (filter out).
- *
- * @return The list of packages to ignore (filter out).
- */
- public List<String> getIgnorePackages() {
- return this.ignorePackages;
- }
-
- /**
- * Determines if all lines should be printed.
- *
- * @return true for all lines, false otherwise.
- */
- public boolean allLines() {
- return this.lines == DEFAULT_LINES;
- }
-
- /**
- * Determines if any lines should be printed.
- *
- * @return true for any lines, false otherwise.
- */
- public boolean anyLines() {
- return this.lines > 0;
- }
-
- /**
- * Returns the minimum between the lines and the max lines.
- *
- * @param maxLines
- * The maximum number of lines.
- * @return The number of lines to print.
- */
- public int minLines(final int maxLines) {
- return this.lines > maxLines ? maxLines : this.lines;
- }
-
- /**
- * Determines if there are any packages to filter.
- *
- * @return true if there are packages, false otherwise.
- */
- public boolean hasPackages() {
- return this.ignorePackages != null && !this.ignorePackages.isEmpty();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- final StringBuilder s = new StringBuilder();
- s.append('{')
- .append(allLines() ? FULL : this.lines == 2 ? SHORT : anyLines() ? String.valueOf(this.lines) : NONE)
- .append('}');
- s.append("{separator(").append(this.separator).append(")}");
- if (hasPackages()) {
- s.append("{filters(");
- for (final String p : this.ignorePackages) {
- s.append(p).append(',');
- }
- s.deleteCharAt(s.length() - 1);
- s.append(")}");
- }
- return s.toString();
- }
-
- /**
- * Creates a new instance based on the array of options.
- *
- * @param options
- * The array of options.
- * @return A new initialized instance.
- */
- public static ThrowableFormatOptions newInstance(String[] options) {
- if (options == null || options.length == 0) {
- return DEFAULT;
- }
- // NOTE: The following code is present for backward compatibility
- // and was copied from Extended/RootThrowablePatternConverter.
- // This supports a single option with the format:
- // %xEx{["none"|"short"|"full"|depth],[filters(packages)}
- // However, the convention for multiple options should be:
- // %xEx{["none"|"short"|"full"|depth]}[{filters(packages)}]
- if (options.length == 1 && Strings.isNotEmpty(options[0])) {
- final String[] opts = options[0].split(Patterns.COMMA_SEPARATOR, 2);
- final String first = opts[0].trim();
- try (final Scanner scanner = new Scanner(first)) {
- if (opts.length > 1 && (first.equalsIgnoreCase(FULL) || first.equalsIgnoreCase(SHORT)
- || first.equalsIgnoreCase(NONE) || scanner.hasNextInt())) {
- options = new String[] { first, opts[1].trim() };
- }
- }
- }
-
- int lines = DEFAULT.lines;
- String separator = DEFAULT.separator;
- List<String> packages = DEFAULT.ignorePackages;
- TextRenderer ansiRenderer = DEFAULT.textRenderer;
- for (final String rawOption : options) {
- if (rawOption != null) {
- final String option = rawOption.trim();
- if (option.isEmpty()) {
- // continue;
- } else if (option.startsWith("separator(") && option.endsWith(")")) {
- separator = option.substring("separator(".length(), option.length() - 1);
- } else if (option.startsWith("filters(") && option.endsWith(")")) {
- final String filterStr = option.substring("filters(".length(), option.length() - 1);
- if (filterStr.length() > 0) {
- final String[] array = filterStr.split(Patterns.COMMA_SEPARATOR);
- if (array.length > 0) {
- packages = new ArrayList<>(array.length);
- for (String token : array) {
- token = token.trim();
- if (token.length() > 0) {
- packages.add(token);
- }
- }
- }
- }
- } else if (option.equalsIgnoreCase(NONE)) {
- lines = 0;
- } else if (option.equalsIgnoreCase(SHORT) || option.equalsIgnoreCase(CLASS_NAME)
- || option.equalsIgnoreCase(METHOD_NAME) || option.equalsIgnoreCase(LINE_NUMBER)
- || option.equalsIgnoreCase(FILE_NAME) || option.equalsIgnoreCase(MESSAGE)
- || option.equalsIgnoreCase(LOCALIZED_MESSAGE)) {
- lines = 2;
- } else if (option.startsWith("ansi(") && option.endsWith(")") || option.equals("ansi")) {
- if (Loader.isJansiAvailable()) {
- String styleMapStr = option.equals("ansi") ? Strings.EMPTY
- : option.substring("ansi(".length(), option.length() - 1);
- ansiRenderer = new JAnsiTextRenderer(new String[] { null, styleMapStr },
- JAnsiTextRenderer.DefaultExceptionStyleMap);
- } else {
- StatusLogger.getLogger().warn(
- "You requested ANSI exception rendering but JANSI is not on the classpath. Please see https://logging.apache.org/log4j/2.x/runtime-dependencies.html");
- }
- } else if (!option.equalsIgnoreCase(FULL)) {
- lines = Integer.parseInt(option);
- }
- }
- }
- return new ThrowableFormatOptions(lines, separator, packages, ansiRenderer);
- }
-
-}
+/*
+ * 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.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import org.apache.logging.log4j.core.pattern.JAnsiTextRenderer;
+import org.apache.logging.log4j.core.pattern.TextRenderer;
+import org.apache.logging.log4j.core.pattern.PlainTextRenderer;
+import org.apache.logging.log4j.core.util.Constants;
+import org.apache.logging.log4j.core.util.Loader;
+import org.apache.logging.log4j.core.util.Patterns;
+import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Contains options which control how a {@link Throwable} pattern is formatted.
+ */
+public final class ThrowableFormatOptions {
+
+ private static final int DEFAULT_LINES = Integer.MAX_VALUE;
+
+ /**
+ * Default instance of {@code ThrowableFormatOptions}.
+ */
+ protected static final ThrowableFormatOptions DEFAULT = new ThrowableFormatOptions();
+
+ /**
+ * Format the whole stack trace.
+ */
+ private static final String FULL = "full";
+
+ /**
+ * Do not format the exception.
+ */
+ private static final String NONE = "none";
+
+ /**
+ * Format only the first line of the throwable.
+ */
+ private static final String SHORT = "short";
+
+ /**
+ * ANSI renderer
+ */
+ private final TextRenderer textRenderer;
+
+ /**
+ * The number of lines to write.
+ */
+ private final int lines;
+
+ /**
+ * The stack trace separator.
+ */
+ private final String separator;
+
+ /**
+ * The list of packages to filter.
+ */
+ private final List<String> ignorePackages;
+
+ public static final String CLASS_NAME = "short.className";
+ public static final String METHOD_NAME = "short.methodName";
+ public static final String LINE_NUMBER = "short.lineNumber";
+ public static final String FILE_NAME = "short.fileName";
+ public static final String MESSAGE = "short.message";
+ public static final String LOCALIZED_MESSAGE = "short.localizedMessage";
+
+ /**
+ * Constructs the options for printing stack trace.
+ *
+ * @param lines
+ * The number of lines.
+ * @param separator
+ * The stack trace separator.
+ * @param ignorePackages
+ * The packages to filter.
+ * @param textRenderer
+ * The ANSI renderer
+ */
+ protected ThrowableFormatOptions(final int lines, final String separator, final List<String> ignorePackages,
+ final TextRenderer textRenderer) {
+ this.lines = lines;
+ this.separator = separator == null ? Constants.LINE_SEPARATOR : separator;
+ this.ignorePackages = ignorePackages;
+ this.textRenderer = textRenderer == null ? PlainTextRenderer.getInstance() : textRenderer;
+ }
+
+ /**
+ * Constructs the options for printing stack trace.
+ *
+ * @param packages
+ * The packages to filter.
+ */
+ protected ThrowableFormatOptions(final List<String> packages) {
+ this(DEFAULT_LINES, null, packages, null);
+ }
+
+ /**
+ * Constructs the options for printing stack trace.
+ */
+ protected ThrowableFormatOptions() {
+ this(DEFAULT_LINES, null, null, null);
+ }
+
+ /**
+ * Returns the number of lines to write.
+ *
+ * @return The number of lines to write.
+ */
+ public int getLines() {
+ return this.lines;
+ }
+
+ /**
+ * Returns the stack trace separator.
+ *
+ * @return The stack trace separator.
+ */
+ public String getSeparator() {
+ return this.separator;
+ }
+
+ /**
+ * Returns the message rendered.
+ *
+ * @return the message rendered.
+ */
+ public TextRenderer getTextRenderer() {
+ return textRenderer;
+ }
+
+ /**
+ * Returns the list of packages to ignore (filter out).
+ *
+ * @return The list of packages to ignore (filter out).
+ */
+ public List<String> getIgnorePackages() {
+ return this.ignorePackages;
+ }
+
+ /**
+ * Determines if all lines should be printed.
+ *
+ * @return true for all lines, false otherwise.
+ */
+ public boolean allLines() {
+ return this.lines == DEFAULT_LINES;
+ }
+
+ /**
+ * Determines if any lines should be printed.
+ *
+ * @return true for any lines, false otherwise.
+ */
+ public boolean anyLines() {
+ return this.lines > 0;
+ }
+
+ /**
+ * Returns the minimum between the lines and the max lines.
+ *
+ * @param maxLines
+ * The maximum number of lines.
+ * @return The number of lines to print.
+ */
+ public int minLines(final int maxLines) {
+ return this.lines > maxLines ? maxLines : this.lines;
+ }
+
+ /**
+ * Determines if there are any packages to filter.
+ *
+ * @return true if there are packages, false otherwise.
+ */
+ public boolean hasPackages() {
+ return this.ignorePackages != null && !this.ignorePackages.isEmpty();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ final StringBuilder s = new StringBuilder();
+ s.append('{')
+ .append(allLines() ? FULL : this.lines == 2 ? SHORT : anyLines() ? String.valueOf(this.lines) : NONE)
+ .append('}');
+ s.append("{separator(").append(this.separator).append(")}");
+ if (hasPackages()) {
+ s.append("{filters(");
+ for (final String p : this.ignorePackages) {
+ s.append(p).append(',');
+ }
+ s.deleteCharAt(s.length() - 1);
+ s.append(")}");
+ }
+ return s.toString();
+ }
+
+ /**
+ * Creates a new instance based on the array of options.
+ *
+ * @param options
+ * The array of options.
+ * @return A new initialized instance.
+ */
+ public static ThrowableFormatOptions newInstance(String[] options) {
+ if (options == null || options.length == 0) {
+ return DEFAULT;
+ }
+ // NOTE: The following code is present for backward compatibility
+ // and was copied from Extended/RootThrowablePatternConverter.
+ // This supports a single option with the format:
+ // %xEx{["none"|"short"|"full"|depth],[filters(packages)}
+ // However, the convention for multiple options should be:
+ // %xEx{["none"|"short"|"full"|depth]}[{filters(packages)}]
+ if (options.length == 1 && Strings.isNotEmpty(options[0])) {
+ final String[] opts = options[0].split(Patterns.COMMA_SEPARATOR, 2);
+ final String first = opts[0].trim();
+ try (final Scanner scanner = new Scanner(first)) {
+ if (opts.length > 1 && (first.equalsIgnoreCase(FULL) || first.equalsIgnoreCase(SHORT)
+ || first.equalsIgnoreCase(NONE) || scanner.hasNextInt())) {
+ options = new String[] { first, opts[1].trim() };
+ }
+ }
+ }
+
+ int lines = DEFAULT.lines;
+ String separator = DEFAULT.separator;
+ List<String> packages = DEFAULT.ignorePackages;
+ TextRenderer ansiRenderer = DEFAULT.textRenderer;
+ for (final String rawOption : options) {
+ if (rawOption != null) {
+ final String option = rawOption.trim();
+ if (option.isEmpty()) {
+ // continue;
+ } else if (option.startsWith("separator(") && option.endsWith(")")) {
+ separator = option.substring("separator(".length(), option.length() - 1);
+ } else if (option.startsWith("filters(") && option.endsWith(")")) {
+ final String filterStr = option.substring("filters(".length(), option.length() - 1);
+ if (filterStr.length() > 0) {
+ final String[] array = filterStr.split(Patterns.COMMA_SEPARATOR);
+ if (array.length > 0) {
+ packages = new ArrayList<>(array.length);
+ for (String token : array) {
+ token = token.trim();
+ if (token.length() > 0) {
+ packages.add(token);
+ }
+ }
+ }
+ }
+ } else if (option.equalsIgnoreCase(NONE)) {
+ lines = 0;
+ } else if (option.equalsIgnoreCase(SHORT) || option.equalsIgnoreCase(CLASS_NAME)
+ || option.equalsIgnoreCase(METHOD_NAME) || option.equalsIgnoreCase(LINE_NUMBER)
+ || option.equalsIgnoreCase(FILE_NAME) || option.equalsIgnoreCase(MESSAGE)
+ || option.equalsIgnoreCase(LOCALIZED_MESSAGE)) {
+ lines = 2;
+ } else if (option.startsWith("ansi(") && option.endsWith(")") || option.equals("ansi")) {
+ if (Loader.isJansiAvailable()) {
+ String styleMapStr = option.equals("ansi") ? Strings.EMPTY
+ : option.substring("ansi(".length(), option.length() - 1);
+ ansiRenderer = new JAnsiTextRenderer(new String[] { null, styleMapStr },
+ JAnsiTextRenderer.DefaultExceptionStyleMap);
+ } else {
+ StatusLogger.getLogger().warn(
+ "You requested ANSI exception rendering but JANSI is not on the classpath. Please see https://logging.apache.org/log4j/2.x/runtime-dependencies.html");
+ }
+ } else if (!option.equalsIgnoreCase(FULL)) {
+ lines = Integer.parseInt(option);
+ }
+ }
+ }
+ return new ThrowableFormatOptions(lines, separator, packages, ansiRenderer);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index f114c01..5cd73bc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -212,12 +212,12 @@ public class ThrowableProxy implements Serializable {
}
private void formatCause(final StringBuilder sb, final String prefix, final ThrowableProxy cause,
- final List<String> ignorePackages, TextRenderer textRenderer) {
+ final List<String> ignorePackages, final TextRenderer textRenderer) {
formatThrowableProxy(sb, prefix, CAUSED_BY_LABEL, cause, ignorePackages, textRenderer);
}
private void formatThrowableProxy(final StringBuilder sb, final String prefix, final String causeLabel,
- final ThrowableProxy throwableProxy, final List<String> ignorePackages, TextRenderer textRenderer) {
+ final ThrowableProxy throwableProxy, final List<String> ignorePackages, final TextRenderer textRenderer) {
if (throwableProxy == null) {
return;
}
@@ -231,7 +231,7 @@ public class ThrowableProxy implements Serializable {
this.formatCause(sb, prefix, throwableProxy.causeProxy, ignorePackages, textRenderer);
}
- void renderOn(StringBuilder output, TextRenderer textRenderer) {
+ void renderOn(final StringBuilder output, final TextRenderer textRenderer) {
final String msg = this.message;
textRenderer.render(this.name, output, "Name");
if (msg != null) {
@@ -241,7 +241,7 @@ public class ThrowableProxy implements Serializable {
}
private void formatSuppressed(final StringBuilder sb, final String prefix, final ThrowableProxy[] suppressedProxies,
- final List<String> ignorePackages, TextRenderer textRenderer) {
+ final List<String> ignorePackages, final TextRenderer textRenderer) {
if (suppressedProxies == null) {
return;
}
@@ -252,7 +252,7 @@ public class ThrowableProxy implements Serializable {
private void formatElements(final StringBuilder sb, final String prefix, final int commonCount,
final StackTraceElement[] causedTrace, final ExtendedStackTraceElement[] extStackTrace,
- final List<String> ignorePackages, TextRenderer textRenderer) {
+ final List<String> ignorePackages, final TextRenderer textRenderer) {
if (ignorePackages == null || ignorePackages.isEmpty()) {
for (final ExtendedStackTraceElement element : extStackTrace) {
this.formatEntry(element, sb, prefix, textRenderer);
@@ -283,7 +283,7 @@ public class ThrowableProxy implements Serializable {
}
}
- private void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count, TextRenderer textRenderer) {
+ private void appendSuppressedCount(final StringBuilder sb, final String prefix, final int count, final TextRenderer textRenderer) {
textRenderer.render(prefix, sb, "Prefix");
if (count == 1) {
textRenderer.render("\t... ", sb, "Suppressed");
@@ -295,7 +295,7 @@ public class ThrowableProxy implements Serializable {
textRenderer.render(EOL_STR, sb, "Text");
}
- private void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, final String prefix, TextRenderer textRenderer) {
+ private void formatEntry(final ExtendedStackTraceElement extStackTraceElement, final StringBuilder sb, final String prefix, final TextRenderer textRenderer) {
textRenderer.render(prefix, sb, "Prefix");
textRenderer.render("\tat ", sb, "At");
extStackTraceElement.renderOn(sb, textRenderer);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/19c92876/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
index 56e17dc..844c614 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
@@ -95,7 +95,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
private final Layout<? extends Serializable> layout;
private final int bufferSize;
- public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, int bufferSize) {
+ public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, final int bufferSize) {
this.host = host;
this.port = port;
this.layout = layout;