refactor(scancode): Use the SPDX license expression via the interface

This allows to drop the case distinction based on the version, which
actually is a code smell: The model mapper should exclusively use the
interfaces in a version-agnostic way, and the implementations of the
interfaces should handle the version-specifics.

While at it, remove a misleading code comment and adjust a variable
name.

Signed-off-by: Sebastian Schuberth <[email protected]>

Author: sschuberth

plugins/scanners/scancode/src/main/kotlin/ScanCodeResultModelMapper.kt

@@ -117,21 +117,11 @@ fun ScanCodeResult.toScanSummary(preferFileLicense: Boolean = false): ScanSummar
             )
         } else {
             licenses.mapTo(licenseFindings) { license ->
-                // ScanCode uses its own license keys as identifiers in license expressions.
-                val spdxLicenseExpression = when {
-                    license is LicenseEntry.Version3 && license.spdxLicenseExpression != null -> {
-                        license.spdxLicenseExpression
-                    }
-
-                    license is LicenseEntry.Version4 && license.licenseExpressionSpdx != null -> {
-                        license.licenseExpressionSpdx
-                    }
-
-                    else -> license.licenseExpression.mapLicense(scanCodeKeyToSpdxIdMappings)
-                }
+                val licenseExpression = license.licenseExpressionSpdx
+                    ?: license.licenseExpression.mapLicense(scanCodeKeyToSpdxIdMappings)
 
                 LicenseFinding(
-                    license = spdxLicenseExpression,
+                    license = licenseExpression,
                     location = TextLocation(
                         path = file.path,
                         startLine = license.startLine,