chore(scanner): Remove the unused ScannerMatcher.create() function

This was only used in a test. Also remove related properties.

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

Author: sschuberth

scanner/src/main/kotlin/ScannerMatcher.kt

@@ -20,7 +20,6 @@
 package org.ossreviewtoolkit.scanner
 
 import org.ossreviewtoolkit.model.ScannerDetails
-import org.ossreviewtoolkit.utils.common.Options
 
 import org.semver4j.Semver
 
@@ -111,50 +110,5 @@ data class ScannerMatcherConfig(
 ) {
     companion object {
         val EMPTY = ScannerMatcherConfig(null, null, null, null)
-
-        /**
-         * The name of the property defining the regular expression for the scanner name as part of [ScannerMatcher].
-         * The [scanner details][ScannerDetails] of the corresponding scanner must match the criteria.
-         */
-        internal const val PROP_CRITERIA_NAME = "regScannerName"
-
-        /**
-         * The name of the property defining the minimum version of the scanner as part of [ScannerMatcher]. The
-         * [scanner details][ScannerDetails] of the corresponding scanner must match the criteria.
-         */
-        internal const val PROP_CRITERIA_MIN_VERSION = "minVersion"
-
-        /**
-         * The name of the property defining the maximum version of the scanner as part of [ScannerMatcher]. The
-         * [scanner details][ScannerDetails] of the corresponding scanner must match the criteria.
-         */
-        internal const val PROP_CRITERIA_MAX_VERSION = "maxVersion"
-
-        /**
-         * The name of the property defining the configuration of the scanner as part of [ScannerMatcher]. The
-         * [scanner details][ScannerDetails] of the corresponding scanner must match the criteria.
-         */
-        internal const val PROP_CRITERIA_CONFIGURATION = "configuration"
-
-        private val properties = listOf(
-            PROP_CRITERIA_NAME, PROP_CRITERIA_MIN_VERSION, PROP_CRITERIA_MAX_VERSION, PROP_CRITERIA_CONFIGURATION
-        )
-
-        /**
-         * Create a [ScannerMatcherConfig] from the provided options. Return the created config and the options without
-         * the properties that are used to configure the matcher.
-         */
-        fun create(options: Options): Pair<ScannerMatcherConfig, Options> {
-            val filteredOptions = options.filterKeys { it !in properties }
-
-            val matcherConfig = ScannerMatcherConfig(
-                regScannerName = options[PROP_CRITERIA_NAME],
-                minVersion = options[PROP_CRITERIA_MIN_VERSION],
-                maxVersion = options[PROP_CRITERIA_MAX_VERSION],
-                configuration = options[PROP_CRITERIA_CONFIGURATION]
-            )
-
-            return matcherConfig to filteredOptions
-        }
     }
 }

scanner/src/test/kotlin/ScannerMatcherTest.kt

@@ -20,8 +20,6 @@
 package org.ossreviewtoolkit.scanner
 
 import io.kotest.core.spec.style.WordSpec
-import io.kotest.matchers.maps.containExactly
-import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 
 import org.ossreviewtoolkit.model.ScannerDetails
@@ -115,36 +113,6 @@ class ScannerMatcherTest : WordSpec({
             matcher.matches(testDetails) shouldBe true
         }
     }
-
-    "ScannerMatcherConfig.create()" should {
-        "obtain values from the options" {
-            val options = mapOf(
-                ScannerMatcherConfig.PROP_CRITERIA_NAME to "foo",
-                ScannerMatcherConfig.PROP_CRITERIA_MIN_VERSION to "1.2.3",
-                ScannerMatcherConfig.PROP_CRITERIA_MAX_VERSION to "4.5.6",
-                ScannerMatcherConfig.PROP_CRITERIA_CONFIGURATION to "config"
-            )
-
-            with(ScannerMatcherConfig.create(options).first) {
-                regScannerName shouldBe "foo"
-                minVersion shouldBe "1.2.3"
-                maxVersion shouldBe "4.5.6"
-                configuration shouldBe "config"
-            }
-        }
-
-        "filter matcher properties from the options" {
-            val options = mapOf(
-                ScannerMatcherConfig.PROP_CRITERIA_NAME to "foo",
-                ScannerMatcherConfig.PROP_CRITERIA_MIN_VERSION to "1.2.3",
-                ScannerMatcherConfig.PROP_CRITERIA_MAX_VERSION to "4.5.6",
-                ScannerMatcherConfig.PROP_CRITERIA_CONFIGURATION to "config",
-                "other" to "value"
-            )
-
-            ScannerMatcherConfig.create(options).second should containExactly("other" to "value")
-        }
-    }
 })
 
 private const val SCANNER_NAME = "ScannerMatcherTest"