#55, use http method to find mapping

Author: hauner

src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

@@ -73,7 +73,7 @@ class  ApiConverter(
     }
 
     private fun createInterface(path: String, operation: Operation, interfaces: MutableMap<String, Interface>): Interface {
-        val targetInterfaceName = getInterfaceName(operation, isExcluded(path))
+        val targetInterfaceName = getInterfaceName(operation, isExcluded(path, operation.getMethod()))
 
         var itf = interfaces[targetInterfaceName]
         if (itf != null) {
@@ -112,7 +112,7 @@ class  ApiConverter(
             ep.parameters.add (createParameter (ep, parameter, dataTypes, resolver))
         }
 
-        val addMappings = mappingFinder.findEndpointAddParameterTypeMappings (ep.path)
+        val addMappings = mappingFinder.findEndpointAddParameterTypeMappings (ep.path, ep.method)
         addMappings.forEach {
             ep.parameters.add (createAdditionalParameter (it, dataTypes, resolver))
         }
@@ -329,8 +329,8 @@ class  ApiConverter(
         return toClass(path) + "Response" + httpStatus
     }
 
-    private fun isExcluded(path: String): Boolean {
-        return mappingFinder.isExcludedEndpoint(path)
+    private fun isExcluded(path: String, method: HttpMethod): Boolean {
+        return mappingFinder.isExcludedEndpoint(path, method)
     }
 
     private fun getInterfaceName(op: Operation, excluded: Boolean): String {

src/main/kotlin/io/openapiprocessor/core/converter/SchemaInfo.kt

@@ -48,6 +48,10 @@ class SchemaInfo(
         return endpoint.path
     }
 
+    override fun getMethod(): HttpMethod {
+        return endpoint.method
+    }
+
     override fun getName(): String {
         return name
     }

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

@@ -7,6 +7,7 @@ package io.openapiprocessor.core.converter.mapping
 
 import io.openapiprocessor.core.converter.SchemaInfo
 import io.openapiprocessor.core.converter.mapping.matcher.*
+import io.openapiprocessor.core.model.HttpMethod
 
 /**
  * find mappings of a given schema info in the type mapping list.
@@ -21,7 +22,7 @@ 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()), typeMappings)
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
 
         val parameter = getTypeMapping(filterMappings(ParameterTypeMatcher(info), ep))
         if (parameter != null)
@@ -71,8 +72,8 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @return the matching mapping or null if there is no match.
      * @throws AmbiguousTypeMappingException if there is more than one match.
      */
-    fun findEndpointAddParameterTypeMappings(path: String): List<AddParameterTypeMapping> {
-        return filterMappings(EndpointTypeMatcher(path), typeMappings)
+    fun findEndpointAddParameterTypeMappings(path: String, method: HttpMethod): List<AddParameterTypeMapping> {
+        return filterMappings(EndpointTypeMatcher(path, method), typeMappings)
             .filterIsInstance<AddParameterTypeMapping>()
     }
 
@@ -83,7 +84,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()), typeMappings)
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
 
         val matches = filterMappings({ _: ResultTypeMapping -> true }, ep)
         if (matches.isEmpty())
@@ -112,7 +113,7 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @return the "single" type mappings or null if there is no match.
      */
     fun findEndpointSingleTypeMapping(info: SchemaInfo): TypeMapping? {
-        val ep = filterMappings(EndpointTypeMatcher(info.getPath()), typeMappings)
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
 
         val matches = filterMappings(SingleTypeMatcher(), ep)
         if (matches.isEmpty())
@@ -141,7 +142,7 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @return the "multi" type mappings or null if there is no match.
      */
     fun findEndpointMultiTypeMapping(info: SchemaInfo): TypeMapping? {
-        val ep = filterMappings(EndpointTypeMatcher(info.getPath()), typeMappings)
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
 
         val matches = filterMappings(MultiTypeMatcher(), ep)
         if (matches.isEmpty())
@@ -169,10 +170,10 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @param path the endpoint path
      * @return true/false
      */
-    fun isExcludedEndpoint(path: String): Boolean {
+    fun isExcludedEndpoint(path: String, method: HttpMethod): Boolean {
         val ep = typeMappings
             .filterIsInstance<EndpointTypeMapping>()
-            .filter(EndpointTypeMatcher(path))
+            .filter(EndpointTypeMatcher(path, method))
 
         if (ep.isEmpty())
             return false
@@ -189,7 +190,7 @@ class MappingFinder(private val typeMappings: List<Mapping> = emptyList()) {
      * @return the "null" type mappings or null if there is no match.
      */
     fun findEndpointNullTypeMapping(info: SchemaInfo): NullTypeMapping? {
-        val ep = filterMappings(EndpointTypeMatcher(info.getPath()), typeMappings)
+        val ep = filterMappings(EndpointTypeMatcher(info.getPath(), info.getMethod()), typeMappings)
 
         val matches = filterMappings(NullTypeMatcher(), ep)
         if (matches.isEmpty())

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

@@ -5,13 +5,16 @@
 
 package io.openapiprocessor.core.converter.mapping
 
+import io.openapiprocessor.core.model.HttpMethod
+
 /**
  * Provides the properties required to check if a [Mapping] applies to a
  * [io.openapiprocessor.core.converter.SchemaInfo].
  */
 interface MappingSchema {
 
     fun getPath(): String
+    fun getMethod(): HttpMethod
     fun getName(): String
     fun getContentType(): String
 

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

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