support result-style on all mapping levels (#253)

Author: hauner

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

@@ -33,6 +33,14 @@ class EndpointMappings(
     }
 
     fun getResultStyle(query: MappingQuery, step: MappingStep): ResultStyle? {
+        val httpMethodMappings = methodMappings[query.method]
+        if (httpMethodMappings != null) {
+            val methodMapping = httpMethodMappings.getResultStyle(step.add(MethodsStep(query)))
+            if (methodMapping != null) {
+                return methodMapping
+            }
+        }
+
         val mapping = mappings.getResultStyle(step)
         if (mapping != null) {
             return mapping

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/Map.kt

@@ -18,7 +18,7 @@ data class Map(
     val result: String? = null,
 
     /**
-     * controller method return type, eg. **success** response or **all** responses
+     * controller method return type, e.g. **success** response or **all** responses
      */
     val resultStyle: ResultStyle? = null,
 

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt

@@ -319,6 +319,7 @@ class MappingConverter(val mapping: MappingV2) {
 
     private fun convertPath(source: Path): Mappings {
         var resultTypeMapping: ResultTypeMapping? = null
+        var resultStyle: ResultStyle? = null
         var singleTypeMapping: TypeMapping? = null
         var multiTypeMapping: TypeMapping? = null
         var nullTypeMapping: NullTypeMapping? = null
@@ -331,6 +332,10 @@ class MappingConverter(val mapping: MappingV2) {
             resultTypeMapping = convertResult(source.result)
         }
 
+        if (source.resultStyle != null) {
+            resultStyle = source.resultStyle
+        }
+
         if(source.single != null) {
             singleTypeMapping = convertType("single" , source.single)
         }
@@ -361,7 +366,7 @@ class MappingConverter(val mapping: MappingV2) {
 
         return Mappings(
             resultTypeMapping,
-            null,
+            resultStyle,
             singleTypeMapping,
             multiTypeMapping,
             nullTypeMapping,
@@ -374,6 +379,7 @@ class MappingConverter(val mapping: MappingV2) {
 
     private fun convertPathMethod(source: PathMethod): Mappings {
         var resultTypeMapping: ResultTypeMapping? = null
+        var resultStyle: ResultStyle? = null
         var singleTypeMapping: TypeMapping? = null
         var multiTypeMapping: TypeMapping? = null
         var nullTypeMapping: NullTypeMapping? = null
@@ -386,9 +392,9 @@ class MappingConverter(val mapping: MappingV2) {
             resultTypeMapping = convertResult(source.result)
         }
 
-        // if (source.resultStyle != null) {
-        //    resultStyle = source.resultStyle
-        // }
+         if (source.resultStyle != null) {
+            resultStyle = source.resultStyle
+         }
 
         if(source.single != null) {
             singleTypeMapping = convertType("single" , source.single)
@@ -420,7 +426,7 @@ class MappingConverter(val mapping: MappingV2) {
 
         return Mappings(
             resultTypeMapping,
-            null,
+            resultStyle,
             singleTypeMapping,
             multiTypeMapping,
             nullTypeMapping,

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/Path.kt

@@ -33,6 +33,11 @@ data class Path(
      */
     val result: String?,
 
+    /**
+     * controller method return type, e.g. **success** response or **all** responses
+     */
+    val resultStyle: ResultStyle? = null,
+
     /**
      * single mapping, i.e. Mono<>
      */

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/PathMethod.kt

@@ -20,6 +20,11 @@ class PathMethod(
      */
     val result: String?,
 
+    /**
+     * controller method return type, e.g. **success** response or **all** responses
+     */
+    val resultStyle: ResultStyle? = null,
+
     /**
      * single mapping, i.e. Mono<>
      */

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterResultSpec.kt

@@ -159,4 +159,35 @@ class MappingConverterResultSpec: StringSpec({
         resultTypeMappingGet.targetTypeName shouldBe "io.openapiprocessor.WrapGet"
         resultTypeMappingGet.genericTypes.shouldBeEmpty()
     }
+
+    "read endpoint result style" {
+        val yaml = """
+           |openapi-processor-mapping: $VERSION
+           |
+           |options:
+           |  package-name: io.openapiprocessor.somewhere
+           | 
+           |map:
+           |  paths:
+           |    /foo:
+           |      result-style: success
+           |
+           |      get:
+           |        result-style: all
+           |        
+           """.trimMargin()
+
+        // when:
+        val mapping = reader.read (yaml) as Mapping
+        val mappings = MappingConverter(mapping).convert().endpointMappings
+
+        // then:
+        val resultQuery = MappingFinderQuery(path = "/foo", method = HttpMethod.POST)
+        val resultStyle = mappings["/foo"]!!.getResultStyle(resultQuery, EndpointsStep(resultQuery))!!
+        resultStyle.shouldBe(ResultStyle.SUCCESS)
+
+        val resultQueryGet = MappingFinderQuery(path = "/foo", method = HttpMethod.GET)
+        val resultStyleGet = mappings["/foo"]!!.getResultStyle(resultQueryGet, EndpointsStep(resultQueryGet))!!
+        resultStyleGet.shouldBe(ResultStyle.ALL)
+    }
 })