Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mapping format identifier #9

Merged
merged 2 commits into from
Jun 19, 2020
Merged

Mapping format identifier #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a96e6
added new mapping version key
hauner Jun 16, 2020
6a9fdda
updated tests
hauner Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/v2/Mapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/com/github/hauner/openapi/core/processor/mapping/version/Mapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
22 changes: 11 additions & 11 deletions src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -197,7 +197,7 @@ map:

void "reads endpoint exclude flag" () {
String yaml = """\
openapi-processor-spring: v2.0
openapi-processor-mapping: v2.0

map:
paths:
Expand All @@ -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:
Expand Down Expand Up @@ -252,7 +252,7 @@ map:

void "reads endpoint add mapping" () {
String yaml = """\
openapi-processor-spring: v2.0
openapi-processor-mapping: v2.0

map:
paths:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/com/github/hauner/openapi/core/processor/MappingExampleV2Spec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down