Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit 496b076

Browse files
authored
Merge pull request #9 from openapi-processor/mapping-format-identifier
resolves #2
2 parents b77d958 + 6a9fdda commit 496b076

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/v2/Mapping.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.github.hauner.openapi.core.processor.mapping.v2
1818

19+
import com.fasterxml.jackson.annotation.JsonAlias
1920
import com.fasterxml.jackson.annotation.JsonProperty
2021
import com.github.hauner.openapi.core.processor.mapping.VersionedMapping
2122

@@ -29,7 +30,9 @@ data class Mapping(
2930
/**
3031
* mapping format version
3132
*/
32-
@JsonProperty("openapi-processor-spring") val version: String,
33+
@JsonProperty("openapi-processor-mapping")
34+
@JsonAlias("openapi-processor-spring") // deprecated
35+
val version: String,
3336

3437
/**
3538
* general options

src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/version/Mapping.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616

1717
package com.github.hauner.openapi.core.processor.mapping.version
1818

19+
import com.fasterxml.jackson.annotation.JsonAlias
1920
import com.fasterxml.jackson.annotation.JsonProperty
2021

21-
data class Mapping(@JsonProperty("openapi-processor-spring") val version: String?) {
22+
data class Mapping(
23+
@JsonProperty("openapi-processor-mapping")
24+
@JsonAlias("openapi-processor-spring") // deprecated
25+
val version: String?) {
2226

2327
fun isV2(): Boolean {
2428
if (version == null) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MappingConverterV2Spec extends Specification {
3636
@Unroll
3737
void "reads global type mapping: (#input.source)" () {
3838
String yaml = """\
39-
openapi-processor-spring: v2.0
39+
openapi-processor-mapping: v2.0
4040
4141
map:
4242
types:
@@ -141,7 +141,7 @@ map:
141141

142142
void "reads global response type mapping" () {
143143
String yaml = """\
144-
openapi-processor-spring: v2.0
144+
openapi-processor-mapping: v2.0
145145
146146
map:
147147
responses:
@@ -165,7 +165,7 @@ map:
165165

166166
void "reads global parameter type mapping" () {
167167
String yaml = """\
168-
openapi-processor-spring: v2.0
168+
openapi-processor-mapping: v2.0
169169
170170
map:
171171
parameters:
@@ -197,7 +197,7 @@ map:
197197

198198
void "reads endpoint exclude flag" () {
199199
String yaml = """\
200-
openapi-processor-spring: v2.0
200+
openapi-processor-mapping: v2.0
201201
202202
map:
203203
paths:
@@ -223,7 +223,7 @@ map:
223223

224224
void "reads endpoint parameter type mapping" () {
225225
String yaml = """\
226-
openapi-processor-spring: v2.0
226+
openapi-processor-mapping: v2.0
227227
228228
map:
229229
paths:
@@ -252,7 +252,7 @@ map:
252252

253253
void "reads endpoint add mapping" () {
254254
String yaml = """\
255-
openapi-processor-spring: v2.0
255+
openapi-processor-mapping: v2.0
256256
257257
map:
258258
paths:
@@ -282,7 +282,7 @@ map:
282282

283283
void "reads endpoint response type mapping" () {
284284
String yaml = """\
285-
openapi-processor-spring: v2.0
285+
openapi-processor-mapping: v2.0
286286
287287
map:
288288
paths:
@@ -312,7 +312,7 @@ map:
312312

313313
void "reads global result mapping #result" () {
314314
String yaml = """\
315-
openapi-processor-spring: v2.0
315+
openapi-processor-mapping: v2.0
316316
317317
map:
318318
result: $result
@@ -335,7 +335,7 @@ map:
335335

336336
void "reads endpoint result mapping #result" () {
337337
String yaml = """\
338-
openapi-processor-spring: v2.0
338+
openapi-processor-mapping: v2.0
339339
340340
map:
341341
paths:
@@ -365,7 +365,7 @@ map:
365365

366366
void "reads global single & multi mapping" () {
367367
String yaml = """\
368-
openapi-processor-spring: v2.0
368+
openapi-processor-mapping: v2.0
369369
370370
map:
371371
single: $single
@@ -392,7 +392,7 @@ map:
392392

393393
void "reads endpoint single & multi mapping" () {
394394
String yaml = """\
395-
openapi-processor-spring: v2.0
395+
openapi-processor-mapping: v2.0
396396
397397
map:
398398
paths:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MappingExampleV2Spec extends Specification {
2929

3030

3131
String yaml = """
32-
openapi-processor-spring: v2
32+
openapi-processor-mapping: v2
3333
3434
options:
3535
package-name: com.github.hauner.openapi

0 commit comments

Comments
 (0)