ScanResultsStorage: Remove the unused configuration functions

All users of the functions have been migrated to the new scanner API so
they can safely be removed.

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

Author: mnonnenmacher

scanner/src/funTest/kotlin/scanners/ScannerIntegrationFunTest.kt

@@ -35,7 +35,6 @@ import org.ossreviewtoolkit.model.readValue
 import org.ossreviewtoolkit.model.yamlMapper
 import org.ossreviewtoolkit.scanner.PathScannerWrapper
 import org.ossreviewtoolkit.scanner.ScanContext
-import org.ossreviewtoolkit.scanner.ScanResultsStorage
 import org.ossreviewtoolkit.scanner.Scanner
 import org.ossreviewtoolkit.scanner.ScannerCriteria
 import org.ossreviewtoolkit.scanner.provenance.DefaultNestedProvenanceResolver
@@ -85,8 +84,6 @@ class ScannerIntegrationFunTest : StringSpec() {
             val result = yamlMapper.writeValueAsString(ortResult)
 
             patchActualResult(result, patchStartAndEndTime = true) shouldBe expectedResult
-
-            ScanResultsStorage.storage.stats.reset()
         }
     }
 

scanner/src/main/kotlin/ScanResultsStorage.kt

@@ -33,20 +33,8 @@ import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.Package
 import org.ossreviewtoolkit.model.ScanResult
 import org.ossreviewtoolkit.model.UnknownProvenance
-import org.ossreviewtoolkit.model.config.ClearlyDefinedStorageConfiguration
-import org.ossreviewtoolkit.model.config.FileBasedStorageConfiguration
-import org.ossreviewtoolkit.model.config.PostgresStorageConfiguration
-import org.ossreviewtoolkit.model.config.ScanStorageConfiguration
-import org.ossreviewtoolkit.model.config.ScannerConfiguration
-import org.ossreviewtoolkit.model.config.Sw360StorageConfiguration
-import org.ossreviewtoolkit.model.utils.DatabaseUtils
 import org.ossreviewtoolkit.scanner.provenance.NestedProvenance
 import org.ossreviewtoolkit.scanner.provenance.NestedProvenanceScanResult
-import org.ossreviewtoolkit.scanner.storages.*
-import org.ossreviewtoolkit.utils.ort.ortDataDirectory
-import org.ossreviewtoolkit.utils.ort.storage.HttpFileStorage
-import org.ossreviewtoolkit.utils.ort.storage.LocalFileStorage
-import org.ossreviewtoolkit.utils.ort.storage.XZCompressedLocalFileStorage
 
 /**
  * The abstract class that storage backends for scan results need to implement.
@@ -60,101 +48,6 @@ abstract class ScanResultsStorage : PackageBasedScanStorage {
          * A successful [Result] with an empty list of [ScanResult]s.
          */
         val EMPTY_RESULT = Result.success<List<ScanResult>>(emptyList())
-
-        /**
-         * The scan result storage in use. Needs to be set via the corresponding [configure] function.
-         */
-        var storage: ScanResultsStorage = NoStorage()
-
-        /**
-         * Configure the [ScanResultsStorage]. If [config] does not contain a storage configuration by default a
-         * [FileBasedStorage] using a [XZCompressedLocalFileStorage] as backend is configured.
-         */
-        fun configure(config: ScannerConfiguration): ScanResultsStorage {
-            // Unfortunately, the smart cast does not work when moving this to a capturing "when" subject.
-            val configuredStorages = config.storages
-
-            storage = when {
-                configuredStorages.isNullOrEmpty() -> createDefaultStorage()
-                configuredStorages.size == 1 -> createStorage(configuredStorages.values.first())
-                else -> NoStorage()
-            }
-
-            logger.info { "ScanResultStorage has been configured to ${storage.name}." }
-
-            return storage
-        }
-
-        /**
-         * Create a [FileBasedStorage] to be used as default if no other storage has been configured.
-         */
-        private fun createDefaultStorage(): ScanResultsStorage {
-            val localFileStorage = XZCompressedLocalFileStorage(ortDataDirectory.resolve("$TOOL_NAME/results"))
-            return FileBasedStorage(localFileStorage)
-        }
-
-        /**
-         * Create the concrete [ScanResultsStorage] implementation based on the [config] passed in.
-         */
-        private fun createStorage(config: ScanStorageConfiguration): ScanResultsStorage =
-            when (config) {
-                is FileBasedStorageConfiguration -> createFileBasedStorage(config)
-                is PostgresStorageConfiguration -> createPostgresStorage(config)
-                is ClearlyDefinedStorageConfiguration -> createClearlyDefinedStorage(config)
-                is Sw360StorageConfiguration -> createSw360Storage(config)
-            }
-
-        /**
-         * Create a [FileBasedStorage] based on the [config] passed in.
-         */
-        private fun createFileBasedStorage(config: FileBasedStorageConfiguration): ScanResultsStorage {
-            val backend = config.backend.createFileStorage()
-
-            when (backend) {
-                is HttpFileStorage -> logger.info { "Using file based storage with HTTP backend '${backend.url}'." }
-                is LocalFileStorage -> logger.info {
-                    "Using file based storage with local directory '${backend.directory.invariantSeparatorsPath}'."
-                }
-            }
-
-            return FileBasedStorage(backend)
-        }
-
-        /**
-         * Create a [PostgresStorage] based on the [config] passed in.
-         */
-        private fun createPostgresStorage(config: PostgresStorageConfiguration): ScanResultsStorage {
-            val dataSource = DatabaseUtils.createHikariDataSource(
-                config = config.connection,
-                applicationNameSuffix = TOOL_NAME,
-                // Use a value slightly higher than the number of transactions accessing the storage.
-                maxPoolSize = config.connection.parallelTransactions + 3
-            )
-
-            logger.info {
-                "Using Postgres storage with URL '${config.connection.url}' and schema '${config.connection.schema}'."
-            }
-
-            return PostgresStorage(dataSource, config.connection.parallelTransactions)
-        }
-
-        /**
-         * Create a [ClearlyDefinedStorage] based on the [config] passed in.
-         */
-        private fun createClearlyDefinedStorage(config: ClearlyDefinedStorageConfiguration): ScanResultsStorage =
-            ClearlyDefinedStorage(config).also {
-                logger.info { "Using ClearlyDefined storage with URL '${config.serverUrl}'." }
-            }
-
-        /**
-         * Configure a [Sw360Storage] as the current storage backend.
-         */
-        private fun createSw360Storage(config: Sw360StorageConfiguration): ScanResultsStorage =
-            Sw360Storage(config).also {
-                logger.info {
-                    "Using SW360 storage with auth URL '${config.authUrl}' and REST URL '${config.restUrl}'."
-                }
-            }
     }
 
     /**