refactor(analysis): remove redundant qualifiers (#3990)

lisa.walter · lisa.walter · commit 4614f1213942 · 2025-03-28T11:04:42.000+01:00
diff --git a/analysis/analysers/tools/Inquirer/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InputValidator.kt b/analysis/analysers/tools/Inquirer/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InputValidator.kt
@@ -12,22 +12,22 @@ class InputValidator {
         }
 
         fun isFileOrFolderValid(
-            inputType: de.maibornwolff.codecharta.analysers.tools.inquirer.InputType,
+            inputType: InputType,
             fileExtensionList: List<FileExtension>
         ): (String) -> Boolean = { input ->
             val objectToVerify = File(input)
             objectToVerify.exists() && when (inputType) {
-                de.maibornwolff.codecharta.analysers.tools.inquirer.InputType.FOLDER -> {
+                InputType.FOLDER -> {
                     objectToVerify.isDirectory
                 }
-                de.maibornwolff.codecharta.analysers.tools.inquirer.InputType.FILE -> {
-                    de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.Companion.verifyFile(
+                InputType.FILE -> {
+                    verifyFile(
                         objectToVerify,
                         fileExtensionList
                     )
                 }
                 else -> {
-                    objectToVerify.isDirectory || de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.Companion.verifyFile(
+                    objectToVerify.isDirectory || verifyFile(
                         objectToVerify,
                         fileExtensionList
                     )
diff --git a/analysis/analysers/tools/Inquirer/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/Inquirer.kt b/analysis/analysers/tools/Inquirer/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/Inquirer.kt
@@ -240,7 +240,7 @@ fun Session.myPromptDefaultFileFolderInput(
         hint = currentWorkingDirectory,
         allowEmptyInput = false,
         invalidInputMessage = "Please input a valid ${inputType.inputType}",
-        inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isFileOrFolderValid(
+        inputValidator = InputValidator.isFileOrFolderValid(
             inputType,
             fileExtensionList
         ),
diff --git a/analysis/analysers/tools/Inquirer/src/test/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InputValidatorTest.kt b/analysis/analysers/tools/Inquirer/src/test/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InputValidatorTest.kt
@@ -49,7 +49,7 @@ class InputValidatorTest {
     @MethodSource("provideValidationExpectations")
     fun `should return expected output`(filePath: String, validFileExtensions: List<String>, expectedValidation: Boolean) {
         assertThat(
-            de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isInputAnExistingFile(
+            InputValidator.isInputAnExistingFile(
                 *validFileExtensions.toTypedArray()
             )(filePath)
         ).isEqualTo(expectedValidation)
diff --git a/analysis/analysers/tools/Inquirer/src/test/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InquirerTest.kt b/analysis/analysers/tools/Inquirer/src/test/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InquirerTest.kt
@@ -231,7 +231,7 @@ class InquirerTest {
                 myPromptInputNumber(
                     testMessage,
                     invalidInputMessage = testInvalidInputMessage,
-                    inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isNumberGreaterThen(
+                    inputValidator = InputValidator.isNumberGreaterThen(
                         2
                     ),
                     onInputReady = {
@@ -277,7 +277,7 @@ class InquirerTest {
                 myPromptInputNumber(
                     testMessage,
                     allowEmptyInput = true,
-                    inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isNumberGreaterThen(
+                    inputValidator = InputValidator.isNumberGreaterThen(
                         2
                     ),
                     onInputReady = {
diff --git a/analysis/analysers/tools/ccsh/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/ccsh/parser/InteractiveDialog.kt b/analysis/analysers/tools/ccsh/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/ccsh/parser/InteractiveDialog.kt
@@ -61,7 +61,7 @@ class InteractiveDialog {
             return session.myPromptInput(
                 message = "What is the folder path containing all cc.json files?",
                 hint = Paths.get("").toAbsolutePath().toString(),
-                inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isFileOrFolderValid(
+                inputValidator = InputValidator.isFileOrFolderValid(
                     InputType.FOLDER,
                     listOf()
                 ),
diff --git a/analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ParserDialog.kt b/analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ParserDialog.kt
@@ -55,7 +55,7 @@ class ParserDialog {
                     message = "Select Levenshtein Distance for name match suggestions (0 for no suggestions)",
                     hint = "3",
                     invalidInputMessage = "Specify a number greater or equal to 0",
-                    inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isNumberGreaterThen(-1),
+                    inputValidator = InputValidator.isNumberGreaterThen(-1),
                     onInputReady = testCallback()
                 ).toInt()
             } else {
diff --git a/analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/GitLogParser.kt b/analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/GitLogParser.kt
@@ -172,6 +172,6 @@ class GitLogParser(
     }
 
     override fun getAttributeDescriptorMaps(): Map<String, AttributeDescriptor> {
-        return de.maibornwolff.codecharta.parser.gitlogparser.getAttributeDescriptors()
+        return getAttributeDescriptors()
     }
 }
diff --git a/analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/subcommands/LogScanParserDialog.kt b/analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/subcommands/LogScanParserDialog.kt
@@ -14,7 +14,7 @@ class LogScanParserDialog {
                 message = "What is the git.log file that has to be parsed?",
                 hint = "git.log",
                 allowEmptyInput = false,
-                inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isInputAnExistingFile(),
+                inputValidator = InputValidator.isInputAnExistingFile(),
                 onInputReady = testCallback()
             )
 
@@ -23,7 +23,7 @@ class LogScanParserDialog {
                 message = "What is the path to the file name list?",
                 hint = "file-name-list.txt",
                 allowEmptyInput = false,
-                inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isInputAnExistingFile(),
+                inputValidator = InputValidator.isInputAnExistingFile(),
                 onInputReady = testCallback()
             )
 
diff --git a/analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/subcommands/RepoScanParserDialog.kt b/analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/subcommands/RepoScanParserDialog.kt
@@ -15,7 +15,7 @@ class RepoScanParserDialog {
                 message = "What is the root directory of the git project you want to parse?",
                 hint = Paths.get("").normalize().toAbsolutePath().toString(),
                 allowEmptyInput = false,
-                inputValidator = de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.isFileOrFolderValid(
+                inputValidator = InputValidator.isFileOrFolderValid(
                     InputType.FOLDER,
                     listOf()
                 ),
diff --git a/analysis/parser/RawTextParser/src/main/kotlin/de/maibornwolff/codecharta/parser/rawtextparser/RawTextParser.kt b/analysis/parser/RawTextParser/src/main/kotlin/de/maibornwolff/codecharta/parser/rawtextparser/RawTextParser.kt
@@ -106,7 +106,7 @@ class RawTextParser(
             throw IllegalArgumentException("Input invalid file for RawTextParser, stopping execution...")
         }
 
-        if (!withoutDefaultExcludes) exclude += Companion.DEFAULT_EXCLUDES
+        if (!withoutDefaultExcludes) exclude += DEFAULT_EXCLUDES
 
         val projectMetrics: ProjectMetrics =
             ProjectMetricsCollector(
diff --git a/analysis/parser/SVNLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/svnlogparser/SVNLogParser.kt b/analysis/parser/SVNLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/svnlogparser/SVNLogParser.kt
@@ -165,6 +165,6 @@ class SVNLogParser(
     }
 
     override fun getAttributeDescriptorMaps(): Map<String, AttributeDescriptor> {
-        return de.maibornwolff.codecharta.parser.svnlogparser.getAttributeDescriptors()
+        return getAttributeDescriptors()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,22 +12,22 @@ class InputValidator {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`fun isFileOrFolderValid(`
`15`		`- inputType: de.maibornwolff.codecharta.analysers.tools.inquirer.InputType,`
	`15`	`+ inputType: InputType,`
`16`	`16`	`fileExtensionList: List<FileExtension>`
`17`	`17`	`): (String) -> Boolean = { input ->`
`18`	`18`	`val objectToVerify = File(input)`
`19`	`19`	`objectToVerify.exists() && when (inputType) {`
`20`		`- de.maibornwolff.codecharta.analysers.tools.inquirer.InputType.FOLDER -> {`
	`20`	`+ InputType.FOLDER -> {`
`21`	`21`	`objectToVerify.isDirectory`
`22`	`22`	`}`
`23`		`- de.maibornwolff.codecharta.analysers.tools.inquirer.InputType.FILE -> {`
`24`		`- de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.Companion.verifyFile(`
	`23`	`+ InputType.FILE -> {`
	`24`	`+ verifyFile(`
`25`	`25`	`objectToVerify,`
`26`	`26`	`fileExtensionList`
`27`	`27`	`)`
`28`	`28`	`}`
`29`	`29`	`else -> {`
`30`		`- objectToVerify.isDirectory \|\| de.maibornwolff.codecharta.analysers.tools.inquirer.InputValidator.Companion.verifyFile(`
	`30`	`+ objectToVerify.isDirectory \|\| verifyFile(`
`31`	`31`	`objectToVerify,`
`32`	`32`	`fileExtensionList`
`33`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,6 @@ class GitLogParser(`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`override fun getAttributeDescriptorMaps(): Map<String, AttributeDescriptor> {`
`175`		`- return de.maibornwolff.codecharta.parser.gitlogparser.getAttributeDescriptors()`
	`175`	`+ return getAttributeDescriptors()`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class RawTextParser(`
`106`	`106`	`throw IllegalArgumentException("Input invalid file for RawTextParser, stopping execution...")`
`107`	`107`	`}`
`108`	`108`
`109`		`- if (!withoutDefaultExcludes) exclude += Companion.DEFAULT_EXCLUDES`
	`109`	`+ if (!withoutDefaultExcludes) exclude += DEFAULT_EXCLUDES`
`110`	`110`
`111`	`111`	`val projectMetrics: ProjectMetrics =`
`112`	`112`	`ProjectMetricsCollector(`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,6 @@ class SVNLogParser(`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`override fun getAttributeDescriptorMaps(): Map<String, AttributeDescriptor> {`
`168`		`- return de.maibornwolff.codecharta.parser.svnlogparser.getAttributeDescriptors()`
	`168`	`+ return getAttributeDescriptors()`
`169`	`169`	`}`
`170`	`170`	`}`