reverted changes

saveourtool · Nov 16, 2023 · 02d687b · 02d687b
1 parent 9f49b39
commit 02d687b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/...adle-plugin/src/main/kotlin/com/saveourtool/diktat/plugin/gradle/tasks/DiktatCheckTask.kt b/...adle-plugin/src/main/kotlin/com/saveourtool/diktat/plugin/gradle/tasks/DiktatCheckTask.kt
@@ -30,11 +30,11 @@ abstract class DiktatCheckTask @Inject constructor(
          */
         fun Project.registerDiktatCheckTask(
             diktatExtension: DiktatExtension,
-            patternSet: PatternSet,
+            patternSet: PatternSet
         ): TaskProvider<DiktatCheckTask> =
             tasks.register(
                 DiktatGradlePlugin.DIKTAT_CHECK_TASK, DiktatCheckTask::class.java,
-                diktatExtension, patternSet,
+                diktatExtension, patternSet
             )
     }
 }
diff --git a/...gradle-plugin/src/main/kotlin/com/saveourtool/diktat/plugin/gradle/tasks/DiktatFixTask.kt b/...gradle-plugin/src/main/kotlin/com/saveourtool/diktat/plugin/gradle/tasks/DiktatFixTask.kt
@@ -15,7 +15,7 @@ import javax.inject.Inject
  */
 abstract class DiktatFixTask @Inject constructor(
     extension: DiktatExtension,
-    inputs: PatternFilterable,
+    inputs: PatternFilterable
 ) : DiktatTaskBase(extension, inputs) {
     override fun doRun(
         runner: DiktatRunner,
@@ -32,11 +32,11 @@ abstract class DiktatFixTask @Inject constructor(
          */
         fun Project.registerDiktatFixTask(
             diktatExtension: DiktatExtension,
-            patternSet: PatternSet,
+            patternSet: PatternSet
         ): TaskProvider<DiktatFixTask> =
             tasks.register(
                 DiktatGradlePlugin.DIKTAT_FIX_TASK, DiktatFixTask::class.java,
-                diktatExtension, patternSet,
+                diktatExtension, patternSet
             )
     }
 }
diff --git a/...dle-plugin/src/test/kotlin/com/saveourtool/diktat/plugin/gradle/DiktatJavaExecTaskTest.kt b/...dle-plugin/src/test/kotlin/com/saveourtool/diktat/plugin/gradle/DiktatJavaExecTaskTest.kt
@@ -7,7 +7,6 @@ import com.saveourtool.diktat.util.DiktatProcessorListenerWrapper.Companion.unwr
 import com.pinterest.ktlint.cli.reporter.json.JsonReporter
 import com.pinterest.ktlint.cli.reporter.plain.PlainReporter
 import com.pinterest.ktlint.cli.reporter.sarif.SarifReporter
-import org.gradle.api.Action
 
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder

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
@@ -120,18 +120,18 @@ abstract class DiktatBaseMojo : AbstractMojo() {
         )
 
         val sourceRootDir = mavenProject.basedir.parentFile.toPath()
-        val reporterArgsList = buildList {
-            val reporterId = getReporterType()
-            add(
-                DiktatReporterCreationArguments(id = getReporterType(), outputStream = getReporterOutput(), sourceRootDir = sourceRootDir.takeIf { reporterId == "sarif" })
-            )
-        }
+        val reporterId = getReporterType()
+        val reporterArgs = DiktatReporterCreationArguments(
+            id = reporterId,
+            outputStream = getReporterOutput(),
+            sourceRootDir = sourceRootDir.takeIf { reporterId == "sarif" },
+        )
         val args = DiktatRunnerArguments(
             configInputStream = configFile.inputStream(),
             sourceRootDir = sourceRootDir,
             files = inputs.map(::Path),
             baselineFile = baseline?.toPath(),
-            reporterArgsList = reporterArgsList,
+            reporterArgsList = listOf(reporterArgs),
         )
         val diktatRunner = diktatRunnerFactory(args)
         val errorCounter = runAction(