#55, find endpoint/method add parameter mapping

Author: hauner

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

@@ -83,7 +83,14 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @throws AmbiguousTypeMappingException if there is more than one match.
      */
     fun findEndpointAddParameterTypeMappings(path: String, method: HttpMethod): List<AddParameterTypeMapping> {
-        return filterMappings(EndpointTypeMatcher(path, method), typeMappings)
+        // check with method
+        val m = filterMappings(EndpointTypeMatcher(path, method), typeMappings)
+            .filterIsInstance<AddParameterTypeMapping>()
+        if (m.isNotEmpty())
+            return m
+
+        // check without method, i.e. all methods
+        return filterMappings(EndpointTypeMatcher(path, null), typeMappings)
             .filterIsInstance<AddParameterTypeMapping>()
     }
 

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

@@ -6,6 +6,7 @@
 package io.openapiprocessor.core.converter.mapping
 
 import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import io.mockk.mockk
@@ -101,4 +102,24 @@ class MappingFinderEndpointMethodSpec: StringSpec({
         result.targetTypeName.shouldBe("org.openapitools.jackson.nullable.JsonNullable")
     }
 
+    "endpoint/method add parameter mapping matches" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, emptyList()),
+                EndpointTypeMapping("/foo", HttpMethod.GET, listOf(
+                    AddParameterTypeMapping("foo param",
+                        TypeMapping(null, "io.openapiprocessor.Foo")),
+                    AddParameterTypeMapping("bar param",
+                        TypeMapping(null, "io.openapiprocessor.Foo"))
+            )))
+        )
+
+        val info = SchemaInfo(foo, "", "", null, resolver)
+        val result = finder.findEndpointAddParameterTypeMappings(info.getPath(), info.getMethod())
+
+        result.shouldNotBeEmpty()
+        result[0].parameterName.shouldBe("foo param")
+        result[1].parameterName.shouldBe("bar param")
+    }
+
 })