Update CodeNarc version to 2.2.0

Vampire · Vampire · commit e08ab2d466b4 · 2026-03-16T18:11:43.000+01:00
diff --git a/buildSrc/src/main/kotlin/net/kautler/codenarc.gradle.kts b/buildSrc/src/main/kotlin/net/kautler/codenarc.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Bjoern Kautler
+ * Copyright 2019-2023 Bjoern Kautler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ val versions: Map<String, String> by project
 
 codenarc {
     toolVersion = versions.safeGet("codenarc")
-    // customized copy from http://codenarc.sourceforge.net/StarterRuleSet-AllRulesByCategory.groovy.txt
-    // update with new rules when version is updated (previous version: 1.4)
+    // customized copy from https://github.com/CodeNarc/CodeNarc/blob/v2.2.0/docs/StarterRuleSet-AllRulesByCategory.groovy.txt
+    // update with new rules when version is updated (previous version: 2.2.0)
     config = resources.text.fromFile("config/codenarc/codenarc.groovy")
 }
 
diff --git a/buildSrc/src/main/kotlin/net/kautler/versions.gradle.kts b/buildSrc/src/main/kotlin/net/kautler/versions.gradle.kts
@@ -49,7 +49,7 @@ val versions by extra(mapOf(
         "antlr" to "4.7.2",
 
         // tool versions
-        "codenarc" to "1.4",
+        "codenarc" to "2.2.0",
         "findsecbugs" to "1.9.0",
         "jacoco" to "0.8.5",
         "pitest" to "1.17.4",
diff --git a/config/codenarc/codenarc.groovy b/config/codenarc/codenarc.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Björn Kautler
+ * Copyright 2019-2023 Björn Kautler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@ ruleset {
     HardCodedWindowsRootDirectory
     IntegerGetInteger
     MultipleUnaryOperators
+    ParameterAssignmentInFilterClosure
     RandomDoubleCoercedToZero
     RemoveAllOnSelf
     ReturnFromFinallyBlock
@@ -137,12 +138,20 @@ ruleset {
     //FieldTypeRequired
     HashtableIsObsolete
     IfStatementCouldBeTernary
+    //ImplicitClosureParameter
+    //ImplicitReturnStatement
     InvertedCondition
     InvertedIfElse
     LongLiteralWithLowerCaseL
     //MethodParameterTypeRequired
     //MethodReturnTypeRequired
     //NoDef
+    NoDouble {
+        doNotApplyToClassNames = 'net.kautler.test.PrivateFinalFieldSetterCategory'
+    }
+    NoFloat {
+        doNotApplyToClassNames = 'net.kautler.test.PrivateFinalFieldSetterCategory'
+    }
     NoJavaUtilDate
     NoTabCharacter
     //ParameterReassignment
@@ -177,6 +186,9 @@ ruleset {
     }
     LocaleSetDefault
     NestedForLoop
+    OptionalCollectionReturnType
+    OptionalField
+    OptionalMethodParameter
     PrivateFieldCouldBeFinal
     PublicInstanceField
     ReturnsNullInsteadOfEmptyArray
@@ -237,17 +249,15 @@ ruleset {
     //LineLength
     MissingBlankLineAfterImports
     MissingBlankLineAfterPackage
+    MissingBlankLineBeforeAnnotatedField
     SpaceAfterCatch
-    SpaceAfterClosingBrace {
-        // work-around for https://github.com/CodeNarc/CodeNarc/issues/452
-        doNotApplyToClassNames = [
-                'net.kautler.command.integ.test.javacord.spock.JavacordExtension',
-                'net.kautler.command.integ.test.jda.spock.JdaExtension'
-        ].join(', ')
-    }
+    SpaceAfterClosingBrace
     SpaceAfterComma
     SpaceAfterFor
     SpaceAfterIf
+    SpaceAfterMethodCallName
+    SpaceAfterMethodDeclarationName
+    SpaceAfterNotOperator
     SpaceAfterOpeningBrace
     SpaceAfterSemicolon
     SpaceAfterSwitch
@@ -258,12 +268,8 @@ ruleset {
     }
     SpaceAroundOperator
     SpaceBeforeClosingBrace
-    SpaceBeforeOpeningBrace {
-        doNotApplyToClassNames = [
-                'net.kautler.command.util.lazy.LazyReferenceByFunctionTest$1',
-                'net.kautler.command.util.lazy.LazyReferenceBySupplierTest$1'
-        ].join(', ')
-    }
+    SpaceBeforeOpeningBrace
+    SpaceInsideParentheses
     TrailingWhitespace
 
     // rulesets/generic.xml
@@ -278,6 +284,7 @@ ruleset {
     StatelessClass
 
     // rulesets/grails.xml
+    GrailsDomainGormMethods
     GrailsDomainHasEquals
     GrailsDomainHasToString
     GrailsDomainReservedSqlKeywordName
@@ -337,12 +344,7 @@ ruleset {
     ExplicitTreeSetInstantiation
     GStringAsMapKey
     GStringExpressionWithinString
-    GetterMethodCouldBeProperty {
-        doNotApplyToClassNames = [
-                'net.kautler.command.integ.test.javacord.restriction.RestrictionChainElementIntegTest$PingCommand',
-                'net.kautler.command.integ.test.jda.restriction.RestrictionChainElementIntegTest$PingCommand'
-        ].join(', ')
-    }
+    GetterMethodCouldBeProperty
     GroovyLangImmutable
     UseCollectMany
     UseCollectNested
diff --git a/src/javacordIntegTest/groovy/net/kautler/command/integ/test/VersionIntegTest.groovy b/src/javacordIntegTest/groovy/net/kautler/command/integ/test/VersionIntegTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 Björn Kautler
+ * Copyright 2020-2023 Björn Kautler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class VersionIntegTest extends Specification {
     @AddBean(VersionHolder)
     def 'display version should be equal to version if and only if the version is not a snapshot version'() {
         expect:
-            with (VersionHolder.version) {
+            with(VersionHolder.version) {
                 (displayVersion == version) != (version.endsWith('-SNAPSHOT') || version == '<unknown>')
             }
     }
diff --git a/src/test/groovy/net/kautler/command/api/CommandContextTest.groovy b/src/test/groovy/net/kautler/command/api/CommandContextTest.groovy
@@ -36,8 +36,10 @@ class CommandContextTest extends Specification {
     def alias = randomUUID() as String
     def parameterString = randomUUID() as String
     Command command = Stub()
+
     @Shared
     def additionalDataKey = randomUUID() as String
+
     @Shared
     def additionalDataValue = randomUUID()
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2020-2022 Björn Kautler`
	`2`	`+ * Copyright 2020-2023 Björn Kautler`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -43,7 +43,7 @@ class VersionIntegTest extends Specification {`
`43`	`43`	`@AddBean(VersionHolder)`
`44`	`44`	`def 'display version should be equal to version if and only if the version is not a snapshot version'() {`
`45`	`45`	`expect:`
`46`		`- with (VersionHolder.version) {`
	`46`	`+ with(VersionHolder.version) {`
`47`	`47`	`(displayVersion == version) != (version.endsWith('-SNAPSHOT') \|\| version == '<unknown>')`
`48`	`48`	`}`
`49`	`49`	`}`