From e98c1eb96fbaf9c345fb29e300dfa93a3a9a5b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20So=CC=88semann?= Date: Thu, 2 Mar 2017 14:23:22 +0100 Subject: [PATCH] Make Apex XPath rules CodeClimate rules (doesn't fix failing test :-( --- .../pmd/lang/apex/rule/ApexXPathRule.java | 3 ++- .../src/main/resources/rulesets/apex/braces.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java index 37f5f6ff48..47d963304b 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java @@ -9,8 +9,9 @@ import net.sourceforge.pmd.lang.ParserOptions; import net.sourceforge.pmd.lang.apex.ApexLanguageModule; import net.sourceforge.pmd.lang.apex.ApexParserOptions; import net.sourceforge.pmd.lang.rule.XPathRule; +import net.sourceforge.pmd.renderers.CodeClimateRule; -public class ApexXPathRule extends XPathRule { +public class ApexXPathRule extends XPathRule implements CodeClimateRule { public ApexXPathRule() { super.setLanguage(LanguageRegistry.getLanguage(ApexLanguageModule.NAME)); diff --git a/pmd-apex/src/main/resources/rulesets/apex/braces.xml b/pmd-apex/src/main/resources/rulesets/apex/braces.xml index b55d4ff679..55b802be8d 100644 --- a/pmd-apex/src/main/resources/rulesets/apex/braces.xml +++ b/pmd-apex/src/main/resources/rulesets/apex/braces.xml @@ -12,8 +12,8 @@ The Braces ruleset contains rules regarding the use and placement of braces. language="apex" since="5.6.0" message="Avoid using if statements without curly braces" - class="net.sourceforge.pmd.lang.rule.XPathRule" - externalInfoUrl="${pmd.website.baseurl}/rules/java/braces.html#IfStmtsMustUseBraces"> + class="net.sourceforge.pmd.lang.apex.rule.ApexXPathRule" + externalInfoUrl="${pmd.website.baseurl}/rules/apex/braces.html#IfStmtsMustUseBraces"> Avoid using if statements without using braces to surround the code block. If the code formatting or indentation is lost then it becomes difficult to separate the code being @@ -47,8 +47,8 @@ if (foo) { // preferred approach language="apex" since="5.6.0" message="Avoid using 'while' statements without curly braces" - class="net.sourceforge.pmd.lang.rule.XPathRule" - externalInfoUrl="${pmd.website.baseurl}/rules/java/braces.html#WhileLoopsMustUseBraces"> + class="net.sourceforge.pmd.lang.apex.rule.ApexXPathRule" + externalInfoUrl="${pmd.website.baseurl}/rules/apex/braces.html#WhileLoopsMustUseBraces"> Avoid using 'while' statements without using braces to surround the code block. If the code formatting or indentation is lost then it becomes difficult to separate the code being @@ -80,8 +80,8 @@ while (true) { // preferred approach language="apex" since="5.6.0" message="Avoid using 'if...else' statements without curly braces" - class="net.sourceforge.pmd.lang.rule.XPathRule" - externalInfoUrl="${pmd.website.baseurl}/rules/java/braces.html#IfElseStmtsMustUseBraces"> + class="net.sourceforge.pmd.lang.apex.rule.ApexXPathRule" + externalInfoUrl="${pmd.website.baseurl}/rules/apex/braces.html#IfElseStmtsMustUseBraces"> Avoid using if..else statements without using surrounding braces. If the code formatting or indentation is lost then it becomes difficult to separate the code being controlled @@ -119,8 +119,8 @@ if (foo) language="apex" since="5.6.0" message="Avoid using 'for' statements without curly braces" - class="net.sourceforge.pmd.lang.rule.XPathRule" - externalInfoUrl="${pmd.website.baseurl}/rules/java/braces.html#ForLoopsMustUseBraces"> + class="net.sourceforge.pmd.lang.apex.rule.ApexXPathRule" + externalInfoUrl="${pmd.website.baseurl}/rules/apex/braces.html#ForLoopsMustUseBraces"> Avoid using 'for' statements without using curly braces. If the code formatting or indentation is lost then it becomes difficult to separate the code being controlled