refactor(reporter)!: Use default interface implementations to reduce …

…code

Use default implementations for the `getLicenseText()` and
`hasLicenseText()` interface functions that refer to
`getLicenseTextReader()`, so usually only that function needs to be
implemented. That allows to remove the code for some function overrides
as well as the `hasLicenseText()` stand-alone function itself.

Note that this is only an intermediate step towards a bigger refactoring
that plans to make license text providers first-class plugins in ORT.

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>

reporter/src/main/kotlin/DefaultLicenseTextProvider.kt

@@ -21,29 +21,13 @@ package org.ossreviewtoolkit.reporter
 
 import java.io.File
 
-import org.ossreviewtoolkit.utils.spdx.getLicenseText
 import org.ossreviewtoolkit.utils.spdx.getLicenseTextReader
-import org.ossreviewtoolkit.utils.spdx.hasLicenseText
 
 class DefaultLicenseTextProvider(private val licenseTextDirectories: List<File> = emptyList()) : LicenseTextProvider {
-    override fun getLicenseText(licenseId: String): String? =
-        getLicenseText(
-            id = licenseId,
-            handleExceptions = true,
-            licenseTextDirectories = licenseTextDirectories
-        )
-
     override fun getLicenseTextReader(licenseId: String): (() -> String)? =
         getLicenseTextReader(
             id = licenseId,
             handleExceptions = true,
             licenseTextDirectories = licenseTextDirectories
         )
-
-    override fun hasLicenseText(licenseId: String): Boolean =
-        hasLicenseText(
-            id = licenseId,
-            handleExceptions = true,
-            licenseTextDirectories = licenseTextDirectories
-        )
 }

reporter/src/main/kotlin/LicenseTextProvider.kt

@@ -26,7 +26,7 @@ interface LicenseTextProvider {
     /**
      * Return the license text for the license identified by [licenseId] or null if the license text is not available.
      */
-    fun getLicenseText(licenseId: String): String?
+    fun getLicenseText(licenseId: String): String? = getLicenseTextReader(licenseId)?.invoke()
 
     /**
      * Return a lambda that can read the license text for the license identified by [licenseId] or null if no license
@@ -37,5 +37,5 @@ interface LicenseTextProvider {
     /**
      * Return true if a license text for the license identified by [licenseId] is available.
      */
-    fun hasLicenseText(licenseId: String): Boolean
+    fun hasLicenseText(licenseId: String): Boolean = getLicenseTextReader(licenseId) != null
 }

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

@@ -117,12 +117,6 @@ fun getLicenseText(
     licenseTextDirectories: List<File> = emptyList()
 ): String? = getLicenseTextReader(id, handleExceptions, addScanCodeLicenseTextsDir(licenseTextDirectories))?.invoke()
 
-fun hasLicenseText(
-    id: String,
-    handleExceptions: Boolean = false,
-    licenseTextDirectories: List<File> = emptyList()
-): Boolean = getLicenseTextReader(id, handleExceptions, addScanCodeLicenseTextsDir(licenseTextDirectories)) != null
-
 fun getLicenseTextReader(
     id: String,
     handleExceptions: Boolean = false,