#55, find endpoint/method type mapping

Author: hauner

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

@@ -22,7 +22,17 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @throws AmbiguousTypeMappingException if there is more than one match.
      */
     fun findEndpointTypeMapping(info: SchemaInfo): TypeMapping? {
-        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
+        // check with method
+        val m = findEndpointTypeMapping(info, info.getMethod())
+        if (m != null)
+            return m
+
+        // check without method, i.e. all methods
+        return findEndpointTypeMapping(info, null)
+    }
+
+    private fun findEndpointTypeMapping(info: SchemaInfo, method: HttpMethod?): TypeMapping? {
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), method), typeMappings)
 
         val parameter = getTypeMapping(filterMappings(ParameterTypeMatcher(info), ep))
         if (parameter != null)
@@ -84,7 +94,7 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @return the "result" type mappings or null if there is no match.
      */
     fun findEndpointResultTypeMapping(info: SchemaInfo): ResultTypeMapping? {
-        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), null/*info.getMethod()*/), typeMappings)
 
         val matches = filterMappings({ _: ResultTypeMapping -> true }, ep)
         if (matches.isEmpty())
@@ -173,7 +183,7 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
     fun isExcludedEndpoint(path: String, method: HttpMethod): Boolean {
         val ep = typeMappings
             .filterIsInstance<EndpointTypeMapping>()
-            .filter(EndpointTypeMatcher(path, method))
+            .filter(EndpointTypeMatcher(path, null/*method*/))
 
         if (ep.isEmpty())
             return false

src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/EndpointTypeMatcher.kt

@@ -11,11 +11,11 @@ import io.openapiprocessor.core.model.HttpMethod
 /**
  * [io.openapiprocessor.core.converter.mapping.MappingFinder] matcher for endpoint type mappings.
  */
-class EndpointTypeMatcher(private val path: String, private val method: HttpMethod)
+class EndpointTypeMatcher(private val path: String, private val method: HttpMethod?)
     : (EndpointTypeMapping) -> Boolean {
 
     override fun invoke(m: EndpointTypeMapping): Boolean {
-        return m.path == path && (m.method == null || m.method == method)
+        return m.path == path && m.method == method
     }
 
 }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter.mapping
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import io.mockk.mockk
+import io.openapiprocessor.core.converter.SchemaInfo
+import io.openapiprocessor.core.model.HttpMethod
+import io.openapiprocessor.core.parser.RefResolver
+
+class MappingFinderEndpointMethodSpec: StringSpec({
+    val resolver = mockk<RefResolver>()
+    val foo = SchemaInfo.Endpoint("/foo", HttpMethod.GET)
+
+    "endpoint/method type mapping matches single mapping" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, emptyList()),
+                EndpointTypeMapping("/foo", HttpMethod.GET, listOf(
+                    TypeMapping("Foo", "io.openapiprocessor.Foo"),
+                    TypeMapping("Far", "io.openapiprocessor.Far"),
+                    TypeMapping("Bar", "io.openapiprocessor.Bar")
+            )))
+        )
+
+        val info = SchemaInfo(foo, "Foo", "", null, resolver)
+        val result = finder.findEndpointTypeMapping(info)
+
+        result.shouldNotBeNull()
+        result.sourceTypeName.shouldBe("Foo")
+        result.targetTypeName.shouldBe("io.openapiprocessor.Foo")
+    }
+
+})