MIP-395 Codenarc cleanup

avioconsulting · Jul 8, 2020 · f5bc93d · f5bc93d
1 parent b958749
commit f5bc93d
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 54 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,3 +27,5 @@ dependencies {
 test {
     useJUnitPlatform()
 }
+
+[codenarcMain, codenarcTest]*.ignoreFailures = true
diff --git a/config/codenarc/codenarc.xml b/config/codenarc/codenarc.xml
@@ -4,51 +4,38 @@
         xsi:noNamespaceSchemaLocation="http://codenarc.org/ruleset-schema.xsd">
 
     <description>
-        Basic rule set.
-        These rules are intended to be broadly (if not universally) applicable.
+        Complete rule set, AVIO Inspection.
     </description>
-
-    <rule class='org.codenarc.rule.basic.AssertWithinFinallyBlockRule'/>
-    <rule class='org.codenarc.rule.basic.AssignmentInConditionalRule'/>
-    <rule class='org.codenarc.rule.basic.BigDecimalInstantiationRule'/>
-    <rule class='org.codenarc.rule.basic.BitwiseOperatorInConditionalRule'/>
-    <rule class='org.codenarc.rule.basic.BooleanGetBooleanRule'/>
-    <rule class='org.codenarc.rule.basic.BrokenNullCheckRule'/>
-    <rule class='org.codenarc.rule.basic.BrokenOddnessCheckRule'/>
-    <rule class='org.codenarc.rule.basic.ClassForNameRule'/>
-    <rule class='org.codenarc.rule.basic.ComparisonOfTwoConstantsRule'/>
-    <rule class='org.codenarc.rule.basic.ComparisonWithSelfRule'/>
-    <rule class='org.codenarc.rule.basic.ConstantAssertExpressionRule'/>
-    <rule class='org.codenarc.rule.basic.ConstantTernaryExpressionRule'/>
-    <rule class='org.codenarc.rule.basic.ConstantIfExpressionRule'/>
-    <rule class='org.codenarc.rule.basic.DeadCodeRule'/>
-    <rule class='org.codenarc.rule.basic.DoubleNegativeRule'/>
-    <rule class='org.codenarc.rule.basic.DuplicateCaseStatementRule'/>
-    <rule class='org.codenarc.rule.basic.DuplicateMapKeyRule'/>
-    <rule class='org.codenarc.rule.basic.DuplicateSetValueRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyCatchBlockRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyClassRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyElseBlockRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyFinallyBlockRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyForStatementRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyIfStatementRule'/>
-    <rule class='org.codenarc.rule.basic.EmptySwitchStatementRule'/>
-    <rule class='org.codenarc.rule.basic.EmptySynchronizedStatementRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyStaticInitializerRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyTryBlockRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyWhileStatementRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyInstanceInitializerRule'/>
-    <rule class='org.codenarc.rule.basic.EmptyMethodRule'/>
-    <rule class='org.codenarc.rule.basic.EqualsAndHashCodeRule'/>
-    <rule class='org.codenarc.rule.basic.EqualsOverloadedRule'/>
-    <rule class='org.codenarc.rule.basic.ExplicitGarbageCollectionRule'/>
-    <rule class='org.codenarc.rule.basic.ForLoopShouldBeWhileLoopRule'/>
-    <rule class='org.codenarc.rule.basic.HardCodedWindowsFileSeparatorRule'/>
-    <rule class='org.codenarc.rule.basic.HardCodedWindowsRootDirectoryRule'/>
-    <rule class='org.codenarc.rule.basic.IntegerGetIntegerRule'/>
-    <rule class='org.codenarc.rule.basic.MultipleUnaryOperatorsRule'/>
-    <rule class='org.codenarc.rule.basic.RandomDoubleCoercedToZeroRule'/>
-    <rule class='org.codenarc.rule.basic.RemoveAllOnSelfRule'/>
-    <rule class='org.codenarc.rule.basic.ReturnFromFinallyBlockRule'/>
-    <rule class='org.codenarc.rule.basic.ThrowExceptionFromFinallyBlockRule'/>
+
+	<ruleset-ref path='rulesets/basic.xml'/>
+	<ruleset-ref path='rulesets/braces.xml'/>
+	<ruleset-ref path='rulesets/comments.xml'/>
+	<ruleset-ref path='rulesets/concurrency.xml'/>
+	<ruleset-ref path='rulesets/convention.xml'>
+        <exclude name='CompileStatic'/>
+        <exclude name='TrailingComma'/>
+        <exclude name='ImplicitClosureParameter'/>
+	</ruleset-ref>
+	<ruleset-ref path='rulesets/design.xml'/>
+	<ruleset-ref path='rulesets/dry.xml'/>
+	<ruleset-ref path='rulesets/enhanced.xml'/>
+	<ruleset-ref path='rulesets/exceptions.xml'/>
+	<ruleset-ref path='rulesets/formatting.xml'/>
+	<ruleset-ref path='rulesets/generic.xml'/>
+	<ruleset-ref path='rulesets/grails.xml'/>
+	<ruleset-ref path='rulesets/groovyism.xml'/>
+	<ruleset-ref path='rulesets/imports.xml'/>
+	<ruleset-ref path='rulesets/jdbc.xml'/>
+	<ruleset-ref path='rulesets/junit.xml'/>
+	<ruleset-ref path='rulesets/logging.xml'/>
+	<ruleset-ref path='rulesets/naming.xml'/>
+	<ruleset-ref path='rulesets/size.xml'/>
+	<ruleset-ref path='rulesets/security.xml'>
+        <exclude name='JavaIoPackageAccess'/>
+	</ruleset-ref>
+	<ruleset-ref path='rulesets/serialization.xml'/>
+	<ruleset-ref path='rulesets/unnecessary.xml'>
+        <exclude name='UnnecessaryReturnKeyword'/>
+	</ruleset-ref>
+	<ruleset-ref path='rulesets/unused.xml'/>
 </ruleset>
diff --git a/src/main/groovy/com/avioconsulting/mule/linter/model/MuleArtifact.groovy b/src/main/groovy/com/avioconsulting/mule/linter/model/MuleArtifact.groovy
@@ -10,7 +10,7 @@ class MuleArtifact extends ProjectFile {
 
     public static final String MULE_ARTIFACT_JSON = 'mule-artifact.json'
 
-    private JsonMap muleArtifact;
+    private JsonMap muleArtifact
     private final Boolean exists
 
     MuleArtifact(File f) {

diff --git a/src/main/groovy/com/avioconsulting/mule/linter/model/RuleSet.groovy b/src/main/groovy/com/avioconsulting/mule/linter/model/RuleSet.groovy
@@ -4,9 +4,6 @@ class RuleSet {
 
     List<Rule> rules = []
 
-    RuleSet() {
-    }
-
     void addRule(Rule rule) {
         rules.add(rule)
     }

diff --git a/src/main/groovy/com/avioconsulting/mule/linter/rule/configuration/GlobalConfigRule.groovy b/src/main/groovy/com/avioconsulting/mule/linter/rule/configuration/GlobalConfigRule.groovy
@@ -11,9 +11,8 @@ class GlobalConfigRule extends Rule {
     static final String RULE_NAME = 'Global mule configuration xml exists and contain required configuration.'
     static final String RULE_VIOLATION_MESSAGE = 'Mule configuration xml contain global configuration: '
     static final String FILE_MISSING_VIOLATION_MESSAGE = 'Mule global configuration xml does not exist'
-
+    static final String DEFAULT_FILE_NAME = 'globals.xml'
     static Map<String, String> noneGlobalElements = [:]
-    static String DEFAULT_FILE_NAME = 'globals.xml'
     String globalFileName
 
     GlobalConfigRule(String globalFileName, Map<String, String> noneGlobalElements) {

diff --git a/...uleArtifactHasSecurePropertiesRule.groovy → ...uleArtifactHasSecurePropertiesRule.groovy b/...uleArtifactHasSecurePropertiesRule.groovy → ...uleArtifactHasSecurePropertiesRule.groovy
@@ -1,4 +1,4 @@
-package com.avioconsulting.mule.linter.rule.muleArtifact
+package com.avioconsulting.mule.linter.rule.muleartifact
 
 import com.avioconsulting.mule.linter.model.Application
 import com.avioconsulting.mule.linter.model.Rule

diff --git a/...rtifactHasSecurePropertiesRuleTest.groovy → ...rtifactHasSecurePropertiesRuleTest.groovy b/...rtifactHasSecurePropertiesRuleTest.groovy → ...rtifactHasSecurePropertiesRuleTest.groovy
@@ -1,4 +1,4 @@
-package com.avioconsulting.mule.linter.rule.muleArtifact
+package com.avioconsulting.mule.linter.rule.muleartifact
 
 import com.avioconsulting.mule.linter.model.Application
 import com.avioconsulting.mule.linter.model.Rule
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,3 +27,5 @@ dependencies { @@
     test {
         useJUnitPlatform()
     }
+    [codenarcMain, codenarcTest]*.ignoreFailures = true