refactor(model): Remove the convenience qualifyScope() overload

Inline the function in favor of only keeping the function that takes a
project's ID. This makes the symmetry to `unqualifyScope()` clearer.

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>

Author: sschuberth

analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt

@@ -95,11 +95,11 @@ class AnalyzerResultBuilderTest : WordSpec() {
     private val depRef3 = DependencyReference(0, issues = listOf(issue5))
 
     private val scopeMapping1 = mapOf(
-        DependencyGraph.qualifyScope(project1, "scope-1") to listOf(RootDependencyIndex(0)),
-        DependencyGraph.qualifyScope(project3, "scope-2") to listOf(RootDependencyIndex(1))
+        DependencyGraph.qualifyScope(project1.id, "scope-1") to listOf(RootDependencyIndex(0)),
+        DependencyGraph.qualifyScope(project3.id, "scope-2") to listOf(RootDependencyIndex(1))
     )
     private val scopeMapping2 = mapOf(
-        DependencyGraph.qualifyScope(project2, "scope-3") to listOf(RootDependencyIndex(0))
+        DependencyGraph.qualifyScope(project2.id, "scope-3") to listOf(RootDependencyIndex(0))
     )
 
     private val graph1 =

model/src/main/kotlin/DependencyGraph.kt

@@ -115,13 +115,6 @@ data class DependencyGraph(
          */
         val DEPENDENCY_REFERENCE_COMPARATOR = compareBy<DependencyReference>({ it.pkg }, { it.fragment })
 
-        /**
-         * Return a name for the given [scope][scopeName] that is qualified with parts of the identifier of the given
-         * [project]. This is used to ensure that the scope names are unique when constructing a dependency graph from
-         * multiple projects.
-         */
-        fun qualifyScope(project: Project, scopeName: String): String = qualifyScope(project.id, scopeName)
-
         /**
          * Return a name for the given [scope][scopeName] that is qualified with parts of the given [projectId]. This
          * is used to ensure that the scope names are unique when constructing a dependency graph from multiple

model/src/main/kotlin/DependencyGraphNavigator.kt

@@ -47,7 +47,7 @@ class DependencyGraphNavigator(
     override fun directDependencies(project: Project, scopeName: String): Sequence<DependencyNode> {
         // Collect all root indices for all managers whose graphs have projects of the respective type.
         val rootIndicesForGraphs = graphs.mapNotNull { (managerName, graph) ->
-            graph.scopes[DependencyGraph.qualifyScope(project, scopeName)]?.let { Triple(managerName, graph, it) }
+            graph.scopes[DependencyGraph.qualifyScope(project.id, scopeName)]?.let { Triple(managerName, graph, it) }
         }
 
         if (rootIndicesForGraphs.isEmpty()) return emptySequence()

model/src/main/kotlin/Project.kt

@@ -194,5 +194,5 @@ data class Project(
      * extracting the scopes of this project from a shared dependency graph.
      */
     private fun qualifiedScopeNames(): Set<String> =
-        scopeNames.orEmpty().map { DependencyGraph.qualifyScope(this, it) }.toSet()
+        scopeNames.orEmpty().map { DependencyGraph.qualifyScope(id, it) }.toSet()
 }

model/src/main/kotlin/utils/DependencyGraphConverter.kt

@@ -81,7 +81,7 @@ object DependencyGraphConverter {
 
             projectsForType.forEach { project ->
                 project.scopes.filterNot { excludes.isScopeExcluded(it.name) }.forEach { scope ->
-                    val scopeName = DependencyGraph.qualifyScope(project, scope.name)
+                    val scopeName = DependencyGraph.qualifyScope(project.id, scope.name)
                     scope.dependencies.forEach { dependency ->
                         builder.addDependency(scopeName, dependency)
                     }

model/src/test/kotlin/DependencyGraphTest.kt

@@ -201,7 +201,7 @@ class DependencyGraphTest : WordSpec({
                 vcs = VcsInfo.EMPTY
             )
 
-            val qualifiedScopeName = DependencyGraph.qualifyScope(project, scopeName)
+            val qualifiedScopeName = DependencyGraph.qualifyScope(project.id, scopeName)
 
             qualifiedScopeName shouldBe "namespace:name:version:$scopeName"
         }