refactor(Analyzer): Always pass vcs.normalize() to Repository

Signed-off-by: Jens Keim <[email protected]>

Author: pepper-jk

analyzer/src/main/kotlin/Analyzer.kt

@@ -155,7 +155,7 @@ class Analyzer(private val config: AnalyzerConfiguration, private val labels: Ma
         } else {
             Repository(
                 provenance = RepositoryProvenance(
-                    vcsInfo = vcs,
+                    vcsInfo = vcs.normalize(),
                     resolvedRevision = vcs.revision
                 ),
                 nestedRepositories = nestedVcs,

cli-helper/src/main/kotlin/utils/Extensions.kt

@@ -716,7 +716,7 @@ internal fun OrtResult.getScanResultFor(packageConfiguration: PackageConfigurati
  * tree.
  */
 internal fun OrtResult.getRepositoryPaths(): Map<String, Set<String>> {
-    val result = mutableMapOf(repository.provenance.vcsInfo.normalize().url to mutableSetOf(""))
+    val result = mutableMapOf(repository.provenance.vcsInfo.url to mutableSetOf(""))
 
     repository.nestedRepositories.mapValues { (path, vcsInfo) ->
         result.getOrPut(vcsInfo.url) { mutableSetOf() } += path

evaluator/src/main/kotlin/ProjectSourceRule.kt

@@ -93,7 +93,7 @@ open class ProjectSourceRule(
     /**
      * Return the [VcsType] of the project's code repository.
      */
-    fun projectSourceGetVcsType(): VcsType = ortResult.repository.provenance.vcsInfo.normalize().type
+    fun projectSourceGetVcsType(): VcsType = ortResult.repository.provenance.vcsInfo.type
 
     /**
      * Return the file paths matching any of the given [glob expressions][patterns] with its file content matching

evaluator/src/main/kotlin/RuleSet.kt

@@ -159,7 +159,7 @@ fun ruleSet(
     licenseInfoResolver: LicenseInfoResolver = ortResult.createLicenseInfoResolver(),
     resolutionProvider: ResolutionProvider = DefaultResolutionProvider.create(),
     projectSourceResolver: SourceTreeResolver = SourceTreeResolver.forRemoteRepository(
-        ortResult.repository.provenance.vcsInfo.normalize()
+        ortResult.repository.provenance.vcsInfo
     ),
     configure: RuleSet.() -> Unit = {}
 ) = RuleSet(ortResult, licenseInfoResolver, resolutionProvider, projectSourceResolver).apply(configure)

model/src/main/kotlin/Repository.kt

@@ -76,7 +76,7 @@ data class Repository(
 
         val normalizedVcs = vcs.normalize()
 
-        if (provenance.vcsInfo.normalize().matches(normalizedVcs)) return ""
+        if (provenance.vcsInfo.matches(normalizedVcs)) return ""
 
         return nestedRepositories.entries.find { (_, nestedVcs) -> nestedVcs.normalize().matches(normalizedVcs) }?.key
     }
@@ -95,7 +95,7 @@ private class RepositoryDeserializer : StdDeserializer<Repository>(Repository::c
                 val vcsProcess = jsonMapper.treeToValue<VcsInfo>(node["vcs_processed"])
 
                 // Fall back to [vcsProcessed], if [vcs] is empty.
-                val vcsInfo = if (vcs != VcsInfo.EMPTY) vcs else vcsProcess
+                val vcsInfo = vcsProcess
 
                 // Get the [vcs]'s revision.
                 // Fall back to [vcsProcessed], if [vcs] has empty revision.

plugins/reporters/cyclonedx/src/main/kotlin/CycloneDxReporter.kt

@@ -154,7 +154,7 @@ class CycloneDxReporter(
                         // There is no component type for repositories.
                         type = Component.Type.FILE
 
-                        with(input.ortResult.repository.provenance.vcsInfo.normalize()) {
+                        with(input.ortResult.repository.provenance.vcsInfo) {
                             bomRef = "$url@$revision"
 
                             name = url
@@ -178,7 +178,7 @@ class CycloneDxReporter(
             // distributable), just create a single BOM for all projects in that case for now. As there also is no
             // single correct project to pick for adding external references in that case, simply only use the global
             // repository VCS information here.
-            val vcs = input.ortResult.repository.provenance.vcsInfo.normalize()
+            val vcs = input.ortResult.repository.provenance.vcsInfo
             bom.addExternalReference(
                 ExternalReference.Type.VCS,
                 vcs.url,

plugins/reporters/static-html/src/main/kotlin/TablesReportModelMapper.kt

@@ -48,7 +48,7 @@ internal object TablesReportModelMapper {
             .sortedBy { it.id }
 
         return TablesReport(
-            input.ortResult.repository.provenance.vcsInfo.normalize(),
+            input.ortResult.repository.provenance.vcsInfo,
             input.ortResult.repository.config,
             ruleViolations,
             getAnalyzerIssueSummaryTable(input),