DotNet/NuGet: Move class defintions out of the companion object

It does not really make sense to put class definitions into a static
object. Move them to the class level, and also add a documentation link
to each.

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

Author: sschuberth

analyzer/src/funTest/kotlin/DotNetTest.kt

@@ -69,7 +69,7 @@ class DotNetTest : StringSpec() {
 
         "Definition File is correctly mapped" {
             val mapper = XmlMapper().registerKotlinModule()
-            val result = mapper.readValue<List<DotNet.Companion.ItemGroup>>(packageFile)
+            val result = mapper.readValue<List<DotNet.ItemGroup>>(packageFile)
 
             result shouldNotBe null
             result.size shouldBe 4

analyzer/src/funTest/kotlin/NuGetTest.kt

@@ -69,7 +69,7 @@ class NuGetTest : StringSpec() {
 
         "Definition File is correctly mapped" {
             val mapper = XmlMapper().registerKotlinModule()
-            val result = mapper.readValue<NuGet.Companion.PackagesConfig>(packageFile)
+            val result = mapper.readValue<NuGet.PackagesConfig>(packageFile)
 
             result shouldNotBe null
             result.packages shouldNotBe null

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

@@ -66,21 +66,6 @@ class DotNet(
 
             return map
         }
-
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        data class ItemGroup(
-            @JsonProperty(value = "PackageReference")
-            @JacksonXmlElementWrapper(useWrapping = false)
-            val packageReference: List<PackageReference>?
-        )
-
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        data class PackageReference(
-            @JacksonXmlProperty(isAttribute = true, localName = "Include")
-            val include: String?,
-            @JacksonXmlProperty(isAttribute = true, localName = "Version")
-            val version: String?
-        )
     }
 
     class Factory : AbstractPackageManagerFactory<DotNet>("DotNet") {
@@ -94,6 +79,22 @@ class DotNet(
             DotNet(managerName, analyzerRoot, analyzerConfig, repoConfig)
     }
 
+    // See https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files.
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class ItemGroup(
+        @JsonProperty(value = "PackageReference")
+        @JacksonXmlElementWrapper(useWrapping = false)
+        val packageReference: List<PackageReference>?
+    )
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class PackageReference(
+        @JacksonXmlProperty(isAttribute = true, localName = "Include")
+        val include: String?,
+        @JacksonXmlProperty(isAttribute = true, localName = "Version")
+        val version: String?
+    )
+
     override fun resolveDependencies(definitionFile: File): ProjectAnalyzerResult? {
         val workingDir = definitionFile.parentFile
         val dotnet = DotNetSupport(mapPackageReferences(definitionFile), workingDir)

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

@@ -62,21 +62,6 @@ class NuGet(
 
             return map
         }
-
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        data class PackagesConfig(
-            @JsonProperty(value = "package")
-            @JacksonXmlElementWrapper(useWrapping = false)
-            val packages: List<Package>?
-        )
-
-        @JsonIgnoreProperties(ignoreUnknown = true)
-        data class Package(
-            @JacksonXmlProperty(isAttribute = true)
-            val id: String,
-            @JacksonXmlProperty(isAttribute = true)
-            val version: String
-        )
     }
 
     class Factory : AbstractPackageManagerFactory<NuGet>("NuGet") {
@@ -90,6 +75,22 @@ class NuGet(
             NuGet(managerName, analyzerRoot, analyzerConfig, repoConfig)
     }
 
+    // See https://docs.microsoft.com/en-us/nuget/reference/packages-config.
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class PackagesConfig(
+        @JsonProperty(value = "package")
+        @JacksonXmlElementWrapper(useWrapping = false)
+        val packages: List<Package>?
+    )
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class Package(
+        @JacksonXmlProperty(isAttribute = true)
+        val id: String,
+        @JacksonXmlProperty(isAttribute = true)
+        val version: String
+    )
+
     override fun resolveDependencies(definitionFile: File): ProjectAnalyzerResult? {
         val workingDir = definitionFile.parentFile
         val nuget = DotNetSupport(mapPackageReferences(definitionFile), workingDir)