refactor(model): Use named arguments in a couple of constructor calls

Improve readability, and while at it make use of the default value for scope roots in two of the calls. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · May 27, 2024 · 87fd707 · 87fd707
1 parent 3f2a0eb
commit 87fd707
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt b/analyzer/src/test/kotlin/AnalyzerResultBuilderTest.kt
@@ -103,18 +103,17 @@ class AnalyzerResultBuilderTest : WordSpec() {
         DependencyGraph.qualifyScope(project2, "scope-3") to listOf(RootDependencyIndex(0))
     )
 
-    private val graph1 =
-        DependencyGraph(
-            dependencies1,
-            sortedSetOf(DependencyGraph.DEPENDENCY_REFERENCE_COMPARATOR, depRef1, depRef2),
-            scopeMapping1
-        )
-    private val graph2 =
-        DependencyGraph(
-            dependencies2,
-            sortedSetOf(DependencyGraph.DEPENDENCY_REFERENCE_COMPARATOR, depRef3),
-            scopeMapping2
-        )
+    private val graph1 = DependencyGraph(
+        packages = dependencies1,
+        scopeRoots = sortedSetOf(DependencyGraph.DEPENDENCY_REFERENCE_COMPARATOR, depRef1, depRef2),
+        scopes = scopeMapping1
+    )
+
+    private val graph2 = DependencyGraph(
+        packages = dependencies2,
+        scopeRoots = sortedSetOf(DependencyGraph.DEPENDENCY_REFERENCE_COMPARATOR, depRef3),
+        scopes = scopeMapping2
+    )
 
     private val analyzerResult1 = ProjectAnalyzerResult(
         project1, setOf(package1), listOf(issue3, issue4)

diff --git a/model/src/main/kotlin/utils/DependencyGraphBuilder.kt b/model/src/main/kotlin/utils/DependencyGraphBuilder.kt
@@ -171,11 +171,10 @@ class DependencyGraphBuilder<D>(
         val (nodes, edges) = references.toGraph(indexMapping)
 
         return DependencyGraph(
-            sortedDependencyIds,
-            sortedSetOf(),
-            constructSortedScopeMappings(scopeMapping, indexMapping),
-            nodes,
-            edges.removeCycles()
+            packages = sortedDependencyIds,
+            scopes = constructSortedScopeMappings(scopeMapping, indexMapping),
+            nodes = nodes,
+            edges = edges.removeCycles()
         )
     }
 

diff --git a/model/src/test/kotlin/DependencyGraphTest.kt b/model/src/test/kotlin/DependencyGraphTest.kt
@@ -154,7 +154,12 @@ class DependencyGraphTest : WordSpec({
                 "s2" to listOf(RootDependencyIndex(2, fragment = 1))
             )
 
-            val graph = DependencyGraph(ids, sortedSetOf(), scopeMap, nodes, edges)
+            val graph = DependencyGraph(
+                packages = ids,
+                scopes = scopeMap,
+                nodes = nodes,
+                edges = edges
+            )
             val scopes = graph.createScopes()
 
             scopeDependencies(scopes, "s1") shouldBe "${ids[2]}<${ids[1]}${ids[0]}>"

diff --git a/model/src/test/kotlin/ProjectTest.kt b/model/src/test/kotlin/ProjectTest.kt
@@ -77,7 +77,11 @@ private fun createDependencyGraph(qualified: Boolean = false): DependencyGraph {
         plainScopeMapping
     }
 
-    return DependencyGraph(dependencies, sortedSetOf(exampleRef, csvRef), scopeMapping)
+    return DependencyGraph(
+        packages = dependencies,
+        scopeRoots = sortedSetOf(exampleRef, csvRef),
+        scopes = scopeMapping
+    )
 }
 
 class ProjectTest : WordSpec({