From d3a96e6c49877cae30680e48df37370620bdaf4b Mon Sep 17 00:00:00 2001 From: Martin Hauner Date: Tue, 16 Jun 2020 23:06:51 +0200 Subject: [PATCH 1/2] added new mapping version key --- .../hauner/openapi/core/processor/mapping/v2/Mapping.kt | 5 ++++- .../openapi/core/processor/mapping/version/Mapping.kt | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/v2/Mapping.kt b/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/v2/Mapping.kt index 372650d2..c6f542aa 100644 --- a/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/v2/Mapping.kt +++ b/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/v2/Mapping.kt @@ -16,6 +16,7 @@ package com.github.hauner.openapi.core.processor.mapping.v2 +import com.fasterxml.jackson.annotation.JsonAlias import com.fasterxml.jackson.annotation.JsonProperty import com.github.hauner.openapi.core.processor.mapping.VersionedMapping @@ -29,7 +30,9 @@ data class Mapping( /** * mapping format version */ - @JsonProperty("openapi-processor-spring") val version: String, + @JsonProperty("openapi-processor-mapping") + @JsonAlias("openapi-processor-spring") // deprecated + val version: String, /** * general options diff --git a/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/version/Mapping.kt b/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/version/Mapping.kt index 5f15c06e..2cff05a4 100644 --- a/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/version/Mapping.kt +++ b/src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/version/Mapping.kt @@ -16,9 +16,13 @@ package com.github.hauner.openapi.core.processor.mapping.version +import com.fasterxml.jackson.annotation.JsonAlias import com.fasterxml.jackson.annotation.JsonProperty -data class Mapping(@JsonProperty("openapi-processor-spring") val version: String?) { +data class Mapping( + @JsonProperty("openapi-processor-mapping") + @JsonAlias("openapi-processor-spring") // deprecated + val version: String?) { fun isV2(): Boolean { if (version == null) { From 6a9fddaab594cf745620860540b9aadb7149d2ad Mon Sep 17 00:00:00 2001 From: Martin Hauner Date: Tue, 16 Jun 2020 23:10:15 +0200 Subject: [PATCH 2/2] updated tests --- .../processor/MappingConverterV2Spec.groovy | 22 +++++++++---------- .../processor/MappingExampleV2Spec.groovy | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy b/src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy index d5b51690..f0d440a2 100644 --- a/src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy +++ b/src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy @@ -36,7 +36,7 @@ class MappingConverterV2Spec extends Specification { @Unroll void "reads global type mapping: (#input.source)" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: types: @@ -141,7 +141,7 @@ map: void "reads global response type mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: responses: @@ -165,7 +165,7 @@ map: void "reads global parameter type mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: parameters: @@ -197,7 +197,7 @@ map: void "reads endpoint exclude flag" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: paths: @@ -223,7 +223,7 @@ map: void "reads endpoint parameter type mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: paths: @@ -252,7 +252,7 @@ map: void "reads endpoint add mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: paths: @@ -282,7 +282,7 @@ map: void "reads endpoint response type mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: paths: @@ -312,7 +312,7 @@ map: void "reads global result mapping #result" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: result: $result @@ -335,7 +335,7 @@ map: void "reads endpoint result mapping #result" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: paths: @@ -365,7 +365,7 @@ map: void "reads global single & multi mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: single: $single @@ -392,7 +392,7 @@ map: void "reads endpoint single & multi mapping" () { String yaml = """\ -openapi-processor-spring: v2.0 +openapi-processor-mapping: v2.0 map: paths: diff --git a/src/test/groovy/com/github/hauner/openapi/core/processor/MappingExampleV2Spec.groovy b/src/test/groovy/com/github/hauner/openapi/core/processor/MappingExampleV2Spec.groovy index 59636cc4..f93ee5c4 100644 --- a/src/test/groovy/com/github/hauner/openapi/core/processor/MappingExampleV2Spec.groovy +++ b/src/test/groovy/com/github/hauner/openapi/core/processor/MappingExampleV2Spec.groovy @@ -29,7 +29,7 @@ class MappingExampleV2Spec extends Specification { String yaml = """ -openapi-processor-spring: v2 +openapi-processor-mapping: v2 options: package-name: com.github.hauner.openapi