refactor(SwiftPM): De-duplicate a class

The data model for the top level package and for the nested dependencies is identical. So, there is no need to define a nested `Dependency` class. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Feb 5, 2024 · ca72632 · ca72632
1 parent ad7070a
commit ca72632
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt b/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt
@@ -172,16 +172,16 @@ class SwiftPm(
     }
 }
 
-private val SwiftPackage.Dependency.id: Identifier
+private val SwiftPackage.id: Identifier
     get() = Identifier(
         type = PACKAGE_TYPE,
         namespace = "",
-        name = getCanonicalName(repositoryUrl),
+        name = getCanonicalName(url),
         version = version
     )
 
-private fun SwiftPackage.Dependency.toPackage(): Package {
-    val vcsInfoFromUrl = VcsHost.parseUrl(repositoryUrl)
+private fun SwiftPackage.toPackage(): Package {
+    val vcsInfoFromUrl = VcsHost.parseUrl(url)
     val vcsInfo = vcsInfoFromUrl.takeUnless { it.revision.isBlank() } ?: vcsInfoFromUrl.copy(revision = version)
 
     return createPackage(id, vcsInfo)
@@ -241,14 +241,12 @@ internal fun getCanonicalName(repositoryUrl: String): String {
     }.getOrDefault(normalizedUrl).lowercase()
 }
 
-private class SwiftPmDependencyHandler : DependencyHandler<SwiftPackage.Dependency> {
-    override fun identifierFor(dependency: SwiftPackage.Dependency): Identifier = dependency.id
+private class SwiftPmDependencyHandler : DependencyHandler<SwiftPackage> {
+    override fun identifierFor(dependency: SwiftPackage): Identifier = dependency.id
 
-    override fun dependenciesFor(dependency: SwiftPackage.Dependency): Collection<SwiftPackage.Dependency> =
-        dependency.dependencies
+    override fun dependenciesFor(dependency: SwiftPackage): Collection<SwiftPackage> = dependency.dependencies
 
-    override fun linkageFor(dependency: SwiftPackage.Dependency): PackageLinkage = PackageLinkage.DYNAMIC
+    override fun linkageFor(dependency: SwiftPackage): PackageLinkage = PackageLinkage.DYNAMIC
 
-    override fun createPackage(dependency: SwiftPackage.Dependency, issues: MutableList<Issue>): Package =
-        dependency.toPackage()
+    override fun createPackage(dependency: SwiftPackage, issues: MutableList<Issue>): Package = dependency.toPackage()
 }
diff --git a/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPmModel.kt b/plugins/package-managers/swiftpm/src/main/kotlin/SwiftPmModel.kt
@@ -41,16 +41,8 @@ internal data class SwiftPackage(
     val url: String,
     val version: String,
     val path: String,
-    val dependencies: List<Dependency>
-) {
-    @Serializable
-    data class Dependency(
-        val name: String,
-        val version: String,
-        @SerialName("url") val repositoryUrl: String,
-        val dependencies: Set<Dependency>
-    )
-}
+    val dependencies: List<SwiftPackage>
+)
 
 /**
  * See https://github.com/apple/swift-package-manager/blob/3ef830dddff459e569d6e49c186c3ded33c39bcc/Sources/PackageGraph/PinsStore.swift#L387-L462.