Fix java.lang.ClassCastException is reading default yaml config (#3920)

Co-authored-by: Nicola Corti <corti.nico@gmail.com>
detekt · Jul 2, 2021 · 5048b8b · 5048b8b
1 parent f6d75dd
commit 5048b8b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 55 deletions.
diff --git a/detekt-core/src/main/resources/default-detekt-config.yml b/detekt-core/src/main/resources/default-detekt-config.yml
@@ -92,15 +92,15 @@ complexity:
     ignoreSimpleWhenEntries: false
     ignoreNestingFunctions: false
     nestingFunctions:
-      - run
-      - let
-      - apply
-      - with
-      - also
-      - use
-      - forEach
-      - isNotNull
-      - ifNull
+      - 'run'
+      - 'let'
+      - 'apply'
+      - 'with'
+      - 'also'
+      - 'use'
+      - 'forEach'
+      - 'isNotNull'
+      - 'ifNull'
   LabeledExpression:
     active: false
     ignoredLabels: []
@@ -199,10 +199,10 @@ exceptions:
   ExceptionRaisedInUnexpectedLocation:
     active: true
     methodNames:
-      - toString
-      - hashCode
-      - equals
-      - finalize
+      - 'toString'
+      - 'hashCode'
+      - 'equals'
+      - 'finalize'
   InstanceOfCheckForException:
     active: false
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
@@ -220,10 +220,10 @@ exceptions:
   SwallowedException:
     active: true
     ignoredExceptionTypes:
-      - NumberFormatException
-      - InterruptedException
-      - ParseException
-      - MalformedURLException
+      - 'NumberFormatException'
+      - 'InterruptedException'
+      - 'ParseException'
+      - 'MalformedURLException'
     allowedExceptionNameRegex: '_|(ignore|expected).*'
   ThrowingExceptionFromFinally:
     active: true
@@ -233,36 +233,36 @@ exceptions:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     exceptions:
-      - ArrayIndexOutOfBoundsException
-      - Error
-      - Exception
-      - IllegalMonitorStateException
-      - NullPointerException
-      - IndexOutOfBoundsException
-      - RuntimeException
-      - Throwable
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'NullPointerException'
+      - 'IndexOutOfBoundsException'
+      - 'RuntimeException'
+      - 'Throwable'
   ThrowingNewInstanceOfSameException:
     active: true
   TooGenericExceptionCaught:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     exceptionNames:
-      - ArrayIndexOutOfBoundsException
-      - Error
-      - Exception
-      - IllegalMonitorStateException
-      - NullPointerException
-      - IndexOutOfBoundsException
-      - RuntimeException
-      - Throwable
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'NullPointerException'
+      - 'IndexOutOfBoundsException'
+      - 'RuntimeException'
+      - 'Throwable'
     allowedExceptionNameRegex: '_|(ignore|expected).*'
   TooGenericExceptionThrown:
     active: true
     exceptionNames:
-      - Error
-      - Exception
-      - Throwable
-      - RuntimeException
+      - 'Error'
+      - 'Exception'
+      - 'Throwable'
+      - 'RuntimeException'
 
 formatting:
   active: true
@@ -614,8 +614,8 @@ style:
   ForbiddenMethodCall:
     active: false
     methods:
-      - kotlin.io.println
-      - kotlin.io.print
+      - 'kotlin.io.println'
+      - 'kotlin.io.print'
   ForbiddenPublicDataClass:
     active: true
     excludes: ['**']
@@ -632,7 +632,7 @@ style:
     ignoreActualFunction: true
     excludedFunctions: ''
     excludeAnnotatedFunction:
-      - dagger.Provides
+      - 'dagger.Provides'
   LibraryCodeMustSpecifyReturnType:
     active: true
     excludes: ['**']
@@ -646,10 +646,10 @@ style:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     ignoreNumbers:
-      - -1
-      - 0
-      - 1
-      - 2
+      - '-1'
+      - '0'
+      - '1'
+      - '2'
     ignoreHashCodeFunction: true
     ignorePropertyDeclaration: false
     ignoreLocalVariableDeclaration: false
@@ -725,7 +725,7 @@ style:
   UnnecessaryAbstractClass:
     active: true
     excludeAnnotatedClasses:
-      - dagger.Module
+      - 'dagger.Module'
   UnnecessaryAnnotationUseSiteTarget:
     active: false
   UnnecessaryApply:

diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/out/Yaml.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/out/Yaml.kt
@@ -68,7 +68,6 @@ private fun String.quotedForList(): String {
         isBlank() -> quoted()
         startsWith(SINGLE_QUOTE) && endsWith(SINGLE_QUOTE)
             || startsWith(DOUBLE_QUOTE) && endsWith(DOUBLE_QUOTE) -> this
-        matches(NO_QUOTES_REQUIRED) -> this
         else -> quoted()
     }
 }
@@ -78,4 +77,3 @@ private fun String.quoted() = "'$this'"
 private const val SINGLE_INDENT = "  "
 private const val SINGLE_QUOTE = "'"
 private const val DOUBLE_QUOTE = "\""
-private val NO_QUOTES_REQUIRED = Regex("""[.\w\s-]+""")
diff --git a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/out/YamlSpec.kt b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/out/YamlSpec.kt
@@ -19,7 +19,7 @@ object YamlSpec : Spek({
             val given = listOf("value")
             val result = yaml { list("key", given) }
             val expected = """key:
-                |  - value
+                |  - 'value'
             """.trimMargin()
             assertThat(result).isEqualTo(expected)
         }
@@ -28,8 +28,8 @@ object YamlSpec : Spek({
             val given = listOf("value 1", "value 2")
             val result = yaml { list("key", given) }
             val expected = """key:
-                |  - value 1
-                |  - value 2
+                |  - 'value 1'
+                |  - 'value 2'
             """.trimMargin()
             assertThat(result).isEqualTo(expected)
         }

diff --git a/detekt-generator/src/test/resources/RuleSetConfig.yml b/detekt-generator/src/test/resources/RuleSetConfig.yml
@@ -2,18 +2,18 @@ style:
   active: true
   rulesetconfig1: true
   rulesetconfig2:
-    - foo
-    - bar
+    - 'foo'
+    - 'bar'
   rulesetconfig3:
-    - first
+    - 'first'
     - 'se*cond'
   WildcardImport:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     conf1: foo
     conf3:
-      - a
-      - b
+      - 'a'
+      - 'b'
     conf5: 120
   EqualsNull:
     active: false