Checkstyle: LineLength, space after '{' in array declaration, util
classes should be final, DeclarationOrderProject: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6c8d97e6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6c8d97e6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6c8d97e6 Branch: refs/heads/LOG4J2-1136 Commit: 6c8d97e6e947d7fee0b56f951474b7d23e0aa5b3 Parents: 56078bc Author: rpopma <[email protected]> Authored: Thu Sep 24 11:26:31 2015 +0200 Committer: Ralph Goers <[email protected]> Committed: Sun Sep 27 10:47:30 2015 -0700 ---------------------------------------------------------------------- .../org/apache/logging/log4j/message/ObjectMessage.java | 2 +- .../apache/logging/log4j/message/StructuredDataId.java | 10 +++++----- .../org/apache/logging/log4j/simple/SimpleLogger.java | 3 ++- .../java/org/apache/logging/log4j/spi/AbstractLogger.java | 6 ++++-- .../main/java/org/apache/logging/log4j/util/Chars.java | 2 +- .../java/org/apache/logging/log4j/util/LoaderUtil.java | 4 ++-- .../java/org/apache/logging/log4j/util/ProviderUtil.java | 2 +- .../org/apache/logging/log4j/util/ReflectionUtil.java | 6 ++++-- .../org/apache/logging/log4j/util/StringBuilders.java | 2 +- .../main/java/org/apache/logging/log4j/util/Strings.java | 8 ++++---- 10 files changed, 25 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java index e9a8905..7cffe47 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/ObjectMessage.java @@ -71,7 +71,7 @@ public class ObjectMessage implements Message { */ @Override public Object[] getParameters() { - return new Object[] { obj }; + return new Object[] {obj}; } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java index 2bbb9a2..4bc841f 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java @@ -29,19 +29,19 @@ public class StructuredDataId implements Serializable { * RFC 5424 Time Quality. */ public static final StructuredDataId TIME_QUALITY = new StructuredDataId("timeQuality", null, new String[] { - "tzKnown", "isSynced", "syncAccuracy" }); + "tzKnown", "isSynced", "syncAccuracy"}); /** * RFC 5424 Origin. */ - public static final StructuredDataId ORIGIN = new StructuredDataId("origin", null, new String[] { "ip", - "enterpriseId", "software", "swVersion" }); + public static final StructuredDataId ORIGIN = new StructuredDataId("origin", null, new String[] {"ip", + "enterpriseId", "software", "swVersion"}); /** * RFC 5424 Meta. */ - public static final StructuredDataId META = new StructuredDataId("meta", null, new String[] { "sequenceId", - "sysUpTime", "language" }); + public static final StructuredDataId META = new StructuredDataId("meta", null, new String[] {"sequenceId", + "sysUpTime", "language"}); /** * Reserved enterprise number. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java index b633ef9..13ddeb5 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java @@ -153,7 +153,8 @@ public class SimpleLogger extends AbstractLogger { } final Object[] params = msg.getParameters(); Throwable t; - if (throwable == null && params != null && params.length > 0 && params[params.length - 1] instanceof Throwable) { + if (throwable == null && params != null && params.length > 0 + && params[params.length - 1] instanceof Throwable) { t = (Throwable) params[params.length - 1]; } else { t = throwable; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index 0d9b642..98bedc5 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@ -68,7 +68,8 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { /** * The default MessageFactory class. */ - public static final Class<? extends MessageFactory> DEFAULT_MESSAGE_FACTORY_CLASS = ParameterizedMessageFactory.class; + public static final Class<? extends MessageFactory> DEFAULT_MESSAGE_FACTORY_CLASS = + ParameterizedMessageFactory.class; private static final long serialVersionUID = 2L; @@ -128,7 +129,8 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { StatusLogger .getLogger() .warn("The Logger {} was created with the message factory {} and is now requested with a null " - + "message factory (defaults to {}), which may create log events with unexpected formatting.", + + "message factory (defaults to {}), which may create log events with unexpected " + + "formatting.", name, loggerMessageFactory, DEFAULT_MESSAGE_FACTORY_CLASS.getName()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/util/Chars.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Chars.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Chars.java index 75328d0..25bde70 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Chars.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Chars.java @@ -19,7 +19,7 @@ package org.apache.logging.log4j.util; /** * <em>Consider this class private.</em> */ -public class Chars { +public final class Chars { /** Carriage Return. */ public static final char CR = '\r'; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java index 4624d0b..0019135 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java @@ -192,8 +192,8 @@ public final class LoaderUtil { } static Collection<UrlResource> findUrlResources(final String resource) { - final ClassLoader[] candidates = { getThreadContextClassLoader(), LoaderUtil.class.getClassLoader(), - GET_CLASS_LOADER_DISABLED ? null : ClassLoader.getSystemClassLoader() }; + final ClassLoader[] candidates = {getThreadContextClassLoader(), LoaderUtil.class.getClassLoader(), + GET_CLASS_LOADER_DISABLED ? null : ClassLoader.getSystemClassLoader()}; final Collection<UrlResource> resources = new LinkedHashSet<>(); for (final ClassLoader cl : candidates) { if (cl != null) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java index 7018c36..2673c0b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java @@ -54,7 +54,7 @@ public final class ProviderUtil { protected static final Lock STARTUP_LOCK = new ReentrantLock(); private static final String API_VERSION = "Log4jAPIVersion"; - private static final String[] COMPATIBLE_API_VERSIONS = { "2.0.0", "2.1.0" }; + private static final String[] COMPATIBLE_API_VERSIONS = {"2.0.0", "2.1.0"}; private static final Logger LOGGER = StatusLogger.getLogger(); // STARTUP_LOCK guards INSTANCE for lazy initialization; this allows the OSGi Activator to pause the startup and http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java index 22d4bc2..aaaacac 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java @@ -72,7 +72,8 @@ public final class ReflectionUtil { } else { o = getCallerClass.invoke(null, 1); if (o == sunReflectionClass) { - LOGGER.warn("You are using Java 1.7.0_25 which has a broken implementation of Reflection.getCallerClass."); + LOGGER.warn("You are using Java 1.7.0_25 which has a broken implementation of " + + "Reflection.getCallerClass."); LOGGER.warn("You should upgrade to at least Java 1.7.0_40 or later."); LOGGER.debug("Using stack depth compensation offset of 1 due to Java 7u25."); java7u25CompensationOffset = 1; @@ -97,7 +98,8 @@ public final class ReflectionUtil { } psm = new PrivateSecurityManager(); } catch (final SecurityException ignored) { - LOGGER.debug("Not allowed to create SecurityManager. Falling back to slowest ReflectionUtil implementation."); + LOGGER.debug("Not allowed to create SecurityManager. " + + "Falling back to slowest ReflectionUtil implementation."); psm = null; } SECURITY_MANAGER = psm; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java index 0eb1ea2..802122d 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java @@ -21,7 +21,7 @@ import java.util.Map.Entry; /** * <em>Consider this class private.</em> */ -public class StringBuilders { +public final class StringBuilders { private StringBuilders() { } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6c8d97e6/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java index 27f71a9..6ee7dca 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java @@ -23,15 +23,15 @@ package org.apache.logging.log4j.util; */ public final class Strings { - private Strings() { - // empty - } - /** * The empty string. */ public static final String EMPTY = ""; + private Strings() { + // empty + } + /** * Returns a double quoted string. *
