refactor(scanner)!: Rename fromConfig in ScannerCriteria to create

Use a generic name for the factory function as the previous name will
not match anymore after an upcoming change.

Signed-off-by: Martin Nonnenmacher <[email protected]>

Author: mnonnenmacher

plugins/scanners/askalono/src/main/kotlin/Askalono.kt

@@ -56,7 +56,7 @@ class Askalono internal constructor(
 
     override val configuration = ""
 
-    override val criteria by lazy { ScannerCriteria.fromConfig(details, scannerConfig) }
+    override val criteria by lazy { ScannerCriteria.create(details, scannerConfig) }
 
     override fun command(workingDir: File?) =
         listOfNotNull(workingDir, if (Os.isWindows) "askalono.exe" else "askalono").joinToString(File.separator)

plugins/scanners/boyterlc/src/main/kotlin/BoyterLc.kt

@@ -60,7 +60,7 @@ class BoyterLc internal constructor(
 
     override val configuration = CONFIGURATION_OPTIONS.joinToString(" ")
 
-    override val criteria by lazy { ScannerCriteria.fromConfig(details, scannerConfig) }
+    override val criteria by lazy { ScannerCriteria.create(details, scannerConfig) }
 
     override fun command(workingDir: File?) =
         listOfNotNull(workingDir, if (Os.isWindows) "lc.exe" else "lc").joinToString(File.separator)

plugins/scanners/licensee/src/main/kotlin/Licensee.kt

@@ -59,7 +59,7 @@ class Licensee internal constructor(
 
     override val configuration = CONFIGURATION_OPTIONS.joinToString(" ")
 
-    override val criteria by lazy { ScannerCriteria.fromConfig(details, scannerConfig) }
+    override val criteria by lazy { ScannerCriteria.create(details, scannerConfig) }
 
     override fun command(workingDir: File?) =
         listOfNotNull(workingDir, if (Os.isWindows) "licensee.bat" else "licensee").joinToString(File.separator)

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

@@ -97,7 +97,7 @@ class ScanCode internal constructor(
         override fun create(scannerConfig: ScannerConfiguration) = ScanCode(type, scannerConfig)
     }
 
-    override val criteria by lazy { ScannerCriteria.fromConfig(details, scannerConfig) }
+    override val criteria by lazy { ScannerCriteria.create(details, scannerConfig) }
 
     override val configuration by lazy {
         buildList {

plugins/scanners/scanoss/src/main/kotlin/ScanOss.kt

@@ -74,7 +74,7 @@ class ScanOss internal constructor(
 
     override val configuration = ""
 
-    override val criteria by lazy { ScannerCriteria.fromConfig(details, scannerConfig) }
+    override val criteria by lazy { ScannerCriteria.create(details, scannerConfig) }
 
     /**
      * The name of the file corresponding to the fingerprints can be sent to SCANOSS for more precise matches.

scanner/src/main/kotlin/ScannerCriteria.kt

@@ -135,7 +135,7 @@ data class ScannerCriteria(
          * instance, to specify that a specific minimum version of ScanCode is allowed, set this property:
          * `options.ScanCode.minVersion=3.0.2`.
          */
-        fun fromConfig(details: ScannerDetails, config: ScannerConfiguration): ScannerCriteria {
+        fun create(details: ScannerDetails, config: ScannerConfiguration): ScannerCriteria {
             val options = config.options?.get(details.name).orEmpty()
             val scannerVersion = Semver(normalizeVersion(details.version))
             val minVersion = parseVersion(options[PROP_CRITERIA_MIN_VERSION]) ?: scannerVersion

scanner/src/test/kotlin/ScannerCriteriaTest.kt

@@ -68,11 +68,11 @@ class ScannerCriteriaTest : WordSpec({
         }
     }
 
-    "ScannerCriteria.fromConfig()" should {
+    "ScannerCriteria.create()" should {
         "obtain default values from the scanner details" {
             val config = createScannerConfig(emptyMap())
 
-            val criteria = ScannerCriteria.fromConfig(testDetails, config)
+            val criteria = ScannerCriteria.create(testDetails, config)
 
             criteria.regScannerName shouldBe SCANNER_NAME
             criteria.minVersion.version shouldBe SCANNER_VERSION
@@ -88,7 +88,7 @@ class ScannerCriteriaTest : WordSpec({
                 )
             )
 
-            val criteria = ScannerCriteria.fromConfig(testDetails, config)
+            val criteria = ScannerCriteria.create(testDetails, config)
 
             criteria.regScannerName shouldBe "foo"
             criteria.minVersion.version shouldBe "1.2.3"
@@ -103,7 +103,7 @@ class ScannerCriteriaTest : WordSpec({
                 )
             )
 
-            val criteria = ScannerCriteria.fromConfig(testDetails, config)
+            val criteria = ScannerCriteria.create(testDetails, config)
 
             criteria.minVersion.version shouldBe "1.0.0"
             criteria.maxVersion.version shouldBe "3.7.0"
@@ -112,7 +112,7 @@ class ScannerCriteriaTest : WordSpec({
         "use an exact configuration matcher" {
             val config = createScannerConfig(emptyMap())
 
-            val criteria = ScannerCriteria.fromConfig(testDetails, config)
+            val criteria = ScannerCriteria.create(testDetails, config)
 
             criteria.configMatcher(testDetails.configuration) shouldBe true
             criteria.configMatcher(testDetails.configuration + "_other") shouldBe false