refactor(nuget): Separate resolveDependencies out of the inspector

The `NuGetInspector` should just be a wrapper around the CLI tool (with
capabilities to transform its results), but the actual dependency
resolution / building of the ORT data model should be the concern of the
`NuGet` implementation.

Note that further changes to fixup the error / warning mapping will
follow.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>

Author: sschuberth

plugins/package-managers/nuget/src/main/kotlin/NuGet.kt

@@ -25,10 +25,13 @@ import org.apache.logging.log4j.kotlin.Logging
 
 import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory
 import org.ossreviewtoolkit.analyzer.PackageManager
+import org.ossreviewtoolkit.model.Issue
 import org.ossreviewtoolkit.model.ProjectAnalyzerResult
 import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.plugins.packagemanagers.nuget.utils.NuGetInspector
+import org.ossreviewtoolkit.plugins.packagemanagers.nuget.utils.toOrtPackages
+import org.ossreviewtoolkit.plugins.packagemanagers.nuget.utils.toOrtProject
 
 /**
  * A package manager implementation for [.NET](https://docs.microsoft.com/en-us/dotnet/core/tools/) project files that
@@ -54,15 +57,39 @@ class NuGet(
         ) = NuGet(type, analysisRoot, analyzerConfig, repoConfig)
     }
 
-    private val nugetConfigOption = options[OPTION_NUGET_CONFIG]
+    private val nugetConfig = options[OPTION_NUGET_CONFIG]
 
     override fun resolveDependencies(
         definitionFile: File,
         labels: Map<String, String>
-    ): List<ProjectAnalyzerResult> = NuGetInspector.resolveDependencies(
-        definitionFile = definitionFile,
-        managerName = managerName,
-        analysisRoot = analysisRoot,
-        nugetConfig = nugetConfigOption,
-    )
+    ): List<ProjectAnalyzerResult> {
+        val result = NuGetInspector.inspect(definitionFile, nugetConfig)
+        val project = result.toOrtProject(managerName, analysisRoot, definitionFile)
+        val packages = result.dependencies.toOrtPackages()
+        val errorMessage = collectErrorMessage(result)
+        val issues = if (errorMessage.isNotBlank()) {
+            listOf(
+                Issue(
+                    message = errorMessage,
+                    source = managerName
+                )
+            )
+        } else {
+            emptyList()
+        }
+
+        return listOf(ProjectAnalyzerResult(project, packages, issues))
+    }
+}
+
+private fun collectErrorMessage(result: NuGetInspector.Result): String {
+    var errorMessage = ""
+    result.headers.first().errors.forEach {
+        errorMessage += it + "\n"
+    }
+    result.packages.first().errors.forEach {
+        errorMessage += it + "\n"
+    }
+    result.dependencies.forEach { dep -> dep.errors.forEach { errorMessage += it + "\n" } }
+    return errorMessage
 }

plugins/package-managers/nuget/src/main/kotlin/utils/NuGetInspector.kt

@@ -33,11 +33,9 @@ import org.ossreviewtoolkit.analyzer.PackageManager
 import org.ossreviewtoolkit.downloader.VersionControlSystem
 import org.ossreviewtoolkit.model.Hash
 import org.ossreviewtoolkit.model.Identifier
-import org.ossreviewtoolkit.model.Issue
 import org.ossreviewtoolkit.model.Package
 import org.ossreviewtoolkit.model.PackageReference
 import org.ossreviewtoolkit.model.Project
-import org.ossreviewtoolkit.model.ProjectAnalyzerResult
 import org.ossreviewtoolkit.model.RemoteArtifact
 import org.ossreviewtoolkit.model.Scope
 import org.ossreviewtoolkit.model.VcsInfo
@@ -53,7 +51,7 @@ private val json = Json { ignoreUnknownKeys = true }
 internal object NuGetInspector : CommandLineTool {
     override fun command(workingDir: File?) = "nuget-inspector"
 
-    private fun inspect(definitionFile: File, nugetConfig: String?): Result {
+    fun inspect(definitionFile: File, nugetConfig: String?): Result {
         val workingDir = definitionFile.parentFile
         val outputFile = createOrtTempFile(prefix = "nuget-inspector", suffix = ".json")
 
@@ -80,30 +78,6 @@ internal object NuGetInspector : CommandLineTool {
         }
     }
 
-    fun resolveDependencies(
-        definitionFile: File,
-        managerName: String,
-        analysisRoot: File,
-        nugetConfig: String?
-    ): List<ProjectAnalyzerResult> {
-        val result = inspect(definitionFile, nugetConfig)
-        val project = result.toOrtProject(managerName, analysisRoot, definitionFile)
-        val packages = result.dependencies.toOrtPackages()
-        val errorMessage = collectErrorMessage(result)
-        val issues = if (errorMessage.isNotBlank()) {
-            listOf(
-                Issue(
-                    message = errorMessage,
-                    source = managerName
-                )
-            )
-        } else {
-            emptyList()
-        }
-
-        return listOf(ProjectAnalyzerResult(project, packages, issues))
-    }
-
     @Serializable
     internal data class Result(
         val packages: List<PackageData>,
@@ -169,18 +143,6 @@ private fun List<NuGetInspector.Party>.toAuthors(): SortedSet<String> =
         }.takeIf { it.isNotBlank() }
     }
 
-private fun collectErrorMessage(result: NuGetInspector.Result): String {
-    var errorMessage = ""
-    result.headers.first().errors.forEach {
-        errorMessage += it + "\n"
-    }
-    result.packages.first().errors.forEach {
-        errorMessage += it + "\n"
-    }
-    result.dependencies.forEach { dep -> dep.errors.forEach { errorMessage += it + "\n" } }
-    return errorMessage
-}
-
 internal fun NuGetInspector.Result.toOrtProject(
     managerName: String,
     analysisRoot: File,