From e7ff1937ff9b15e77d70da5044031dfac1b9b7cd Mon Sep 17 00:00:00 2001 From: tim Date: Thu, 16 Sep 2021 20:53:57 +0300 Subject: [PATCH 1/2] resolve #145 - correct definition of prop inputPaths use sonar.sources --- .../detekt/sonar/sensor/DetektConfiguration.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt b/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt index 2e591b0..f03a3cc 100644 --- a/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt +++ b/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt @@ -13,6 +13,8 @@ import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths +const val PATH_INPUT_DIRS_KEY = "sonar.sources" + internal fun createSpec(context: SensorContext): ProcessingSpec { val baseDir = context.fileSystem().baseDir().toPath() val settings = context.config() @@ -26,7 +28,7 @@ internal fun createSpec(baseDir: Path, configuration: Configuration): Processing return ProcessingSpec { project { basePath = baseDir - inputPaths = listOf(baseDir) + inputPaths = getInputPaths(configuration, baseDir) excludes = getProjectExcludeFilters(configuration) } rules { @@ -44,6 +46,11 @@ internal fun createSpec(baseDir: Path, configuration: Configuration): Processing } } +internal fun getInputPaths(configuration: Configuration, basePath: Path): List = + configuration.get(PATH_INPUT_DIRS_KEY).map { sources -> + sources.split(",").map { Path.of(it.trim()) } + }.orElse(listOf(basePath)) + internal fun getProjectExcludeFilters(configuration: Configuration): List = configuration.get(PATH_FILTERS_KEY) .orElse(PATH_FILTERS_DEFAULTS) From 35327b1b07dbaa0d217d0dcf1f9c8560859fa061 Mon Sep 17 00:00:00 2001 From: tim Date: Wed, 22 Sep 2021 14:34:17 +0300 Subject: [PATCH 2/2] fix path for java8 --- .../arturbosch/detekt/sonar/sensor/DetektConfiguration.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt b/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt index f03a3cc..4129531 100644 --- a/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt +++ b/src/main/kotlin/io/gitlab/arturbosch/detekt/sonar/sensor/DetektConfiguration.kt @@ -9,6 +9,7 @@ import io.gitlab.arturbosch.detekt.sonar.foundation.PATH_FILTERS_KEY import io.gitlab.arturbosch.detekt.sonar.foundation.logger import org.sonar.api.batch.sensor.SensorContext import org.sonar.api.config.Configuration +import java.io.File import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -48,7 +49,7 @@ internal fun createSpec(baseDir: Path, configuration: Configuration): Processing internal fun getInputPaths(configuration: Configuration, basePath: Path): List = configuration.get(PATH_INPUT_DIRS_KEY).map { sources -> - sources.split(",").map { Path.of(it.trim()) } + sources.split(",").map { File(it.trim()).toPath() } }.orElse(listOf(basePath)) internal fun getProjectExcludeFilters(configuration: Configuration): List =