properly parse type parameters from mapping (#224)

Author: hauner

openapi-processor-core/src/main/antlr/Mapping.g4

@@ -59,11 +59,11 @@ annotationParameters
     ;
 
 annotationParameterUnnamed
-    : (Identifier | Boolean | String | Number | QualifiedTypeClass)
+    : (Identifier | Boolean | String | Number | QualifiedType | QualifiedTypeClass)
     ;
 
 annotationParameterNamed
-    : Identifier '=' (Identifier | Boolean | String | Number | QualifiedTypeClass)
+    : Identifier '=' (Identifier | Boolean | String | Number | QualifiedType | QualifiedTypeClass)
     ;
 
 qualifiedTargetType

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/Annotation.kt

@@ -48,16 +48,24 @@ interface ParameterValue {
     val import: String?
 }
 
-class SimpleParameterValue(override val value: String, override val import: String? = null)
-    : ParameterValue {
+class SimpleParameterValue(override val value: String, override val import: String? = null): ParameterValue {
 
     override fun toString(): String {
         return value
     }
 }
 
-class ClassParameterValue(private val clazz: String)
-    : ParameterValue {
+class TypeParameterValue(val type: String): ParameterValue {
+    private val qualifiedType: QualifiedType = QualifiedType(type)
+
+    override val value: String = qualifiedType.type
+
+    override val import: String? = qualifiedType.import
+
+    override fun toString(): String = qualifiedType.toString()
+}
+
+class ClassParameterValue(private val clazz: String): ParameterValue {
 
     override val value: String
         get() = clazz.substring(import.substringBeforeLast('.').length + 1)

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/QualifiedType.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-base
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter.mapping
+
+class QualifiedType(private val qualifiedType: String) {
+    val import: String?
+    val type: String
+
+    init {
+        import = extractImport()
+        type = extractType()
+    }
+
+    private fun extractImport(): String? {
+        val parts = qualifiedType.split(".")
+        val index = parts.indexOfFirst { it.isNotEmpty() && it[0].isUpperCase() }
+        if (index <= 0) {
+            return null
+        }
+
+        return parts.subList(0, index + 1).joinToString(".")
+    }
+
+    private fun extractType(): String {
+        val imp = import ?: return qualifiedType
+        val last = imp.lastIndexOf(".")
+        return qualifiedType.substring(last + 1)
+    }
+
+    override fun toString(): String {
+        return qualifiedType
+    }
+}

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/parser/antlr/MappingExtractor.kt

@@ -8,6 +8,7 @@ package io.openapiprocessor.core.processor.mapping.v2.parser.antlr
 import io.openapiprocessor.core.converter.mapping.ClassParameterValue
 import io.openapiprocessor.core.converter.mapping.ParameterValue
 import io.openapiprocessor.core.converter.mapping.SimpleParameterValue
+import io.openapiprocessor.core.converter.mapping.TypeParameterValue
 import io.openapiprocessor.core.processor.mapping.v2.parser.Mapping
 import io.openapiprocessor.core.processor.mapping.v2.parser.MappingType
 
@@ -137,11 +138,16 @@ class MappingExtractor: MappingBaseListener(), Mapping {
         val parameterName = ctx.getChild(0).text
         val parameterValue = ctx.getChild(2).text
 
-        val clazz = ctx.stop.type == MappingLexer.QualifiedTypeClass
-        if (clazz) {
-            annotationParameters[parameterName] = ClassParameterValue(parameterValue)
-        } else {
-            annotationParameters[parameterName] = SimpleParameterValue(parameterValue)
+        when(ctx.stop.type) {
+            MappingLexer.QualifiedType -> {
+                annotationParameters[parameterName] = TypeParameterValue(parameterValue)
+            }
+            MappingLexer.QualifiedTypeClass -> {
+                annotationParameters[parameterName] = ClassParameterValue(parameterValue)
+            }
+            else -> {
+                annotationParameters[parameterName] = SimpleParameterValue(parameterValue)
+            }
         }
     }
 }

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/mapping/QualifiedTypeSpec.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-base
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter.mapping
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+
+class QualifiedTypeSpec : StringSpec({
+
+    "extracts import & type from qualified class" {
+        val type = QualifiedType("io.openapiprocessor.Something")
+
+        type.import shouldBe "io.openapiprocessor.Something"
+        type.type shouldBe "Something"
+    }
+
+    "extracts import & type from inner class" {
+        val type = QualifiedType("io.openapiprocessor.Something.Inner")
+
+        type.import shouldBe "io.openapiprocessor.Something"
+        type.type shouldBe "Something.Inner"
+    }
+
+    "extracts import & type from inner enum value" {
+        val type = QualifiedType("io.openapiprocessor.Something.Enum.VALUE")
+
+        type.import shouldBe "io.openapiprocessor.Something"
+        type.type shouldBe "Something.Enum.VALUE"
+    }
+})

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

@@ -319,4 +319,37 @@ class AntlrParserSpec: StringSpec({
         mapping.targetTypePrimitive.shouldBeTrue()
         mapping.targetTypePrimitiveArray.shouldBeFalse()
     }
+
+    "annotate source type with fully qualified java annotation and nested type parameter" {
+        val source = """integer:year @ com.fasterxml.jackson.annotation.JsonFormat(shape = JsonFormat.Shape.NUMBER, pattern = "yyyy")"""
+
+        val mapping = parseMapping(source)
+        mapping.kind shouldBe Mapping.Kind.ANNOTATE
+        mapping.sourceType shouldBe "integer"
+        mapping.sourceFormat shouldBe "year"
+        mapping.targetType.shouldBeNull()
+        mapping.targetGenericTypes.shouldBeEmpty()
+        mapping.annotationType shouldBe "com.fasterxml.jackson.annotation.JsonFormat"
+        val shape = mapping.annotationParameters["shape"]!!
+        shape.value shouldBe "JsonFormat.Shape.NUMBER"
+        shape.import.shouldBeNull()
+        mapping.annotationParameters["pattern"]!!.value shouldBe """"yyyy""""
+    }
+
+    "annotate source type with fully qualified java annotation and qualified type parameter" {
+        val source = """integer:year @ com.fasterxml.jackson.annotation.JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.NUMBER, pattern = "yyyy")"""
+
+        val mapping = parseMapping(source)
+        mapping.kind shouldBe Mapping.Kind.ANNOTATE
+        mapping.sourceType shouldBe "integer"
+        mapping.sourceFormat shouldBe "year"
+        mapping.targetType.shouldBeNull()
+        mapping.targetGenericTypes.shouldBeEmpty()
+        mapping.annotationType shouldBe "com.fasterxml.jackson.annotation.JsonFormat"
+        val shape = mapping.annotationParameters["shape"]!!
+        shape.value shouldBe "JsonFormat.Shape.NUMBER"
+        shape.import shouldBe "com.fasterxml.jackson.annotation.JsonFormat"
+        mapping.annotationParameters["pattern"]!!.value shouldBe """"yyyy""""
+    }
+
 })