refactor(Maven): Move creation of projects to an extension function

This functionality can be reused by the Tycho implementation.

Signed-off-by: Oliver Heger <oliver.heger@bosch.io>

Author: oheger-bosch

plugins/package-managers/maven/src/main/kotlin/Maven.kt

@@ -28,10 +28,7 @@ import org.eclipse.aether.graph.DependencyNode
 import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory
 import org.ossreviewtoolkit.analyzer.PackageManager
 import org.ossreviewtoolkit.analyzer.PackageManagerResult
-import org.ossreviewtoolkit.downloader.VersionControlSystem
 import org.ossreviewtoolkit.model.DependencyGraph
-import org.ossreviewtoolkit.model.Identifier
-import org.ossreviewtoolkit.model.Project
 import org.ossreviewtoolkit.model.ProjectAnalyzerResult
 import org.ossreviewtoolkit.model.Severity
 import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
@@ -41,12 +38,9 @@ import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder
 import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.LocalProjectWorkspaceReader
 import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenDependencyHandler
 import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.MavenSupport
-import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.getOriginalScm
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.identifier
 import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.isTychoProject
-import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.parseAuthors
-import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.parseLicenses
-import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.parseVcsInfo
-import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.processDeclaredLicenses
+import org.ossreviewtoolkit.plugins.packagemanagers.maven.utils.toOrtProject
 import org.ossreviewtoolkit.utils.common.searchUpwardsForSubdirectory
 
 /**
@@ -112,23 +106,7 @@ class Maven(
         val workingDir = definitionFile.parentFile
         val projectBuildingResult = mavenSupport.buildMavenProject(definitionFile)
         val mavenProject = projectBuildingResult.project
-        val projectId = Identifier(
-            type = projectType,
-            namespace = mavenProject.groupId,
-            name = mavenProject.artifactId,
-            version = mavenProject.version
-        )
-
-        projectBuildingResult.dependencies.filterNot {
-            excludes.isScopeExcluded(it.dependency.scope)
-        }.forEach { node ->
-            graphBuilder.addDependency(DependencyGraph.qualifyScope(projectId, node.dependency.scope), node)
-        }
-
-        val declaredLicenses = parseLicenses(mavenProject)
-        val declaredLicensesProcessed = processDeclaredLicenses(declaredLicenses)
-
-        val vcsFromPackage = parseVcsInfo(mavenProject)
+        val projectId = mavenProject.identifier(projectType)
 
         // If running in SBT mode expect that POM files were generated in a "target" subdirectory and that the correct
         // project directory is the parent directory of this.
@@ -138,20 +116,17 @@ class Maven(
             workingDir
         }
 
-        val browsableScmUrl = getOriginalScm(mavenProject)?.url
-        val homepageUrl = mavenProject.url
-        val vcsFallbackUrls = listOfNotNull(browsableScmUrl, homepageUrl).toTypedArray()
-
-        val project = Project(
-            id = projectId,
-            definitionFilePath = VersionControlSystem.getPathInfo(definitionFile).path,
-            authors = parseAuthors(mavenProject),
-            declaredLicenses = declaredLicenses,
-            declaredLicensesProcessed = declaredLicensesProcessed,
-            vcs = vcsFromPackage,
-            vcsProcessed = processProjectVcs(projectDir, vcsFromPackage, *vcsFallbackUrls),
-            homepageUrl = homepageUrl.orEmpty(),
-            scopeNames = graphBuilder.scopesFor(projectId)
+        projectBuildingResult.dependencies.filterNot {
+            excludes.isScopeExcluded(it.dependency.scope)
+        }.forEach { node ->
+            graphBuilder.addDependency(DependencyGraph.qualifyScope(projectId, node.dependency.scope), node)
+        }
+
+        val project = mavenProject.toOrtProject(
+            projectId,
+            definitionFile,
+            projectDir,
+            graphBuilder.scopesFor(projectId)
         )
 
         val issues = graphBuilder.packages().mapNotNull { pkg ->

plugins/package-managers/maven/src/main/kotlin/utils/Extensions.kt

@@ -19,17 +19,66 @@
 
 package org.ossreviewtoolkit.plugins.packagemanagers.maven.utils
 
+import java.io.File
+
 import org.apache.maven.artifact.repository.Authentication
 import org.apache.maven.bridge.MavenRepositorySystem
+import org.apache.maven.project.MavenProject
 import org.apache.maven.repository.Proxy
 
 import org.eclipse.aether.RepositorySystemSession
 import org.eclipse.aether.artifact.Artifact
 import org.eclipse.aether.repository.AuthenticationContext
 import org.eclipse.aether.repository.RemoteRepository
 
+import org.ossreviewtoolkit.analyzer.PackageManager.Companion.processProjectVcs
+import org.ossreviewtoolkit.downloader.VersionControlSystem
+import org.ossreviewtoolkit.model.Identifier
+import org.ossreviewtoolkit.model.Project
+
 fun Artifact.identifier() = "$groupId:$artifactId:$version"
 
+/**
+ * Return an [Identifier] for this [MavenProject] with the given [projectType].
+ */
+internal fun MavenProject.identifier(projectType: String): Identifier =
+    Identifier(
+        type = projectType,
+        namespace = groupId,
+        name = artifactId,
+        version = version
+    )
+
+/**
+ * Convert this [MavenProject] to an ORT [Project] using the given [identifier], the path to the [definitionFile],
+ * the [projectDir], and the set of [scopeNames].
+ */
+internal fun MavenProject.toOrtProject(
+    identifier: Identifier,
+    definitionFile: File,
+    projectDir: File,
+    scopeNames: Set<String>
+): Project {
+    val declaredLicenses = parseLicenses(this)
+    val declaredLicensesProcessed = processDeclaredLicenses(declaredLicenses)
+
+    val vcsFromPackage = parseVcsInfo(this)
+    val browsableScmUrl = getOriginalScm(this)?.url
+    val vcsFallbackUrls = listOfNotNull(browsableScmUrl, this.url).toTypedArray()
+
+    return Project(
+        id = identifier,
+        definitionFilePath = VersionControlSystem.getPathInfo(definitionFile).path,
+        authors = parseAuthors(this),
+        declaredLicenses = declaredLicenses,
+        declaredLicensesProcessed = declaredLicensesProcessed,
+        vcs = vcsFromPackage,
+        vcsProcessed = processProjectVcs(projectDir, vcsFromPackage, *vcsFallbackUrls),
+        homepageUrl = url.orEmpty(),
+        scopeNames = scopeNames
+    )
+}
+
 /**
  * Convert this [RemoteRepository] to a repository in the format used by the Maven Repository System.
  * Make sure that all relevant properties are set, especially the proxy and authentication.