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 2018/10/30 03:50:33 UTC
[08/13] logging-log4j2 git commit: Revert "Use final. Remove trailing
spaces."
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index 4172fcc..35c6f4b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -48,21 +48,21 @@ public class ScriptPatternSelector implements PatternSelector {
*/
public static class Builder implements org.apache.logging.log4j.core.util.Builder<ScriptPatternSelector> {
- @PluginElement("Script")
+ @PluginElement("Script")
private AbstractScript script;
-
- @PluginElement("PatternMatch")
+
+ @PluginElement("PatternMatch")
private PatternMatch[] properties;
-
- @PluginBuilderAttribute("defaultPattern")
+
+ @PluginBuilderAttribute("defaultPattern")
private String defaultPattern;
-
- @PluginBuilderAttribute("alwaysWriteExceptions")
+
+ @PluginBuilderAttribute("alwaysWriteExceptions")
private boolean alwaysWriteExceptions = true;
-
+
@PluginBuilderAttribute("disableAnsi")
private boolean disableAnsi;
-
+
@PluginBuilderAttribute("noConsoleNoAnsi")
private boolean noConsoleNoAnsi;
@@ -131,7 +131,7 @@ public class ScriptPatternSelector implements PatternSelector {
return this;
}
}
-
+
private final Map<String, PatternFormatter[]> formatterMap = new HashMap<>();
private final Map<String, String> patternMap = new HashMap<>();
@@ -204,7 +204,7 @@ public class ScriptPatternSelector implements PatternSelector {
/**
* Deprecated, use {@link #newBuilder()} instead.
- *
+ *
* @param script
* @param properties
* @param defaultPattern
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
index b6d58de..97fcc3b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
@@ -46,17 +46,17 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Builds a SyslogLayout.
* <p>The main arguments are</p>
- * <ul>
+ * <ul>
* <li>facility: The Facility is used to try to classify the message.</li>
* <li>includeNewLine: If true a newline will be appended to the result.</li>
* <li>escapeNL: Pattern to use for replacing newlines.</li>
* <li>charset: The character set.</li>
- * </ul>
+ * </ul>
* @param <B> the builder type
*/
public static class Builder<B extends Builder<B>> extends AbstractStringLayout.Builder<B>
implements org.apache.logging.log4j.core.util.Builder<SyslogLayout> {
-
+
public Builder() {
super();
setCharset(StandardCharsets.UTF_8);
@@ -104,7 +104,7 @@ public final class SyslogLayout extends AbstractStringLayout {
}
}
-
+
@PluginBuilderFactory
public static <B extends Builder<B>> B newBuilder() {
return new Builder<B>().asBuilder();
@@ -123,7 +123,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* Date format used if header = true.
*/
private final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd HH:mm:ss", Locale.ENGLISH);
-
+
/**
* Host name used to identify messages from this appender.
*/
@@ -184,7 +184,7 @@ public final class SyslogLayout extends AbstractStringLayout {
* <li>Key: "formatType" Value: "logfilepatternreceiver" (format uses the keywords supported by
* LogFilePatternReceiver)</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting SyslogLayout
*/
@Override
@@ -199,7 +199,7 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Creates a SyslogLayout.
- *
+ *
* @param facility The Facility is used to try to classify the message.
* @param includeNewLine If true a newline will be appended to the result.
* @param escapeNL Pattern to use for replacing newlines.
@@ -215,7 +215,7 @@ public final class SyslogLayout extends AbstractStringLayout {
/**
* Gets the facility.
- *
+ *
* @return the facility
*/
public Facility getFacility() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
index c9cd886..b09add7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
@@ -146,7 +146,7 @@ public final class XmlLayout extends AbstractJacksonLayout {
* <li>Key: "dtd" Value: "log4j-events.dtd"</li>
* <li>Key: "version" Value: "2.0"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting XmlLayout
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
index 0245cd8..1d8576f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
@@ -157,7 +157,7 @@ public final class YamlLayout extends AbstractJacksonLayout {
/**
* Creates a YAML Layout.
- *
+ *
* @param config
* The plugin configuration.
* @param locationInfo
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
index c76561c..1dba499 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractLookup.java
@@ -18,14 +18,14 @@ package org.apache.logging.log4j.core.lookup;
/**
* A default lookup for others to extend.
- *
+ *
* @since 2.1
*/
public abstract class AbstractLookup implements StrLookup {
/**
* Calls {@code lookup(null, key)} in the super class.
- *
+ *
* @see StrLookup#lookup(LogEvent, String)
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
index 34b2fd3..a50de0d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* A map-based lookup for main arguments.
- *
+ *
* See {@link #setMainArguments(String[])}.
- *
+ *
* @since 2.4
*/
@Plugin(name = "main", category = StrLookup.CATEGORY)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
index fbbef22..320db49 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MarkerLookup.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
* Looks-up markers.
- *
+ *
* @since 2.4
*/
@Plugin(name = "marker", category = StrLookup.CATEGORY)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
index bea4262..f6d787a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
@@ -369,7 +369,7 @@ public abstract class StrMatcher {
}
return len;
}
-
+
@Override
public String toString() {
return super.toString() + Chars.SPACE + Arrays.toString(chars);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
index 76d3e46..5157365 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
@@ -34,12 +34,12 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* The Internet address of the host.
*/
protected final InetAddress inetAddress;
-
+
/**
* The name of the host.
*/
protected final String host;
-
+
/**
* The port on the host.
*/
@@ -55,7 +55,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* @param bufferSize The buffer size.
*/
public AbstractSocketManager(final String name, final OutputStream os, final InetAddress inetAddress,
- final String host, final int port, final Layout<? extends Serializable> layout, final boolean writeHeader,
+ final String host, final int port, final Layout<? extends Serializable> layout, final boolean writeHeader,
final int bufferSize) {
super(os, name, layout, writeHeader, bufferSize);
this.inetAddress = inetAddress;
@@ -69,7 +69,7 @@ public abstract class AbstractSocketManager extends OutputStreamManager {
* <li>Key: "port" Value: provided "port" param</li>
* <li>Key: "address" Value: provided "address" param</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting AbstractSocketManager
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/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 8f22c85..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
@@ -75,7 +75,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
* <li>Key: "protocol" Value: "udp"</li>
* <li>Key: "direction" Value: "out"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting DatagramSocketManager
*/
@Override
@@ -94,7 +94,7 @@ public class DatagramSocketManager extends AbstractSocketManager {
private final int port;
private final Layout<? extends Serializable> layout;
private final int bufferSize;
-
+
public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout, final int bufferSize) {
this.host = host;
this.port = port;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
index a03dc33..a5eadf3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
@@ -125,76 +125,76 @@ import org.apache.logging.log4j.util.EnglishEnums;
* </table>
*/
public enum Facility {
-
+
/** Kernel messages. */
KERN(0),
-
+
/** User level messages. */
USER(1),
-
+
/** Mail system. */
MAIL(2),
-
+
/** System daemons. */
DAEMON(3),
-
+
/** Security/Authorization messages. */
AUTH(4),
-
+
/** Messages generated by syslogd. */
SYSLOG(5),
-
+
/** Line printer subsystem. */
LPR(6),
-
+
/** Network news subsystem. */
NEWS(7),
-
+
/** UUCP subsystem. */
UUCP(8),
-
+
/** Clock daemon. */
CRON(9),
-
+
/** Security/Authorization messages. */
AUTHPRIV(10),
-
+
/** FTP daemon. */
FTP(11),
-
+
/** NTP subsystem. */
NTP(12),
-
+
/** Log audit. */
LOG_AUDIT(13),
-
+
/** Log alert. */
LOG_ALERT(14),
-
+
/** Clock daemon. */
CLOCK(15),
-
+
/** Local use 0. */
LOCAL0(16),
-
+
/** Local use 1. */
LOCAL1(17),
-
+
/** Local use 2. */
LOCAL2(18),
-
+
/** Local use 3. */
LOCAL3(19),
-
+
/** Local use 4. */
LOCAL4(20),
-
+
/** Local use 5. */
LOCAL5(21),
-
+
/** Local use 6. */
LOCAL6(22),
-
+
/** Local use 7. */
LOCAL7(23);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/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 2670857..22ab3aa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java
@@ -55,7 +55,7 @@ public class JndiManager extends AbstractManager {
/**
* Gets a named JndiManager using the default {@link javax.naming.InitialContext}.
- *
+ *
* @param name the name of the JndiManager instance to create or use if available
* @return a default JndiManager
*/
@@ -89,7 +89,7 @@ public class JndiManager extends AbstractManager {
/**
* Gets a JndiManager with the provided configuration information.
- *
+ *
* @param properties JNDI properties, usually created by calling {@link #createProperties(String, String, String, String, String, Properties)}.
* @return the JndiManager for the provided parameters.
* @see #createProperties(String, String, String, String, String, Properties)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
index 5f86c53..3d610bf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
@@ -116,7 +116,7 @@ public class MulticastDnsAdvertiser implements Advertiser {
/**
* Unadvertise the previously advertised entity.
- *
+ *
* @param serviceInfo
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
index decd996..c7c6acc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Priority.java
@@ -49,7 +49,7 @@ public class Priority {
private static int toPriority(final Facility aFacility, final Severity aSeverity) {
return (aFacility.getCode() << 3) + aSeverity.getCode();
}
-
+
/**
* Returns the Facility.
* @return the Facility.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
index fe5d6f1..8144e45 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Rfc1349TrafficClass.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.net;
/**
* Enumerates the <a href="https://tools.ietf.org/html/rfc1349">RFC 1349</a> TOS field.
- *
+ *
* <ul>
* <li><code>IPTOS_LOWCOST (0x02)</code></li>
* <li><code>IPTOS_RELIABILITY (0x04)</code></li>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/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 074b34a..2a4593d 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
@@ -158,13 +158,13 @@ public class SslSocketManager extends TcpSocketManager {
private static class SslSocketManagerFactory extends TcpSocketManagerFactory<SslSocketManager, SslFactoryData> {
@Override
- SslSocketManager createManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress,
+ SslSocketManager createManager(final String name, OutputStream os, Socket socket, InetAddress inetAddress,
final SslFactoryData data) {
return new SslSocketManager(name, os, socket, data.sslConfiguration, inetAddress, data.host, data.port,
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout, data.bufferSize,
data.socketOptions);
}
-
+
@Override
Socket createSocket(final SslFactoryData data) throws IOException {
return SslSocketManager.createSocket(data.host, data.port, data.connectTimeoutMillis, data.sslConfiguration,
@@ -172,8 +172,8 @@ public class SslSocketManager extends TcpSocketManager {
}
}
- static Socket createSocket(final String host, final int port, final int connectTimeoutMillis,
- final SslConfiguration sslConfiguration, final SocketOptions socketOptions) throws IOException {
+ static Socket createSocket(final String host, int port, int connectTimeoutMillis,
+ final SslConfiguration sslConfiguration, SocketOptions socketOptions) throws IOException {
final SSLSocketFactory socketFactory = createSslSocketFactory(sslConfiguration);
final SSLSocket socket = (SSLSocket) socketFactory.createSocket();
if (socketOptions != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/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 c5967c0..f5b971d 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
@@ -68,7 +68,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -105,7 +105,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Constructs.
- *
+ *
* @param name
* The unique name of this connection.
* @param os
@@ -148,7 +148,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -172,7 +172,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Obtains a TcpSocketManager.
- *
+ *
* @param host
* The host to connect to.
* @param port
@@ -221,7 +221,7 @@ public class TcpSocketManager extends AbstractSocketManager {
reconnector = createReconnector();
try {
reconnector.reconnect();
- } catch (final IOException reconnEx) {
+ } catch (IOException reconnEx) {
LOGGER.debug("Cannot reestablish socket connection to {}: {}; starting reconnector thread {}",
config, reconnEx.getLocalizedMessage(), reconnector.getName(), reconnEx);
reconnector.start();
@@ -230,7 +230,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
try {
writeAndFlush(bytes, offset, length, immediateFlush);
- } catch (final IOException e) {
+ } catch (IOException e) {
throw new AppenderLoggingException(
String.format("Error writing to %s after reestablishing connection for %s", getName(),
config),
@@ -282,7 +282,7 @@ public class TcpSocketManager extends AbstractSocketManager {
* <li>Key: "protocol" Value: "tcp"</li>
* <li>Key: "direction" Value: "out"</li>
* </ul>
- *
+ *
* @return Map of content format keys supporting TcpSocketManager
*/
@Override
@@ -422,7 +422,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Factory to create a TcpSocketManager.
- *
+ *
* @param <M>
* The manager type.
* @param <T>
@@ -460,7 +460,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
@SuppressWarnings("unchecked")
- M createManager(final String name, final OutputStream os, final Socket socket, final InetAddress inetAddress, final T data) {
+ M createManager(final String name, OutputStream os, Socket socket, InetAddress inetAddress, final T data) {
return (M) new TcpSocketManager(name, os, socket, inetAddress, data.host, data.port,
data.connectTimeoutMillis, data.reconnectDelayMillis, data.immediateFail, data.layout,
data.bufferSize, data.socketOptions);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
index 27ab29d..5855026 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
@@ -70,7 +70,7 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
}
try (final InputStream fin = openInputStream(loadLocation)) {
final KeyStore ks = KeyStore.getInstance(this.keyStoreType);
- final char[] password = this.getPasswordAsCharArray();
+ char[] password = this.getPasswordAsCharArray();
try {
ks.load(fin, password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
index da16622..d60f82c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java
@@ -49,7 +49,7 @@ class EnvironmentPasswordProvider implements PasswordProvider {
@Override
public char[] getPassword() {
- final String password = System.getenv(passwordEnvironmentVariable);
+ String password = System.getenv(passwordEnvironmentVariable);
return password == null ? null : password.toCharArray();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
index 355a781..ff59b00 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java
@@ -65,14 +65,14 @@ class FilePasswordProvider implements PasswordProvider {
byte[] bytes = null;
try {
bytes = Files.readAllBytes(passwordPath);
- final ByteBuffer bb = ByteBuffer.wrap(bytes);
- final CharBuffer decoded = Charset.defaultCharset().decode(bb);
- final char[] result = new char[decoded.limit()];
+ ByteBuffer bb = ByteBuffer.wrap(bytes);
+ CharBuffer decoded = Charset.defaultCharset().decode(bb);
+ char[] result = new char[decoded.limit()];
decoded.get(result, 0, result.length);
decoded.rewind();
decoded.put(new char[result.length]); // erase decoded CharBuffer
return result;
- } catch (final IOException e) {
+ } catch (IOException e) {
throw new IllegalStateException("Could not read password from " + passwordPath + ": " + e, e);
} finally {
if (bytes != null) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index ff479be..0c9e3ce 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -107,7 +107,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
}
try {
// @formatter:off
- final PasswordProvider provider = passwordFile != null
+ PasswordProvider provider = passwordFile != null
? new FilePasswordProvider(passwordFile)
: passwordEnvironmentVariable != null
? new EnvironmentPasswordProvider(passwordEnvironmentVariable)
@@ -118,7 +118,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
Arrays.fill(password, '\0');
}
return new KeyStoreConfiguration(location, provider, keyStoreType, keyManagerFactoryAlgorithm);
- } catch (final Exception ex) {
+ } catch (Exception ex) {
throw new StoreConfigurationException("Could not configure KeyStore", ex);
}
}
@@ -166,7 +166,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
public KeyManagerFactory initKeyManagerFactory() throws NoSuchAlgorithmException, UnrecoverableKeyException,
KeyStoreException {
final KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(this.keyManagerFactoryAlgorithm);
- final char[] password = this.getPasswordAsCharArray();
+ char[] password = this.getPasswordAsCharArray();
try {
kmFactory.init(this.getKeyStore(), password);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index 5603e89..b129184 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -66,7 +66,7 @@ public class SslConfiguration {
this.trustStoreConfig.clearSecrets();
}
}
-
+
public SSLSocketFactory getSslSocketFactory() {
return sslContext.getSocketFactory();
}
@@ -219,7 +219,7 @@ public class SslConfiguration {
/**
* Creates an SslConfiguration from a KeyStoreConfiguration and a TrustStoreConfiguration.
- *
+ *
* @param protocol The protocol, see http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#SSLContext
* @param keyStoreConfig The KeyStoreConfiguration.
* @param trustStoreConfig The TrustStoreConfiguration.
@@ -229,7 +229,7 @@ public class SslConfiguration {
public static SslConfiguration createSSLConfiguration(
// @formatter:off
@PluginAttribute("protocol") final String protocol,
- @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
+ @PluginElement("KeyStore") final KeyStoreConfiguration keyStoreConfig,
@PluginElement("TrustStore") final TrustStoreConfiguration trustStoreConfig) {
// @formatter:on
return new SslConfiguration(protocol, keyStoreConfig, trustStoreConfig);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
index f635145..793e6df 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
@@ -30,7 +30,7 @@ public class StoreConfigurationException extends Exception {
super(message);
}
- public StoreConfigurationException(final String message, final Exception e) {
+ public StoreConfigurationException(String message, Exception e) {
super(message, e);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index 08ddc69..b5c282b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -96,7 +96,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
}
try {
// @formatter:off
- final PasswordProvider provider = passwordFile != null
+ PasswordProvider provider = passwordFile != null
? new FilePasswordProvider(passwordFile)
: passwordEnvironmentVariable != null
? new EnvironmentPasswordProvider(passwordEnvironmentVariable)
@@ -107,7 +107,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
Arrays.fill(password, '\0');
}
return new TrustStoreConfiguration(location, provider, keyStoreType, trustManagerFactoryAlgorithm);
- } catch (final Exception ex) {
+ } catch (Exception ex) {
throw new StoreConfigurationException("Could not configure TrustStore", ex);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
index 2ef2bc3..ca20335 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/parser/TextLogEventParser.java
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.LogEvent;
* Parses the output from a text based layout into instances of {@link LogEvent}.
*/
public interface TextLogEventParser extends LogEventParser {
-
+
/**
* Parses a String, which is expected to contain exactly one log event.
*
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
index 703786b..9bc85ca 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
@@ -184,7 +184,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
cachedTime = new AtomicReference<>(fromEpochMillis(System.currentTimeMillis()));
}
- private CachedTime fromEpochMillis(final long epochMillis) {
+ private CachedTime fromEpochMillis(long epochMillis) {
final MutableInstant temp = new MutableInstant();
temp.initFromEpochMilli(epochMillis, 0);
return new CachedTime(temp);
@@ -266,7 +266,7 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
public void format(final long epochMilli, final StringBuilder output) {
- final MutableInstant instant = getMutableInstant();
+ MutableInstant instant = getMutableInstant();
instant.initFromEpochMilli(epochMilli, 0);
format(instant, output);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index 9485746..8ec9b7d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -35,7 +35,7 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon
/**
* Private constructor.
- *
+ *
* @param config
* @param options options, may be null.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
index 330da9f..c4b9703 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
@@ -252,7 +252,7 @@ public final class HighlightConverter extends LogEventPatternConverter implement
}
}
- String getLevelStyle(final Level level) {
+ String getLevelStyle(Level level) {
return levelStyles.get(level);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/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 ea47a68..8377036 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
@@ -34,9 +34,9 @@ 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>
@@ -54,28 +54,28 @@ import org.fusesource.jansi.AnsiRenderer.Code;
* <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 {
@@ -254,7 +254,7 @@ public final class JAnsiTextRenderer implements TextRenderer {
/**
* 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
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
index f603b05..91c11ec 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
@@ -276,7 +276,7 @@ public final class PatternParser {
final int begin = i; // position of first real char
int depth = 1; // already inside one level
while (depth > 0 && i < pattern.length()) {
- final char c = pattern.charAt(i);
+ char c = pattern.charAt(i);
if (c == '{') {
depth++;
} else if (c == '}') {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/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 a29634d..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
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.pattern;
Renders input unchanged.
*/
public final class PlainTextRenderer implements TextRenderer {
-
+
private static final PlainTextRenderer INSTANCE = new PlainTextRenderer();
public static PlainTextRenderer getInstance() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
index 847c931..d182dc0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ProcessIdPatternConverter.java
@@ -32,7 +32,7 @@ public final class ProcessIdPatternConverter extends LogEventPatternConverter {
private ProcessIdPatternConverter(final String... options) {
super("Process ID", "pid");
final String defaultValue = options.length > 0 ? options[0] : DEFAULT_DEFAULT_VALUE;
- final String discoveredPid = ProcessIdUtil.getProcessId();
+ String discoveredPid = ProcessIdUtil.getProcessId();
pid = discoveredPid.equals(ProcessIdUtil.DEFAULT_PROCESSID) ? defaultValue : discoveredPid;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
index 3a9e210..2355c88 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/TextRenderer.java
@@ -23,7 +23,7 @@ public interface TextRenderer {
/**
* Renders input text to an output.
- *
+ *
* @param input
* The input
* @param output
@@ -35,7 +35,7 @@ public interface TextRenderer {
/**
* Renders input text to an output.
- *
+ *
* @param input
* The input
* @param output
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
index b78bff2..90f04fa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
@@ -26,7 +26,7 @@ public abstract class AbstractScript {
protected static final Logger LOGGER = StatusLogger.getLogger();
protected static final String DEFAULT_LANGUAGE = "JavaScript";
-
+
private final String language;
private final String scriptText;
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
index b054e9a..b790eaf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
@@ -44,7 +44,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* Here is an example of an <code>env-entry</code>:
* </p>
* <blockquote>
- *
+ *
* <pre>
* <env-entry>
* <description>JNDI logging context name for this app</description>
@@ -53,7 +53,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
@@ -66,7 +66,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* (ContextJNDISelector) will use this resource to automatically configure the log4j repository.
* </p>
** <blockquote>
- *
+ *
* <pre>
* <env-entry>
* <description>URL for configuring log4j context</description>
@@ -75,7 +75,7 @@ import org.apache.logging.log4j.status.StatusLogger;
* <env-entry-type>java.lang.String</env-entry-type>
* </env-entry>
* </pre>
- *
+ *
* </blockquote>
*
* <p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f4c7962/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
index 0c7f451..2e49a96 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/MutableInstant.java
@@ -54,14 +54,14 @@ public class MutableInstant implements Instant, Serializable {
@Override
public long getEpochMillisecond() {
final int millis = nanoOfSecond / NANOS_PER_MILLI;
- final long epochMillisecond = epochSecond * MILLIS_PER_SECOND + millis;
+ long epochMillisecond = epochSecond * MILLIS_PER_SECOND + millis;
return epochMillisecond;
}
@Override
public int getNanoOfMillisecond() {
final int millis = nanoOfSecond / NANOS_PER_MILLI;
- final int nanoOfMillisecond = nanoOfSecond - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
+ int nanoOfMillisecond = nanoOfSecond - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
return nanoOfMillisecond;
}
@@ -121,7 +121,7 @@ public class MutableInstant implements Instant, Serializable {
* the second element is the number of nanoseconds, later along the time-line, from the start of the millisecond
*/
public static void instantToMillisAndNanos(final long epochSecond, final int nano, final long[] result) {
- final int millis = nano / NANOS_PER_MILLI;
+ int millis = nano / NANOS_PER_MILLI;
result[0] = epochSecond * MILLIS_PER_SECOND + millis;
result[1] = nano - (millis * NANOS_PER_MILLI); // cheaper than nanoOfSecond % NANOS_PER_MILLI
}
@@ -134,7 +134,7 @@ public class MutableInstant implements Instant, Serializable {
if (!(object instanceof MutableInstant)) {
return false;
}
- final MutableInstant other = (MutableInstant) object;
+ MutableInstant other = (MutableInstant) object;
return epochSecond == other.epochSecond && nanoOfSecond == other.nanoOfSecond;
}