review notes

saveourtool · Nov 22, 2023 · 6211a81 · 6211a81
1 parent 1a86bb5
commit 6211a81
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/diktat-maven-plugin/src/main/kotlin/com/saveourtool/diktat/plugin/maven/DiktatBaseMojo.kt b/diktat-maven-plugin/src/main/kotlin/com/saveourtool/diktat/plugin/maven/DiktatBaseMojo.kt
@@ -95,10 +95,7 @@ abstract class DiktatBaseMojo : AbstractMojo() {
      * @throws MojoExecutionException if an exception in __KtLint__ has been thrown
      */
     override fun execute() {
-        val configFile = resolveConfig()
-        if (!configFile.isRegularFile()) {
-            throw MojoExecutionException("Configuration file $diktatConfigFile doesn't exist")
-        }
+        val configFile = resolveConfig() ?: throw MojoExecutionException("Configuration file $diktatConfigFile doesn't exist")
         log.info("Running diKTat plugin with configuration file $configFile and inputs $inputs" +
                 if (excludes.isNotEmpty()) " and excluding $excludes" else ""
         )
@@ -149,19 +146,17 @@ abstract class DiktatBaseMojo : AbstractMojo() {
      * If [diktatConfigFile] is absolute, it's path is used. If [diktatConfigFile] is relative, this method looks for it in all maven parent projects.
      * This way config file can be placed in parent module directory and used in all child modules too.
      *
-     * @return a configuration file. File by this path might not exist.
+     * @return a configuration file. File by this path exists.
      */
-    private fun resolveConfig(): Path {
+    private fun resolveConfig(): Path? {
         val file = Paths.get(diktatConfigFile)
         if (file.isAbsolute) {
             return file
         }
 
         return generateSequence(mavenProject) { it.parent }
             .map { it.basedir.toPath().resolve(diktatConfigFile) }
-            .run {
-                firstOrNull { it.isRegularFile() } ?: file
-            }
+            .firstOrNull { it.isRegularFile() }
     }
 
     private fun files(): List<Path> {
@@ -182,8 +177,9 @@ abstract class DiktatBaseMojo : AbstractMojo() {
         excludedFiles: List<File>,
     ): Sequence<File> = walk()
         .filter { file ->
-            file.isDirectory || file.toPath().isKotlinCodeOrScript()
+            file.isFile && file.toPath().isKotlinCodeOrScript()
+        }
+        .filterNot { file ->
+            file in excludedFiles || excludedDirs.any { file.startsWith(it) }
         }
-        .filter { it.isFile }
-        .filterNot { file -> file in excludedFiles || excludedDirs.any { file.startsWith(it) } }
 }