read option & improve name, #68

Author: hauner

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

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter.mapping
+
+/**
+ * allows to handle simple name/value options in the mappings configuration.
+ */
+class OptionMapping<T>(val name: String, val value: T): Mapping {
+
+    override fun getChildMappings(): List<Mapping> {
+        return listOf(this)
+    }
+
+}

src/main/kotlin/io/openapiprocessor/core/processor/MappingReader.kt

@@ -6,6 +6,7 @@
 package io.openapiprocessor.core.processor
 
 import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.MapperFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.module.SimpleModule
@@ -84,10 +85,11 @@ class MappingReader(private val validator: MappingValidator = MappingValidator()
             .nullIsSameAsDefault (true)
             .build ()
 
-        return ObjectMapper (YAMLFactory ())
-            .configure (DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            .setPropertyNamingStrategy (PropertyNamingStrategies.KEBAB_CASE)
-            .registerModules (kotlinModule, module)
+        return ObjectMapper(YAMLFactory())
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true)
+            .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE)
+            .registerModules(kotlinModule, module)
     }
 
     private fun createV1Parser(): ObjectMapper {

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

@@ -15,6 +15,11 @@ data class Map(
      */
     val result: String? = null,
 
+    /**
+     * controller method return type, eg. **success** response or **all** responses
+     */
+    val resultStyle: ResultStyle? = null,
+
     /**
      * single mapping, e.g. Mono<>
      */
@@ -25,11 +30,6 @@ data class Map(
      */
     val multi: String? = null,
 
-    /**
-     * controller method response
-     */
-    val responseType: ResponseType? = ResponseType.ALL,
-
     /**
      * null wrapper, e.g. JsonNullable<>
      */

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

@@ -47,6 +47,10 @@ class MappingConverter(val mapping: MappingV2) {
             result.add(convertResult(mapping.map.result))
         }
 
+        if(mapping.map.resultStyle != null) {
+            result.add(convertOption("resultStyle", mapping.map.resultStyle))
+        }
+
         if(mapping.map.single != null) {
             result.add(convertType("single" , mapping.map.single))
         }
@@ -79,6 +83,10 @@ class MappingConverter(val mapping: MappingV2) {
         return result
     }
 
+    private fun <T> convertOption(name: String, value: T): Mapping {
+        return OptionMapping(name, value)
+    }
+
     private fun convertResult (result: String): Mapping {
         return ResultTypeMapping(result)
     }

src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/ResponseType.kt renamed to src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/ResultStyle.kt

@@ -5,7 +5,7 @@
 
 package io.openapiprocessor.core.processor.mapping.v2
 
-enum class ResponseType(val kind: String) {
+enum class ResultStyle(val kind: String) {
     ALL("all"),
     SUCCESS("success")
 }

src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy

@@ -18,12 +18,14 @@ package com.github.hauner.openapi.core.processor
 
 import io.openapiprocessor.core.converter.mapping.AddParameterTypeMapping
 import io.openapiprocessor.core.converter.mapping.EndpointTypeMapping
+import io.openapiprocessor.core.converter.mapping.OptionMapping
 import io.openapiprocessor.core.converter.mapping.ParameterTypeMapping
 import io.openapiprocessor.core.converter.mapping.ResponseTypeMapping
 import io.openapiprocessor.core.converter.mapping.ResultTypeMapping
 import io.openapiprocessor.core.converter.mapping.TypeMapping
 import io.openapiprocessor.core.processor.MappingConverter
 import io.openapiprocessor.core.processor.MappingReader
+import io.openapiprocessor.core.processor.mapping.v2.ResultStyle
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
@@ -460,6 +462,30 @@ map:
         multi << ['reactor.core.publisher.Flux']
     }
 
+    void "reads global result style mapping #resultStyle" () {
+        String yaml = """\
+openapi-processor-mapping: v2
+options: {}
+map:
+  result-style: $resultStyle
+"""
+
+        when:
+        def mapping = reader.read (yaml)
+        def mappings = converter.convert (mapping)
+
+        then:
+        mappings.size () == 1
+        def type = mappings.first () as OptionMapping
+        type.name == 'resultStyle'
+        type.value == expected
+
+        where:
+        resultStyle | expected
+        'all'       | ResultStyle.ALL
+        'success'   | ResultStyle.SUCCESS
+    }
+
     void "does not fail on 'empty' options: key" () {
         String yaml = """\
 openapi-processor-mapping: v2