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>

Author: sschuberth

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

@@ -356,10 +356,11 @@ class SpdxDocumentFile(override val descriptor: PluginDescriptor = SpdxDocumentF
             val issues = mutableListOf<Issue>()
             getPackageManagerDependency(target, doc, analyzerConfig) ?: doc.getSpdxPackageForId(target, issues)
                 ?.let { dependency ->
-                    packages += dependency.toPackage(doc.getDefinitionFile(target), doc)
+                    val ortPackage = dependency.toPackage(doc.getDefinitionFile(target), doc)
+                    packages += ortPackage
 
                     PackageReference(
-                        id = dependency.toIdentifier(),
+                        id = ortPackage.id,
                         dependencies = getDependencies(target, doc, packages, ancestorIds, analyzerConfig),
                         linkage = getLinkageForDependency(dependency, pkgId, doc.relationships),
                         issues = issues
@@ -440,9 +441,11 @@ class SpdxDocumentFile(override val descriptor: PluginDescriptor = SpdxDocumentF
 
                     getPackageManagerDependency(source, doc, analyzerConfig) ?: doc.getSpdxPackageForId(source, issues)
                         ?.let { dependency ->
-                            packages += dependency.toPackage(doc.getDefinitionFile(source), doc)
+                            val ortPackage = dependency.toPackage(doc.getDefinitionFile(source), doc)
+                            packages += ortPackage
+
                             PackageReference(
-                                id = dependency.toIdentifier(),
+                                id = ortPackage.id,
                                 dependencies = getDependencies(source, doc, packages, ancestorIds, analyzerConfig),
                                 issues = issues,
                                 linkage = getLinkageForDependency(dependency, target, doc.relationships)