chore(spdx-utils): Add types to SpdxSimpleLicenseMapping properties

Make these explicit for clarity.

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

Author: sschuberth

utils/spdx/src/main/kotlin/SpdxSimpleLicenseMapping.kt

@@ -21,6 +21,8 @@ package org.ossreviewtoolkit.utils.spdx
 
 import com.fasterxml.jackson.module.kotlin.readValue
 
+import java.util.SortedMap
+
 /**
  * A mapping from simple license names to valid SPDX license IDs. This mapping only contains license strings which *can*
  * be parsed by [SpdxExpression.parse] but have a corresponding valid SPDX license ID that should be used instead. See
@@ -30,23 +32,23 @@ object SpdxSimpleLicenseMapping {
     /**
      * The map of simple license names associated with their corresponding [SPDX license][SpdxLicense].
      */
-    internal val simpleLicenseMapping by lazy {
+    internal val simpleLicenseMapping: Map<String, SpdxLicense> by lazy {
         val resource = checkNotNull(javaClass.getResource("/simple-license-mapping.yml"))
-        yamlMapper.readValue<Map<String, SpdxLicense>>(resource)
+        yamlMapper.readValue(resource)
     }
 
     /**
      * The map of simple license names associated with their corresponding [SPDX expression][SpdxLicenseIdExpression].
      */
-    val simpleExpressionMapping by lazy {
+    val simpleExpressionMapping: SortedMap<String, SpdxLicenseIdExpression> by lazy {
         simpleLicenseMapping.mapValuesTo(sortedMapOf(String.CASE_INSENSITIVE_ORDER)) { (_, v) -> v.toExpression() }
     }
 
     /**
      * The map of deprecated SPDX license IDs associated with their current [SPDX expression]
      * [SpdxSingleLicenseExpression].
      */
-    val deprecatedExpressionMapping by lazy {
+    val deprecatedExpressionMapping: SortedMap<String, SpdxSingleLicenseExpression> by lazy {
         val resource = checkNotNull(javaClass.getResource("/deprecated-license-mapping.yml"))
         val mapping = yamlMapper.readValue<Map<String, SpdxSingleLicenseExpression>>(resource)
         mapping.toSortedMap(String.CASE_INSENSITIVE_ORDER)