fix(aosd): Only set the selectedLicense if it actually selects some…

…thing

Omit the `selectedLicense` if it is the same as `spdxId` and might still
offer a choice. Also, an absent `selectedLicense` should be encoded as
the empty string, not as SPDX `NOASSERTION`.

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

plugins/reporters/aosd/src/main/kotlin/Aosd21Reporter.kt

@@ -92,6 +92,7 @@ private fun Map<Identifier, IndexedValue<CuratedPackage>>.toComponents(
             .applyChoices(input.ortResult.getRepositoryLicenseChoices())
 
         val selectedExpressions = selectedLicenseInfo.toSimplifiedCompoundExpression()
+            .takeUnless { it == licenseExpressions }
 
         val licenseTexts = licenseExpressions.licenses().mapNotNullTo(mutableSetOf()) { license ->
             input.licenseTextProvider.getLicenseText(license)
@@ -116,7 +117,7 @@ private fun Map<Identifier, IndexedValue<CuratedPackage>>.toComponents(
                         licenseText = licenseTexts,
                         // Can be empty as the license information is the result of a file level scan.
                         licenseTextUrl = "",
-                        selectedLicense = selectedExpressions.nullOrBlankToSpdxNoassertionOrNone()
+                        selectedLicense = selectedExpressions?.toString().orEmpty()
                     ).validate()
                 )
             ).validate()