chore(plugins): Use the companion object descriptors

Use the `descriptor` properties of the companion objects of the generated factories instead of initializing the factories. Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@bosch.com>
oss-review-toolkit · Sep 3, 2024 · 954eb96 · 954eb96
1 parent 29468d0
commit 954eb96
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/plugins/advisors/oss-index/src/test/kotlin/OssIndexTest.kt b/plugins/advisors/oss-index/src/test/kotlin/OssIndexTest.kt
@@ -71,7 +71,7 @@ class OssIndexTest : WordSpec({
         "return vulnerability information" {
             server.stubComponentsRequest("response_components.json")
             val ossIndex = OssIndex(
-                OssIndexFactory().descriptor,
+                OssIndexFactory.descriptor,
                 OssIndexConfiguration("http://localhost:${server.port()}", null, null)
             )
             val packages = COMPONENTS_REQUEST_IDS.mapTo(mutableSetOf()) {
@@ -118,7 +118,7 @@ class OssIndexTest : WordSpec({
                     )
             )
             val ossIndex = OssIndex(
-                OssIndexFactory().descriptor,
+                OssIndexFactory.descriptor,
                 OssIndexConfiguration("http://localhost:${server.port()}", null, null)
             )
             val packages = COMPONENTS_REQUEST_IDS.mapTo(mutableSetOf()) {
@@ -137,7 +137,7 @@ class OssIndexTest : WordSpec({
 
         "provide correct details" {
             val ossIndex = OssIndex(
-                OssIndexFactory().descriptor,
+                OssIndexFactory.descriptor,
                 OssIndexConfiguration("http://localhost:${server.port()}", null, null)
             )
 

diff --git a/plugins/advisors/vulnerable-code/src/test/kotlin/VulnerableCodeTest.kt b/plugins/advisors/vulnerable-code/src/test/kotlin/VulnerableCodeTest.kt
@@ -336,7 +336,7 @@ private fun createConfig(server: WireMockServer): VulnerableCodeConfiguration {
  * Create a test instance of [VulnerableCode] that communicates with the local [server].
  */
 private fun createVulnerableCode(server: WireMockServer): VulnerableCode =
-    VulnerableCode(VulnerableCodeFactory().descriptor, createConfig(server))
+    VulnerableCode(VulnerableCodeFactory.descriptor, createConfig(server))
 
 /**
  * Return the test file with an analyzer result.

diff --git a/...viders/clearly-defined/src/funTest/kotlin/ClearlyDefinedPackageCurationProviderFunTest.kt b/...viders/clearly-defined/src/funTest/kotlin/ClearlyDefinedPackageCurationProviderFunTest.kt
@@ -78,7 +78,7 @@ class ClearlyDefinedPackageCurationProviderFunTest : WordSpec({
                 minTotalLicenseScore = 80
             )
             val provider = ClearlyDefinedPackageCurationProvider(
-                ClearlyDefinedPackageCurationProviderFactory().descriptor,
+                ClearlyDefinedPackageCurationProviderFactory.descriptor,
                 config
             )
 

diff --git a/...on-providers/clearly-defined/src/test/kotlin/ClearlyDefinedPackageCurationProviderTest.kt b/...on-providers/clearly-defined/src/test/kotlin/ClearlyDefinedPackageCurationProviderTest.kt
@@ -69,7 +69,7 @@ class ClearlyDefinedPackageCurationProviderTest : WordSpec({
             }
 
             val provider = ClearlyDefinedPackageCurationProvider(
-                ClearlyDefinedPackageCurationProviderFactory().descriptor,
+                ClearlyDefinedPackageCurationProviderFactory.descriptor,
                 ClearlyDefinedPackageCurationProviderConfig(serverUrl = "http://localhost:${server.port()}", 0),
                 client
             )

diff --git a/plugins/package-curation-providers/file/src/main/kotlin/FilePackageCurationProvider.kt b/plugins/package-curation-providers/file/src/main/kotlin/FilePackageCurationProvider.kt
@@ -91,7 +91,7 @@ open class FilePackageCurationProvider(descriptor: PluginDescriptor, vararg path
         File(config.path).takeUnless { !it.exists() && !config.mustExist }
     )
 
-    constructor(vararg paths: File?) : this(FilePackageCurationProviderFactory().descriptor, *paths)
+    constructor(vararg paths: File?) : this(FilePackageCurationProviderFactory.descriptor, *paths)
 
     companion object {
         /**