openapi-processor/openapi-processor-spring#150, parse multi level generics of additional parameter

Author: hauner

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

@@ -110,20 +110,6 @@ class MappingConverter(val mapping: MappingV2) {
         }
     }
 
-    private fun createParameterTypeMapping(source: RequestParameter): ParameterTypeMapping {
-        val (mapping, genericTypes, genericTypeNames) = parseMapping(source.name, source.generics)
-
-        val typeMapping = TypeMapping(
-            null,
-            null,
-            resolvePackageVariable(mapping.targetType!!),
-            resolvePackageVariable(genericTypeNames),
-            genericTypes
-        )
-
-        return ParameterTypeMapping(mapping.sourceType!!, typeMapping)
-    }
-
     private fun convertParameter(source: Parameter): Mapping {
         // parameters:
         return when (source) {
@@ -150,6 +136,40 @@ class MappingConverter(val mapping: MappingV2) {
         }
     }
 
+    private fun createParameterTypeMapping(source: RequestParameter): ParameterTypeMapping {
+        val (mapping, genericTypes, genericTypeNames) = parseMapping(source.name, source.generics)
+
+        val typeMapping = TypeMapping(
+            null,
+            null,
+            resolvePackageVariable(mapping.targetType!!),
+            resolvePackageVariable(genericTypeNames),
+            genericTypes
+        )
+
+        return ParameterTypeMapping(mapping.sourceType!!, typeMapping)
+    }
+
+    private fun createAddParameterTypeMapping(source: AdditionalParameter): AddParameterTypeMapping {
+        val (mapping, genericTypes, genericTypeNames) = parseMapping(source.add, source.generics)
+
+        val typeMapping = TypeMapping(
+            null,
+            null,
+            resolvePackageVariable(mapping.targetType!!),
+            resolvePackageVariable(genericTypeNames),
+            genericTypes
+        )
+
+        var annotation: io.openapiprocessor.core.converter.mapping.Annotation? = null
+        if(mapping.annotationType != null) {
+            annotation = Annotation(
+                mapping.annotationType!!, mapping.annotationParameters)
+        }
+
+        return AddParameterTypeMapping(mapping.sourceType!!, typeMapping, annotation)
+    }
+
     data class ParsedMapping(
         val mapping: ParserMapping,
         val genericTypes: List<TargetType>,
@@ -198,30 +218,6 @@ class MappingConverter(val mapping: MappingV2) {
             .collect(Collectors.toList())
     }
 
-    private fun createAddParameterTypeMapping(source: AdditionalParameter): AddParameterTypeMapping {
-        val mapping = parseMapping(source.add)
-
-        val targetGenericTypes = mapping.targetGenericTypes.toMutableList()
-        if (targetGenericTypes.isEmpty() && source.generics != null) {
-            targetGenericTypes.addAll(source.generics)
-        }
-
-        val typeMapping = TypeMapping(
-            null,
-            null,
-            resolvePackageVariable(mapping.targetType!!),
-            resolvePackageVariable(targetGenericTypes)
-        )
-
-        var annotation: io.openapiprocessor.core.converter.mapping.Annotation? = null
-        if(mapping.annotationType != null) {
-            annotation = Annotation(
-                mapping.annotationType!!, mapping.annotationParameters)
-        }
-
-        return AddParameterTypeMapping(mapping.sourceType!!, typeMapping, annotation)
-    }
-
     private fun convertResponse(source: Response): Mapping {
         val mapping = parseMapping(source.content)
 

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterGenericsSpec.kt

@@ -8,6 +8,7 @@ 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.AddParameterTypeMapping
 import io.openapiprocessor.core.converter.mapping.ParameterTypeMapping
 import io.openapiprocessor.core.converter.mapping.TypeMapping
 import io.openapiprocessor.core.processor.MappingConverter
@@ -208,4 +209,36 @@ class MappingConverterGenericsSpec: StringSpec({
         coll.typeName shouldBe "java.util.Collection"
         coll.genericTypes[0].typeName shouldBe "generated.String"
     }
+
+    "read additional parameter with nested generic parameters & package ref" {
+        val yaml = """
+                   |openapi-processor-mapping: v2
+                   |
+                   |options:
+                   |  package-name: generated
+                   |
+                   |map:
+                   |  parameters:
+                   |    - add: foo => java.util.Map
+                   |      generics:
+                   |        - java.lang.String
+                   |        - java.util.Collection<{package-name}.String>
+                   """.trimMargin()
+
+        // when:
+        val mapping = reader.read (yaml)
+        val mappings = converter.convert (mapping)
+
+        // then:
+        val type = mappings.first() as AddParameterTypeMapping
+        type.parameterName shouldBe "foo"
+        val tm = type.mapping
+        tm.targetTypeName shouldBe "java.util.Map"
+        tm.genericTypes.size shouldBe 2
+        tm.genericTypes[0].typeName shouldBe "java.lang.String"
+
+        val coll = tm.genericTypes[1]
+        coll.typeName shouldBe "java.util.Collection"
+        coll.genericTypes[0].typeName shouldBe "generated.String"
+    }
 })