Merge pull request #28 from openapi-processor/mapping-package-shortcut

Mapping package shortcut, resolves #20

Author: hauner

src/main/kotlin/io/openapiprocessor/core/processor/MappingConverter.kt

@@ -25,7 +25,7 @@ import io.openapiprocessor.core.processor.mapping.v2.Mapping as MappingV2
 
 /**
  *  Converter for the type mapping from the mapping yaml. It converts the type mapping information
- *  into the format used by [com.github.hauner.openapi.core.converter.DataTypeConverter].
+ *  into the format used by [io.openapiprocessor.core.converter.DataTypeConverter].
  *
  *  @author Martin Hauner
  */
@@ -37,7 +37,7 @@ class MappingConverter {
        }
 
        return if (source.v2) {
-           MappingConverterV2().convert(source as MappingV2)
+           MappingConverterV2(source as MappingV2).convert()
        } else {
            MappingConverterV1().convert(source as MappingV1)
        }

src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt

@@ -28,18 +28,18 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker
 
 /**
  *  Converter for the type mapping from the mapping yaml. It converts the type mapping information
- *  into the format used by {@link com.github.hauner.openapi.spring.converter.DataTypeConverter}.
+ *  into the format used by [io.openapiprocessor.core.converter.DataTypeConverter].
  *
  *  @author Martin Hauner
  */
-class MappingConverter {
+class MappingConverter(val mapping: MappingV2) {
     companion object {
         private const val SEPARATOR_TYPE = " => "
         private const val SEPARATOR_FORMAT = ":"
         private val PATTERN_GENERICS = "(\\S+?)\\s*<(.+?)>".toPattern()
     }
 
-    fun convert(mapping: MappingV2): List<Mapping> {
+    fun convert(): List<Mapping> {
         val result = ArrayList<Mapping>()
 
         if(mapping.map.result != null) {
@@ -201,7 +201,13 @@ class MappingConverter {
             generics = typeGenerics
         }
 
-        return ToType(name, generics)
+        return ToType(name, resolvePackageVariable(generics))
+    }
+
+    private fun resolvePackageVariable(source: List<String>): List<String> {
+        return source.map {
+            it.replace("{package-name}", mapping.options.packageName)
+        }
     }
 
 }

src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterSpec.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2020 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.processor.mapping.v2
+
+import io.kotest.core.spec.IsolationMode
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+import io.openapiprocessor.core.converter.mapping.TypeMapping
+import io.openapiprocessor.core.processor.MappingConverter
+import io.openapiprocessor.core.processor.MappingReader
+
+class MappingConverterSpec: StringSpec({
+    isolationMode = IsolationMode.InstancePerTest
+
+    val reader = MappingReader()
+    val converter = MappingConverter()
+
+    "read generic parameter with generated package ref" {
+        val yaml = """
+                   |openapi-processor-mapping: v2
+                   |
+                   |options:
+                   |  package-name: io.openapiprocessor.somewhere
+                   | 
+                   |map:
+                   |  types:
+                   |    - type: Foo => io.openapiprocessor.Foo<{package-name}.Bar>
+                   """.trimMargin()
+
+        // when:
+        val mapping = reader.read (yaml)
+        val mappings = converter.convert (mapping)
+
+        // then:
+        val type = mappings.first() as TypeMapping
+        type.targetTypeName shouldBe "io.openapiprocessor.Foo"
+        type.genericTypeNames shouldBe listOf("io.openapiprocessor.somewhere.Bar")
+    }
+
+})