#55, find endpoint/method single/multi mapping

Author: hauner

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

@@ -111,7 +111,7 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
         if (matchesAll.isNotEmpty())
             return matchesAll.first() as ResultTypeMapping
 
-        return null;
+        return null
     }
 
     /**
@@ -135,12 +135,16 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      */
     fun findEndpointSingleTypeMapping(info: SchemaInfo): TypeMapping? {
         val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
-
         val matches = filterMappings(SingleTypeMatcher(), ep)
-        if (matches.isEmpty())
-            return null
+        if (matches.isNotEmpty())
+            return matches.first() as TypeMapping
 
-        return matches.first() as TypeMapping
+        val epAll = filterMappings(EndpointTypeMatcher(info.getPath(), null), typeMappings)
+        val matchesAll = filterMappings(SingleTypeMatcher(), epAll)
+        if (matchesAll.isNotEmpty())
+            return matchesAll.first() as TypeMapping
+
+        return null
     }
 
     /**
@@ -164,12 +168,16 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      */
     fun findEndpointMultiTypeMapping(info: SchemaInfo): TypeMapping? {
         val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
-
         val matches = filterMappings(MultiTypeMatcher(), ep)
-        if (matches.isEmpty())
-            return null
+        if (matches.isNotEmpty())
+            return matches.first() as TypeMapping
 
-        return matches.first() as TypeMapping
+        val epAll = filterMappings(EndpointTypeMatcher(info.getPath(), null), typeMappings)
+        val matchesAll = filterMappings(MultiTypeMatcher(), epAll)
+        if (matchesAll.isNotEmpty())
+            return matchesAll.first() as TypeMapping
+
+        return null
     }
 
     /**

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

@@ -138,4 +138,66 @@ class MappingFinderEndpointMethodSpec: StringSpec({
         result.targetTypeName.shouldBe("io.openapiprocessor.ResultWrapper")
     }
 
+    "endpoint/method single mapping matches" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, emptyList()),
+                EndpointTypeMapping("/foo", HttpMethod.GET, listOf(
+                    TypeMapping("single", "io.openapiprocessor.SingleWrapper")
+            )))
+        )
+
+        val info = SchemaInfo(foo, "", "", null, resolver)
+        val result = finder.findEndpointSingleTypeMapping(info)
+
+        result.shouldNotBeNull()
+        result.targetTypeName.shouldBe("io.openapiprocessor.SingleWrapper")
+    }
+
+    "endpoint single mapping matches" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, listOf(
+                    TypeMapping("single", "io.openapiprocessor.SingleWrapper")
+            )))
+        )
+
+        val info = SchemaInfo(foo, "", "", null, resolver)
+        val result = finder.findEndpointSingleTypeMapping(info)
+
+        result.shouldNotBeNull()
+        result.targetTypeName.shouldBe("io.openapiprocessor.SingleWrapper")
+    }
+
+    "endpoint/method multi mapping matches" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, emptyList()),
+                EndpointTypeMapping("/foo", HttpMethod.GET, listOf(
+                    TypeMapping("multi", "io.openapiprocessor.MultiWrapper")
+            )))
+        )
+
+        val info = SchemaInfo(foo, "", "", null, resolver)
+        val result = finder.findEndpointMultiTypeMapping(info)
+
+        result.shouldNotBeNull()
+        result.targetTypeName.shouldBe("io.openapiprocessor.MultiWrapper")
+    }
+
+    "endpoint multi mapping matches" {
+        val finder = MappingFinder(
+            listOf(
+                EndpointTypeMapping("/foo", null, listOf(
+                    TypeMapping("multi", "io.openapiprocessor.MultiWrapper")
+            )))
+        )
+
+        val info = SchemaInfo(foo, "", "", null, resolver)
+        val result = finder.findEndpointMultiTypeMapping(info)
+
+        result.shouldNotBeNull()
+        result.targetTypeName.shouldBe("io.openapiprocessor.MultiWrapper")
+    }
+
 })