Allow a static final variable with the name 'log' in checkstyle and PMD rules.
Change-Id: I027c9cc22b6801a078b0c003b68294e2ef0fc4f1
Added comment to PMD rule exception for clarity.
Change-Id: I027c9cc22b6801a078b0c003b68294e2ef0fc4f1
Change newline formatting from DOS to Linux
This gets rid of additional '\r' characters at the end of lines in this file.
Change-Id: I027c9cc22b6801a078b0c003b68294e2ef0fc4f1
diff --git a/conf/checkstyle/sun_checks.xml b/conf/checkstyle/sun_checks.xml
index 8d57707..562a38e 100644
--- a/conf/checkstyle/sun_checks.xml
+++ b/conf/checkstyle/sun_checks.xml
@@ -93,7 +93,10 @@
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
+ <module name="ConstantName">
+ <!-- ONOS allows the name "log" for static final Loggers -->
+ <property name="format" value="^log$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$" />
+ </module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName"/>
diff --git a/conf/pmd/onos_ruleset.xml b/conf/pmd/onos_ruleset.xml
index f70b8c0..d237731 100644
--- a/conf/pmd/onos_ruleset.xml
+++ b/conf/pmd/onos_ruleset.xml
@@ -36,6 +36,13 @@
<exclude name="ShortVariable" />
<exclude name="LongVariable" />
</rule>
+ <rule ref="rulesets/java/naming.xml/VariableNamingConventions">
+ <properties>
+ <!-- ONOS allows the name "log" for static final Loggers -->
+ <property name="violationSuppressRegex" value=".*'log'.*"/>
+ </properties>
+ </rule>
+
<rule ref="rulesets/java/clone.xml"/>
<rule ref="rulesets/java/strictexception.xml"/>
<rule ref="rulesets/java/design.xml">