style: Add empty lines after multi-line blocks for readability

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Jun 27, 2024 · fabe6c8 · fabe6c8
1 parent f9e7f72
commit fabe6c8
Show file tree

Hide file tree

Showing 78 changed files with 189 additions and 0 deletions.
diff --git a/analyzer/src/main/kotlin/Analyzer.kt b/analyzer/src/main/kotlin/Analyzer.kt
@@ -247,6 +247,7 @@ private class AnalyzerState {
                 result.dependencyGraph?.let {
                     builder.addDependencyGraph(manager.managerName, it).addPackages(result.sharedPackages)
                 }
+
                 _finishedPackageManagersState.value = (_finishedPackageManagersState.value + manager.managerName)
                     .toSortedSet(String.CASE_INSENSITIVE_ORDER)
             }

diff --git a/analyzer/src/main/kotlin/AnalyzerResultBuilder.kt b/analyzer/src/main/kotlin/AnalyzerResultBuilder.kt
@@ -62,6 +62,7 @@ class AnalyzerResultBuilder {
                 val existingDefinitionFileUrl = existingProject.let {
                     "${it.vcsProcessed.url}/${it.definitionFilePath}"
                 }
+
                 val incomingDefinitionFileUrl = projectAnalyzerResult.project.let {
                     "${it.vcsProcessed.url}/${it.definitionFilePath}"
                 }

diff --git a/analyzer/src/testFixtures/kotlin/TestUtils.kt b/analyzer/src/testFixtures/kotlin/TestUtils.kt
@@ -67,6 +67,7 @@ fun PackageManager.collateMultipleProjects(vararg definitionFiles: File): Analyz
     managerResult.dependencyGraph?.let {
         builder.addDependencyGraph(managerName, it).addPackages(managerResult.sharedPackages)
     }
+
     definitionFiles.forAll { definitionFile ->
         managerResult.projectResults[definitionFile] shouldNotBeNull {
             this shouldHaveAtLeastSize 1

diff --git a/clients/fossid-webapp/src/main/kotlin/FossIdRestService.kt b/clients/fossid-webapp/src/main/kotlin/FossIdRestService.kt
@@ -97,13 +97,15 @@ interface FossIdRestService {
                 requireNotNull(boundType) {
                     "The PolymorphicListDeserializer needs a type to deserialize values!"
                 }
+
                 return when (p.currentToken) {
                     JsonToken.VALUE_FALSE -> PolymorphicList()
                     JsonToken.START_ARRAY -> {
                         val arrayType = JSON_MAPPER.typeFactory.constructArrayType(boundType)
                         val array = JSON_MAPPER.readValue<Array<Any>>(p, arrayType)
                         PolymorphicList(array.toList())
                     }
+
                     JsonToken.START_OBJECT -> {
                         val mapType = JSON_MAPPER.typeFactory.constructMapType(
                             LinkedHashMap::class.java,
@@ -116,6 +118,7 @@ interface FossIdRestService {
                         // present in the elements themselves, we don't lose any information by discarding the keys.
                         PolymorphicList(map.values.toList())
                     }
+
                     else -> error("FossID returned a type not handled by this deserializer!")
                 }
             }
@@ -147,15 +150,18 @@ interface FossIdRestService {
                         val value = JSON_MAPPER.readValue(p, String::class.java)
                         PolymorphicInt(value.toInt())
                     }
+
                     JsonToken.VALUE_NUMBER_INT -> {
                         val value = JSON_MAPPER.readValue(p, Int::class.java)
                         PolymorphicInt(value)
                     }
+
                     JsonToken.START_ARRAY -> {
                         val array = JSON_MAPPER.readValue(p, IntArray::class.java)
                         val value = if (array.isEmpty()) null else array.first()
                         PolymorphicInt(value)
                     }
+
                     JsonToken.START_OBJECT -> {
                         val mapType = JSON_MAPPER.typeFactory.constructMapType(
                             LinkedHashMap::class.java,
@@ -166,8 +172,10 @@ interface FossIdRestService {
                         if (map.size != 1) {
                             error("A map representing a polymorphic integer should have one value!")
                         }
+
                         PolymorphicInt(map.values.first().toString().toInt())
                     }
+
                     else -> error("FossID returned a type not handled by this deserializer!")
                 }
             }

diff --git a/clients/scanoss/src/test/kotlin/ScanOssDetailsTest.kt b/clients/scanoss/src/test/kotlin/ScanOssDetailsTest.kt
@@ -81,14 +81,17 @@ class ScanOssDetailsTest : StringSpec({
                 copyrights.first() shouldNotBeNull {
                     source shouldBe Source.FILE_HEADER
                 }
+
                 vulnerabilities shouldHaveSize 1
                 vulnerabilities.first() shouldNotBeNull {
                     id shouldBe "GHSA-27p5-7cw6-m45h"
                 }
+
                 quality shouldHaveSize 1
                 quality.first() shouldNotBeNull {
                     score shouldBe "2/5"
                 }
+
                 cryptography should beEmpty()
             }
         }

diff --git a/detekt-rules/src/main/kotlin/OrtImportOrder.kt b/detekt-rules/src/main/kotlin/OrtImportOrder.kt
@@ -104,6 +104,7 @@ class OrtImportOrder(config: Config) : Rule(config) {
             pathsWithBlankLines += it.value
             pathsWithBlankLines += ""
         }
+
         pathsWithBlankLines.removeLast()
 
         return pathsWithBlankLines

diff --git a/downloader/src/main/kotlin/Downloader.kt b/downloader/src/main/kotlin/Downloader.kt
@@ -291,6 +291,7 @@ class Downloader(private val config: DownloaderConfiguration) {
                 throw e
             }
         }
+
         val resolvedRevision = workingTree.getRevision()
 
         logger.info {

diff --git a/downloader/src/main/kotlin/VersionControlSystem.kt b/downloader/src/main/kotlin/VersionControlSystem.kt
@@ -86,6 +86,7 @@ abstract class VersionControlSystem(
                             it.isAvailable() && it.isApplicableUrl(vcsUrl)
                         }
                     }
+
                     else -> forType(type)
                 }.also {
                     urlToVcsMap[vcsUrl] = it

diff --git a/downloader/src/main/kotlin/WorkingTreeCache.kt b/downloader/src/main/kotlin/WorkingTreeCache.kt
@@ -92,6 +92,7 @@ class DefaultWorkingTreeCache : WorkingTreeCache {
                     workingTrees[key]?.getRootPath()?.safeDeleteRecursively(force = true)
                 }
             }
+
             workingTrees.clear()
             workingTreeMutexes.clear()
         }

diff --git a/evaluator/src/test/kotlin/EvaluatorTest.kt b/evaluator/src/test/kotlin/EvaluatorTest.kt
@@ -146,6 +146,7 @@ class EvaluatorTest : WordSpec({
                     }
                 }
             }
+
             val script = javaClass.getResource("/rules/osadl.rules.kts").readText()
 
             val result = Evaluator(compatibleOrtResult).run(script)
@@ -179,6 +180,7 @@ class EvaluatorTest : WordSpec({
                     }
                 }
             }
+
             val script = javaClass.getResource("/rules/osadl.rules.kts").readText()
 
             val result = Evaluator(incompatibleOrtResult).run(script)
@@ -212,6 +214,7 @@ class EvaluatorTest : WordSpec({
                     }
                 }
             }
+
             val script = javaClass.getResource("/rules/osadl.rules.kts").readText()
 
             val result = Evaluator(incompatibleOrtResult).run(script)

diff --git a/evaluator/src/test/kotlin/ProjectSourceRuleTest.kt b/evaluator/src/test/kotlin/ProjectSourceRuleTest.kt
@@ -50,6 +50,7 @@ class ProjectSourceRuleTest : WordSpec({
                     "module/docs/LICENSE.txt"
                 )
             }
+
             val rule = createRule(dir)
 
             with(rule) {
@@ -64,6 +65,7 @@ class ProjectSourceRuleTest : WordSpec({
             val dir = tempdir().apply {
                 addDirs("README.md")
             }
+
             val rule = createRule(dir)
 
             rule.projectSourceHasFile("README.md").matches() shouldBe false
@@ -82,6 +84,7 @@ class ProjectSourceRuleTest : WordSpec({
             val dir = tempdir().apply {
                 addDirs("a/b/c")
             }
+
             val rule = createRule(dir)
 
             with(rule) {
@@ -96,6 +99,7 @@ class ProjectSourceRuleTest : WordSpec({
             val dir = tempdir().apply {
                 addFiles("a")
             }
+
             val rule = createRule(dir)
 
             rule.projectSourceHasDirectory("a").matches() shouldBe false
@@ -105,6 +109,7 @@ class ProjectSourceRuleTest : WordSpec({
             val dir = tempdir().apply {
                 addDirs("b")
             }
+
             val rule = createRule(dir)
 
             rule.projectSourceHasDirectory("a").matches() shouldBe false
@@ -123,6 +128,7 @@ class ProjectSourceRuleTest : WordSpec({
                     """.trimIndent()
                 )
             }
+
             val rule = createRule(dir)
 
             rule.projectSourceHasFileWithContent(".*^#{1,2} License$.*", "README.md").matches() shouldBe true

diff --git a/evaluator/src/test/kotlin/RuleSetTest.kt b/evaluator/src/test/kotlin/RuleSetTest.kt
@@ -171,6 +171,7 @@ class RuleSetTest : WordSpec({
                         every { ref.id } answers { node.id.copy(name = node.id.name + "-ref") }
                         ref
                     }
+
                     spyNode
                 }
             }

diff --git a/helper-cli/src/main/kotlin/commands/ListLicenseCategoriesCommand.kt b/helper-cli/src/main/kotlin/commands/ListLicenseCategoriesCommand.kt
@@ -77,6 +77,7 @@ internal class ListLicenseCategoriesCommand : CliktCommand(
                 licenses.sortedBy { it.id.toString() }.forEach { license ->
                     appendLine("  ${license.description(category)}")
                 }
+
                 appendLine()
             }
         }

diff --git a/helper-cli/src/main/kotlin/commands/ListLicensesCommand.kt b/helper-cli/src/main/kotlin/commands/ListLicensesCommand.kt
@@ -310,5 +310,6 @@ private fun Provenance.writeValueAsString(): String =
         is RepositoryProvenance -> {
             "type=${vcsInfo.type}, url=${vcsInfo.url}, path=${vcsInfo.path}, revision=$resolvedRevision"
         }
+
         else -> throw IllegalArgumentException("Provenance must have either a non-null source artifact or VCS info.")
     }
diff --git a/helper-cli/src/main/kotlin/commands/ListPackagesCommand.kt b/helper-cli/src/main/kotlin/commands/ListPackagesCommand.kt
@@ -99,6 +99,7 @@ internal class ListPackagesCommand : CliktCommand(
                 appendLine(it.toCoordinates())
             }
         }
+
         print(result)
     }
 }
diff --git a/helper-cli/src/main/kotlin/commands/repoconfig/GenerateProjectExcludesCommand.kt b/helper-cli/src/main/kotlin/commands/repoconfig/GenerateProjectExcludesCommand.kt
@@ -76,6 +76,7 @@ internal class GenerateProjectExcludesCommand : CliktCommand(
                     comment = "TODO"
                 )
             }
+
         val existingPathExcludes = repositoryConfiguration.excludes.paths
         val pathExcludes = (existingPathExcludes + generatedPathExcludes).distinctBy { it.pattern }
 

diff --git a/helper-cli/src/main/kotlin/commands/repoconfig/ImportLicenseFindingCurationsCommand.kt b/helper-cli/src/main/kotlin/commands/repoconfig/ImportLicenseFindingCurationsCommand.kt
@@ -93,6 +93,7 @@ internal class ImportLicenseFindingCurationsCommand : CliktCommand(
         } else {
             RepositoryConfiguration()
         }
+
         val vcsUrlMapping = vcsUrlMappingFile?.readValue<VcsUrlMapping>().orEmpty()
 
         val allLicenseFindings = ortResult.getLicenseFindingsForAllProjects()

diff --git a/helper-cli/src/main/kotlin/commands/repoconfig/RemoveEntriesCommand.kt b/helper-cli/src/main/kotlin/commands/repoconfig/RemoveEntriesCommand.kt
@@ -112,6 +112,7 @@ internal class RemoveEntriesCommand : CliktCommand(
         val notGloballyResolvedIssues = ortResult.getIssues().values.flatten().filterNot {
             resolutionProvider.isResolved(it)
         }
+
         val issueResolutions = ortResult.getRepositoryConfigResolutions().issues.filter { resolution ->
             notGloballyResolvedIssues.any { resolution.matches(it) }
         }

diff --git a/model/src/main/kotlin/OrtResult.kt b/model/src/main/kotlin/OrtResult.kt
@@ -262,6 +262,7 @@ data class OrtResult(
                 append(vcsPath)
                 append("/")
             }
+
             append(path)
         }
     }

diff --git a/model/src/main/kotlin/PackageReference.kt b/model/src/main/kotlin/PackageReference.kt
@@ -116,6 +116,7 @@ data class PackageReference(
         val transformedDependencies = dependencies.mapTo(mutableSetOf()) {
             it.traverse(transform)
         }
+
         return transform(copy(dependencies = transformedDependencies))
     }
 

diff --git a/model/src/main/kotlin/Provenance.kt b/model/src/main/kotlin/Provenance.kt
@@ -92,12 +92,14 @@ private class ProvenanceDeserializer : StdDeserializer<Provenance>(Provenance::c
                 val sourceArtifact = jsonMapper.treeToValue<RemoteArtifact>(node["source_artifact"])
                 ArtifactProvenance(sourceArtifact)
             }
+
             node.has("vcs_info") -> {
                 val vcsInfo = jsonMapper.treeToValue<VcsInfo>(node["vcs_info"])
                 // For backward compatibility, if there is no resolved_revision use the revision from vcsInfo.
                 val resolvedRevision = node["resolved_revision"]?.textValue() ?: vcsInfo.revision
                 RepositoryProvenance(vcsInfo, resolvedRevision)
             }
+
             else -> UnknownProvenance
         }
     }

diff --git a/model/src/main/kotlin/licenses/LicenseInfoResolver.kt b/model/src/main/kotlin/licenses/LicenseInfoResolver.kt
@@ -170,9 +170,11 @@ class LicenseInfoResolver(
             val (copyrightGarbage, copyrightFindings) = finding.copyrights.partition { copyrightFinding ->
                 copyrightFinding.statement in copyrightGarbage
             }
+
             copyrightGarbageFindings[finding.provenance] = copyrightGarbage.toSet()
             finding.copy(copyrights = copyrightFindings.toSet())
         }
+
         return DetectedLicenseInfo(filteredFindings)
     }
 

diff --git a/model/src/main/kotlin/utils/SortedCollectionConverters.kt b/model/src/main/kotlin/utils/SortedCollectionConverters.kt
@@ -112,9 +112,11 @@ private fun Provenance.getSortKey(): String =
                 this += vcsInfo.type.toString()
                 this += vcsInfo.url
             }
+
             is ArtifactProvenance -> {
                 this += sourceArtifact.url
             }
+
             else -> {
                 // Do not add anything, because unknown provenance does not have any properties.
             }

diff --git a/model/src/test/kotlin/DependencyTreeNavigatorTest.kt b/model/src/test/kotlin/DependencyTreeNavigatorTest.kt
@@ -48,6 +48,7 @@ class DependencyTreeNavigatorTest : AbstractDependencyNavigatorTest() {
                                     }
                                 }
                             }
+
                             pkg("D") {
                                 pkg("E")
                             }

diff --git a/model/src/test/kotlin/config/OrtConfigurationTest.kt b/model/src/test/kotlin/config/OrtConfigurationTest.kt
@@ -341,6 +341,7 @@ class OrtConfigurationTest : WordSpec({
                         sslkey shouldBe "/defaultdir/postgresql.pk8"
                         sslrootcert shouldBe "/defaultdir/root.crt"
                     }
+
                     postgresStorage.type shouldBe StorageType.PROVENANCE_BASED
 
                     val sw360Storage = this["sw360Configuration"]

diff --git a/model/src/test/kotlin/licenses/LicenseClassificationsTest.kt b/model/src/test/kotlin/licenses/LicenseClassificationsTest.kt
@@ -43,6 +43,7 @@ class LicenseClassificationsTest : WordSpec({
             val exception = shouldThrow<IllegalArgumentException> {
                 LicenseClassifications(categories = listOf(cat1, cat2, cat3))
             }
+
             exception.message shouldContain "[Category 1]"
         }
 
@@ -60,6 +61,7 @@ class LicenseClassificationsTest : WordSpec({
             val exception = shouldThrow<IllegalArgumentException> {
                 LicenseClassifications(categorizations = listOf(lic1, lic2, lic3))
             }
+
             exception.message shouldContain "[ASL-1]"
         }
 
@@ -79,6 +81,7 @@ class LicenseClassificationsTest : WordSpec({
             val exception = shouldThrow<IllegalArgumentException> {
                 LicenseClassifications(categories = listOf(cat1, cat2), categorizations = listOf(lic1, lic2, lic3))
             }
+
             exception.message shouldNotContain lic1.id.toString()
             exception.message shouldContain lic2.id.toString()
             exception.message shouldContain lic3.id.toString()

diff --git a/plugins/advisors/osv/src/main/kotlin/Osv.kt b/plugins/advisors/osv/src/main/kotlin/Osv.kt
@@ -134,6 +134,7 @@ class Osv(name: String, config: OsvConfiguration) : AdviceProvider(name) {
             logger.error {
                 "Requesting vulnerabilities for IDs failed: ${it.collectMessages()}"
             }
+
             emptyList()
         }
     }

diff --git a/plugins/advisors/vulnerable-code/src/main/kotlin/VulnerableCode.kt b/plugins/advisors/vulnerable-code/src/main/kotlin/VulnerableCode.kt
@@ -122,6 +122,7 @@ class VulnerableCode(name: String, config: VulnerableCodeConfiguration) : Advice
                     "The request of chunk ${index + 1} of ${chunks.size} failed for the following ${chunk.size} " +
                         "PURL(s):"
                 }
+
                 chunk.forEach(logger::error)
             }
         }

diff --git a/plugins/commands/advisor/src/main/kotlin/AdvisorCommand.kt b/plugins/commands/advisor/src/main/kotlin/AdvisorCommand.kt
@@ -147,6 +147,7 @@ class AdvisorCommand : OrtCommand(
             val vulnerablePackageCount = count { (id, vulnerabilities) ->
                 id in includedPackages && vulnerabilities.isNotEmpty()
             }
+
             val vulnerabilityCount = filterKeys { it in includedPackages }.values.sumOf { it.size }
 
             echo(

diff --git a/plugins/commands/evaluator/src/main/kotlin/EvaluatorCommand.kt b/plugins/commands/evaluator/src/main/kotlin/EvaluatorCommand.kt
@@ -363,14 +363,17 @@ private fun RuleViolation.format() =
             append(id.toCoordinates())
             append(" - ")
         }
+
         license?.let { license ->
             append(license)
             licenseSource?.let { source ->
                 append(" (")
                 append(source)
                 append(")")
             }
+
             append(" - ")
         }
+
         append(message)
     }
diff --git a/plugins/commands/scanner/src/main/kotlin/ScannerCommand.kt b/plugins/commands/scanner/src/main/kotlin/ScannerCommand.kt
@@ -170,6 +170,7 @@ class ScannerCommand : OrtCommand(
                 val config = ortConfig.scanner.config?.get(it.type)
                 it.create(config?.options.orEmpty(), config?.secrets.orEmpty())
             }
+
         val projectScannerWrappers = projectScannerWrapperFactories
             .takeIf { PackageType.PROJECT in packageTypes }.orEmpty()
             .map {