Checkstyle: SUPPRESS doesn't seem to work...
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/951cbbdb Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/951cbbdb Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/951cbbdb Branch: refs/heads/LOG4J2-1136 Commit: 951cbbdb34dffd879517cf1b5096665191789222 Parents: 6832021 Author: rpopma <[email protected]> Authored: Thu Sep 24 14:03:26 2015 +0200 Committer: Ralph Goers <[email protected]> Committed: Sun Sep 27 10:47:30 2015 -0700 ---------------------------------------------------------------------- checkstyle.xml | 7 +++++++ .../main/java/org/apache/logging/log4j/util/LoaderUtil.java | 5 ++--- .../java/org/apache/logging/log4j/util/ReflectionUtil.java | 5 ++--- 3 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/951cbbdb/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle.xml b/checkstyle.xml index 6534f9f..80ad14d 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -66,16 +66,23 @@ <!--<module name="SuppressionFilter"> <property name="file" value="conf/checkstyle-suppressions.xml"/> </module> --> + <!-- <module name="SuppressionCommentFilter"> <property name="offCommentFormat" value="Check\:OFF\: ([\w\|]+)"/> <property name="onCommentFormat" value="Check\:ON\: ([\w\|]+)"/> <property name="checkFormat" value="$1"/> </module> + --> + <module name="SuppressionCommentFilter" /> + <module name="SuppressWithNearbyCommentFilter"/> <module name="TreeWalker"> <property name="cacheFile" value="${checkstyle.cache.file}"/> + <!-- Ensure that CHECKSTYLE:OFF comments are available to the filter: --> + <module name="FileContentsHolder"/> + <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> <module name="JavadocMethod"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/951cbbdb/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 0019135..e881a3a 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 @@ -24,6 +24,7 @@ import java.security.PrivilegedAction; import java.util.Collection; import java.util.Enumeration; import java.util.LinkedHashSet; +import java.util.Objects; /** * <em>Consider this class private.</em> Utility class for ClassLoaders. @@ -253,9 +254,7 @@ public final class LoaderUtil { @Override public int hashCode() { - int result = classLoader != null ? classLoader.hashCode() : 0; - result = 31 * result + (url != null ? url.hashCode() : 0); - return result; + return Objects.hashCode(classLoader) + Objects.hashCode(url); } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/951cbbdb/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 aaaacac..562cb65 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 @@ -48,9 +48,8 @@ import org.apache.logging.log4j.status.StatusLogger; * </p> */ public final class ReflectionUtil { - // Check:OFF: ConstantName - static final int JDK_7u25_OFFSET; - // Check:ON: ConstantName + // Checkstyle Suppress: the lower-case 'u' ticks off CheckStyle... + static final int JDK_7u25_OFFSET; // SUPPRESS CHECKSTYLE private static final Logger LOGGER = StatusLogger.getLogger(); private static final boolean SUN_REFLECTION_SUPPORTED;
