DotNet/NuGet: Move the commonly used XML mapper to DotNetSupport

Note that we cannot use our xmlMapper intended for writing / reading
OrtResults here as it uses the wrong property naming strategy.

Signed-off-by: Sebastian Schuberth <sebastian.schuberth@here.com>

Author: sschuberth

analyzer/src/funTest/kotlin/DotNetTest.kt

@@ -20,6 +20,8 @@
 
 package com.here.ort.analyzer
 
+import com.fasterxml.jackson.module.kotlin.readValue
+
 import com.here.ort.analyzer.managers.DotNet
 import com.here.ort.downloader.VersionControlSystem
 import com.here.ort.model.yamlMapper
@@ -35,10 +37,6 @@ import io.kotlintest.shouldBe
 import io.kotlintest.shouldNotBe
 import io.kotlintest.specs.StringSpec
 
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
-import com.fasterxml.jackson.module.kotlin.readValue
-import com.fasterxml.jackson.module.kotlin.registerKotlinModule
-
 import java.io.File
 
 class DotNetTest : StringSpec() {
@@ -68,8 +66,7 @@ class DotNetTest : StringSpec() {
         }
 
         "Definition File is correctly mapped" {
-            val mapper = XmlMapper().registerKotlinModule()
-            val result = mapper.readValue<List<DotNet.Companion.ItemGroup>>(packageFile)
+            val result = DotNetSupport.mapper.readValue<List<DotNet.Companion.ItemGroup>>(packageFile)
 
             result shouldNotBe null
             result.size shouldBe 4

analyzer/src/funTest/kotlin/NuGetTest.kt

@@ -20,9 +20,7 @@
 
 package com.here.ort.analyzer
 
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 
 import com.here.ort.analyzer.managers.NuGet
 import com.here.ort.downloader.VersionControlSystem
@@ -68,8 +66,7 @@ class NuGetTest : StringSpec() {
         }
 
         "Definition File is correctly mapped" {
-            val mapper = XmlMapper().registerKotlinModule()
-            val result: NuGet.Companion.Packages = mapper.readValue(packageFile)
+            val result = DotNetSupport.mapper.readValue<NuGet.Companion.PackagesConfig>(packageFile)
 
             result shouldNotBe null
             result.packages shouldNotBe null

analyzer/src/main/kotlin/DotNetSupport.kt

@@ -21,7 +21,9 @@
 package com.here.ort.analyzer
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 
 import com.here.ort.model.HashAlgorithm
 import com.here.ort.model.Identifier
@@ -35,12 +37,12 @@ import com.here.ort.model.xmlMapper
 import com.here.ort.utils.OkHttpClientHelper
 import com.here.ort.utils.textValueOrEmpty
 
-import okhttp3.Request
-
 import java.io.File
 import java.io.IOException
 import java.net.HttpURLConnection
 
+import okhttp3.Request
+
 class DotNetSupport(
     packageReferencesMap: Map<String, String>,
     val workingDir: File
@@ -113,6 +115,8 @@ class DotNetSupport(
                 .replace(")", "")
             return rangeReplaces.split(",").elementAt(0)
         }
+
+        val mapper = XmlMapper().registerKotlinModule()
     }
 
     val packages = mutableListOf<Package>()

analyzer/src/main/kotlin/managers/DotNet.kt

@@ -22,11 +22,9 @@ package com.here.ort.analyzer.managers
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
 import com.fasterxml.jackson.module.kotlin.readValue
-import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 
 import com.here.ort.analyzer.AbstractPackageManagerFactory
 import com.here.ort.analyzer.DotNetSupport
@@ -54,8 +52,7 @@ class DotNet(
     companion object {
         fun mapPackageReferences(definitionFile: File): Map<String, String> {
             val map = mutableMapOf<String, String>()
-            val mapper = XmlMapper().registerKotlinModule()
-            val itemGroups: List<ItemGroup> = mapper.readValue(definitionFile)
+            val itemGroups = DotNetSupport.mapper.readValue<List<ItemGroup>>(definitionFile)
 
             itemGroups.forEach { itemGroup ->
                 itemGroup.packageReference?.forEach {

analyzer/src/main/kotlin/managers/NuGet.kt

@@ -22,11 +22,9 @@ package com.here.ort.analyzer.managers
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
 import com.fasterxml.jackson.module.kotlin.readValue
-import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 
 import com.here.ort.analyzer.AbstractPackageManagerFactory
 import com.here.ort.analyzer.DotNetSupport
@@ -54,8 +52,7 @@ class NuGet(
     companion object {
         fun mapPackageReferences(definitionFile: File): Map<String, String> {
             val map = mutableMapOf<String, String>()
-            val mapper = XmlMapper().registerKotlinModule()
-            val packagesConfig: PackagesConfig = mapper.readValue(definitionFile)
+            val packagesConfig = DotNetSupport.mapper.readValue<PackagesConfig>(definitionFile)
 
             packagesConfig.packages?.forEach {
                 map[it.id] = it.version