Skip to content

Commit 4d3b016

Browse files
committed
refactor(spdx): Only determine the ORT package id once
As `toPackage()` internally calls `toIdentifier()`, use that `id` instead of determining it again. This simplifies an upcoming change. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
1 parent 077cb02 commit 4d3b016

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,11 @@ class SpdxDocumentFile(override val descriptor: PluginDescriptor = SpdxDocumentF
361361
val issues = mutableListOf<Issue>()
362362
getPackageManagerDependency(target, doc, analyzerConfig) ?: doc.getSpdxPackageForId(target, issues)
363363
?.let { dependency ->
364-
packages += dependency.toPackage(doc.getDefinitionFile(target), doc)
364+
val ortPackage = dependency.toPackage(doc.getDefinitionFile(target), doc)
365+
packages += ortPackage
365366

366367
PackageReference(
367-
id = dependency.toIdentifier(),
368+
id = ortPackage.id,
368369
dependencies = getDependencies(target, doc, packages, ancestorIds, analyzerConfig),
369370
linkage = getLinkageForDependency(dependency, pkgId, doc.relationships),
370371
issues = issues
@@ -445,9 +446,11 @@ class SpdxDocumentFile(override val descriptor: PluginDescriptor = SpdxDocumentF
445446

446447
getPackageManagerDependency(source, doc, analyzerConfig) ?: doc.getSpdxPackageForId(source, issues)
447448
?.let { dependency ->
448-
packages += dependency.toPackage(doc.getDefinitionFile(source), doc)
449+
val ortPackage = dependency.toPackage(doc.getDefinitionFile(source), doc)
450+
packages += ortPackage
451+
449452
PackageReference(
450-
id = dependency.toIdentifier(),
453+
id = ortPackage.id,
451454
dependencies = getDependencies(source, doc, packages, ancestorIds, analyzerConfig),
452455
issues = issues,
453456
linkage = getLinkageForDependency(dependency, target, doc.relationships)

0 commit comments

Comments
 (0)