#55, find endpoint/method result mapping

Author: hauner

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

@@ -101,13 +101,17 @@ 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(), null/*info.getMethod()*/), typeMappings)
-
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
         val matches = filterMappings({ _: ResultTypeMapping -> true }, ep)
-        if (matches.isEmpty())
-            return null
+        if (matches.isNotEmpty())
+            return matches.first() as ResultTypeMapping
 
-        return matches.first() as ResultTypeMapping
+        val epAll = filterMappings(EndpointTypeMatcher(info.getPath(), null), typeMappings)
+        val matchesAll = filterMappings({ _: ResultTypeMapping -> true }, epAll)
+        if (matchesAll.isNotEmpty())
+            return matchesAll.first() as ResultTypeMapping
+
+        return null;
     }
 
     /**

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

@@ -122,4 +122,20 @@ class MappingFinderEndpointMethodSpec: StringSpec({
         result[1].parameterName.shouldBe("bar param")
     }
 
+    "endpoint/method result mapping matches" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, emptyList()),
+                EndpointTypeMapping("/foo", HttpMethod.GET, listOf(
+                    ResultTypeMapping("io.openapiprocessor.ResultWrapper")
+            )))
+        )
+
+        val info = SchemaInfo(foo, "", "", null, resolver)
+        val result = finder.findEndpointResultTypeMapping(info)
+
+        result.shouldNotBeNull()
+        result.targetTypeName.shouldBe("io.openapiprocessor.ResultWrapper")
+    }
+
 })