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

Author: hauner

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

@@ -104,6 +104,7 @@ class MappingConverter(val mapping: MappingV2) {
                 targetGenericTypes = convertExplicitGenerics(source.generics)
             }
 
+            // obsolete
             val targetGenericTypeNames = mapping.targetGenericTypes.toMutableList()
             if (targetGenericTypeNames.isEmpty() && source.generics != null) {
                 targetGenericTypeNames.addAll(source.generics)
@@ -146,13 +147,17 @@ class MappingConverter(val mapping: MappingV2) {
     }
 
     private fun convertParameter(source: Parameter): Mapping {
+        // parameters:
         return when (source) {
+            // - name: parameter name => target type
             is RequestParameter -> {
                 createParameterTypeMapping(source)
             }
+            // - add: parameter name => target type
             is AdditionalParameter -> {
                 createAddParameterTypeMapping(source)
             }
+            // - type: OpenAPI type => target type
             is Type -> {
                 when (val mapping = convertType(source)) {
                     is AnnotationTypeMapping -> ParameterAnnotationTypeMapping(mapping)
@@ -170,16 +175,23 @@ class MappingConverter(val mapping: MappingV2) {
     private fun createParameterTypeMapping(source: RequestParameter): ParameterTypeMapping {
         val mapping = parseMapping(source.name)
 
-        val targetGenericTypes = mapping.targetGenericTypes.toMutableList()
+        var targetGenericTypes = convertInlineGenerics(mapping.targetGenericTypes2)
         if (targetGenericTypes.isEmpty() && source.generics != null) {
-            targetGenericTypes.addAll(source.generics)
+            targetGenericTypes = convertExplicitGenerics(source.generics)
+        }
+
+        // obsolete
+        val targetGenericTypeNames = mapping.targetGenericTypes.toMutableList()
+        if (targetGenericTypeNames.isEmpty() && source.generics != null) {
+            targetGenericTypeNames.addAll(source.generics)
         }
 
         val typeMapping = TypeMapping(
-            null,
-            null,
+            null, // mapping.sourceType
+            null, // mapping.sourceFormat
             resolvePackageVariable(mapping.targetType!!),
-            resolvePackageVariable(targetGenericTypes)
+            resolvePackageVariable(targetGenericTypeNames),
+            targetGenericTypes
         )
 
         return ParameterTypeMapping(mapping.sourceType!!, typeMapping)

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.ParameterTypeMapping
 import io.openapiprocessor.core.converter.mapping.TypeMapping
 import io.openapiprocessor.core.processor.MappingConverter
 import io.openapiprocessor.core.processor.MappingReader
@@ -24,7 +25,7 @@ class MappingConverterGenericsSpec: StringSpec({
                    |
                    |options:
                    |  package-name: generated
-                   | 
+                   |
                    |map:
                    |  types:
                    |    - type: Foo => java.util.Map<java.lang.String, java.lang.String>
@@ -48,7 +49,7 @@ class MappingConverterGenericsSpec: StringSpec({
                    |
                    |options:
                    |  package-name: generated
-                   | 
+                   |
                    |map:
                    |  types:
                    |    - type: Foo => java.util.Map
@@ -99,7 +100,7 @@ class MappingConverterGenericsSpec: StringSpec({
                    |
                    |options:
                    |  package-name: generated
-                   | 
+                   |
                    |map:
                    |  types:
                    |    - type: Foo => java.util.Map<java.lang.String, java.util.Collection<java.lang.String>>
@@ -126,7 +127,7 @@ class MappingConverterGenericsSpec: StringSpec({
                    |
                    |options:
                    |  package-name: generated
-                   | 
+                   |
                    |map:
                    |  types:
                    |    - type: Foo => java.util.Map
@@ -149,4 +150,62 @@ class MappingConverterGenericsSpec: StringSpec({
         coll.typeName shouldBe "java.util.Collection"
         coll.genericTypes[0].typeName shouldBe "generated.String"
     }
+
+    "read parameter with generic parameters" {
+        val yaml = """
+                   |openapi-processor-mapping: v2
+                   |
+                   |options:
+                   |  package-name: generated
+                   |
+                   |map:
+                   |  parameters:
+                   |    - name: foo => java.util.Map<java.lang.String, java.lang.String>
+                   """.trimMargin()
+
+        // when:
+        val mapping = reader.read (yaml)
+        val mappings = converter.convert (mapping)
+
+        // then:
+        val type = mappings.first() as ParameterTypeMapping
+        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"
+        tm.genericTypes[1].typeName shouldBe "java.lang.String"
+    }
+
+    "read parameter with nested generic parameters & package ref" {
+        val yaml = """
+                   |openapi-processor-mapping: v2
+                   |
+                   |options:
+                   |  package-name: generated
+                   |
+                   |map:
+                   |  parameters:
+                   |    - name: 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 ParameterTypeMapping
+        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"
+    }
 })