Diktat CLI runner

diktat-common/build.gradle.kts

@@ -12,8 +12,6 @@ dependencies {
     api(libs.kaml)
     implementation(libs.apache.commons.cli)
     implementation(libs.kotlin.logging)
-    // ktlint-core is needed only for `initKtLintKLogger` method
-    implementation(libs.ktlint.core)
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.assertj.core)
 }

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/reader/ApplicationProperties.kt

@@ -1,6 +1,5 @@
 package org.cqfn.diktat.common.config.reader
 
-import org.cqfn.diktat.common.utils.loggerWithKtlintConfig
 import mu.KotlinLogging
 
 import java.io.IOException
@@ -36,7 +35,7 @@ open class ApplicationProperties(propertiesFileName: String) {
     }
 
     companion object {
-        private val log = KotlinLogging.loggerWithKtlintConfig(ApplicationProperties::class)
+        private val log = KotlinLogging.logger {}
         private const val EXIT_STATUS_MISSING_PROPERTIES = 4
     }
 }

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/reader/JsonResourceConfigReader.kt

@@ -1,6 +1,5 @@
 package org.cqfn.diktat.common.config.reader
 
-import org.cqfn.diktat.common.utils.loggerWithKtlintConfig
 import mu.KotlinLogging
 
 import java.io.BufferedReader
@@ -57,6 +56,6 @@ abstract class JsonResourceConfigReader<T> {
     protected abstract fun parseResource(fileStream: BufferedReader): T
 
     companion object {
-        private val log = KotlinLogging.loggerWithKtlintConfig(JsonResourceConfigReader::class)
+        private val log = KotlinLogging.logger { }
     }
 }

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt

@@ -6,7 +6,6 @@ package org.cqfn.diktat.common.config.rules
 
 import org.cqfn.diktat.common.config.reader.JsonResourceConfigReader
 import org.cqfn.diktat.common.config.rules.RulesConfigReader.Companion.log
-import org.cqfn.diktat.common.utils.loggerWithKtlintConfig
 
 import com.charleskorn.kaml.Yaml
 import com.charleskorn.kaml.YamlConfiguration
@@ -106,7 +105,7 @@ open class RulesConfigReader(override val classLoader: ClassLoader) : JsonResour
     }
 
     companion object {
-        internal val log: KLogger = KotlinLogging.loggerWithKtlintConfig(RulesConfigReader::class)
+        internal val log: KLogger = KotlinLogging.logger { }
     }
 }
 

diktat-gradle-plugin/build.gradle.kts

@@ -13,13 +13,8 @@ plugins {
 
 dependencies {
     implementation(kotlin("gradle-plugin-api"))
+    implementation(projects.diktatRules)
     implementation(projects.diktatRunner.diktatRunnerKtlintEngine)
-    implementation(libs.ktlint.core)
-    implementation(libs.ktlint.reporter.plain)
-    implementation(libs.ktlint.reporter.sarif)
-    implementation(libs.ktlint.reporter.json)
-    implementation(libs.ktlint.reporter.html)
-    implementation(libs.ktlint.reporter.baseline)
     // merge sarif reports
     implementation(libs.sarif4k.jvm)
     implementation(libs.kotlinx.serialization.json)

diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/tasks/DiktatCheckTask.kt

@@ -1,12 +1,14 @@
 package org.cqfn.diktat.plugin.gradle.tasks
 
-import org.cqfn.diktat.DiktatProcessCommand
+import org.cqfn.diktat.DiktatProcessor
+import org.cqfn.diktat.api.DiktatProcessorListener
 import org.cqfn.diktat.plugin.gradle.DiktatExtension
 import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.util.PatternFilterable
 import org.gradle.api.tasks.util.PatternSet
+import java.nio.file.Path
 import javax.inject.Inject
 
 /**
@@ -16,8 +18,13 @@ abstract class DiktatCheckTask @Inject constructor(
     extension: DiktatExtension,
     inputs: PatternFilterable
 ) : DiktatTaskBase(extension, inputs) {
-    override fun doRun(diktatCommand: DiktatProcessCommand, formattedContentConsumer: (String) -> Unit) {
-        diktatCommand.check()
+    override fun doRun(
+        diktatProcessor: DiktatProcessor,
+        listener: DiktatProcessorListener,
+        files: Sequence<Path>,
+        formattedContentConsumer: (Path, String) -> Unit
+    ) {
+        diktatProcessor.checkAll(listener, files)
     }
 
     companion object {

diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/tasks/DiktatFixTask.kt

@@ -1,12 +1,14 @@
 package org.cqfn.diktat.plugin.gradle.tasks
 
-import org.cqfn.diktat.DiktatProcessCommand
+import org.cqfn.diktat.DiktatProcessor
+import org.cqfn.diktat.api.DiktatProcessorListener
 import org.cqfn.diktat.plugin.gradle.DiktatExtension
 import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.util.PatternFilterable
 import org.gradle.api.tasks.util.PatternSet
+import java.nio.file.Path
 import javax.inject.Inject
 
 /**
@@ -16,9 +18,12 @@ abstract class DiktatFixTask @Inject constructor(
     extension: DiktatExtension,
     inputs: PatternFilterable
 ) : DiktatTaskBase(extension, inputs) {
-    override fun doRun(diktatCommand: DiktatProcessCommand, formattedContentConsumer: (String) -> Unit) {
-        val formattedText = diktatCommand.fix()
-        formattedContentConsumer(formattedText)
+    override fun doRun(
+        diktatProcessor: DiktatProcessor,
+        listener: DiktatProcessorListener,
+        files: Sequence<Path>, formattedContentConsumer: (Path, String) -> Unit
+    ) {
+        diktatProcessor.fixAll(listener, files, formattedContentConsumer)
     }
 
     companion object {