Skip to content

Kotlin client multiple enums #3928

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

Closed
andrewemery wants to merge 2 commits into from
Closed

Kotlin client multiple enums #3928

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
fd89625
Fixes Kotlin client definitions with multiple enums
andrewemery Sep 20, 2019
8d7ffd0
Updates Kotlin samples
andrewemery Sep 20, 2019
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
6 changes: 4 additions & 2 deletions modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ data class {{classname}} (
{{/hasOptional}}{{/hasRequired}}{{#optionalVars}}{{>data_class_opt_var}}{{^-last}},
{{/-last}}{{/optionalVars}}
){{#parcelizeModels}} : Parcelable{{/parcelizeModels}}
{{#hasEnums}}{{#vars}}{{#isEnum}}
{{#hasEnums}}
{
{{#vars}}{{#isEnum}}
/**
* {{{description}}}
* Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
Expand All @@ -41,5 +42,6 @@ data class {{classname}} (
{{/gson}}
{{/enumVars}}{{/allowableValues}}
}
{{/isEnum}}{{/vars}}
}
{{/isEnum}}{{/vars}}{{/hasEnums}}
{{/hasEnums}}
1 change: 0 additions & 1 deletion ...ient/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ data class ApiResponse (
val message: kotlin.String? = null
)


1 change: 0 additions & 1 deletion .../client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ data class Category (
val name: kotlin.String? = null
)


4 changes: 2 additions & 2 deletions ...les/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ data class Order (
@Json(name = "complete")
val complete: kotlin.Boolean? = null
)

{

/**
* Order Status
* Values: placed,approved,delivered
Expand All @@ -52,6 +52,6 @@ data class Order (
@Json(name = "delivered") delivered("delivered");

}
}

}

4 changes: 2 additions & 2 deletions samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ data class Pet (
@Json(name = "status")
val status: Pet.Status? = null
)

{

/**
* pet status in the store
* Values: available,pending,sold
Expand All @@ -54,6 +54,6 @@ data class Pet (
@Json(name = "sold") sold("sold");

}
}

}

1 change: 0 additions & 1 deletion samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ data class Tag (
val name: kotlin.String? = null
)


1 change: 0 additions & 1 deletion samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@ data class User (
val userStatus: kotlin.Int? = null
)


1 change: 0 additions & 1 deletion .../petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ data class ApiResponse (
val message: kotlin.String? = null
)


1 change: 0 additions & 1 deletion ...ent/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ data class Category (
val name: kotlin.String? = null
)


4 changes: 2 additions & 2 deletions ...client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ data class Order (
@Json(name = "complete")
val complete: kotlin.Boolean? = null
)

{

/**
* Order Status
* Values: placed,approved,delivered
Expand All @@ -52,6 +52,6 @@ data class Order (
@Json(name = "delivered") delivered("delivered");

}
}

}

4 changes: 2 additions & 2 deletions ...s/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ data class Pet (
@Json(name = "status")
val status: Pet.Status? = null
)

{

/**
* pet status in the store
* Values: available,pending,sold
Expand All @@ -54,6 +54,6 @@ data class Pet (
@Json(name = "sold") sold("sold");

}
}

}

1 change: 0 additions & 1 deletion ...s/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ data class Tag (
val name: kotlin.String? = null
)


1 change: 0 additions & 1 deletion .../client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@ data class User (
val userStatus: kotlin.Int? = null
)


1 change: 0 additions & 1 deletion samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ data class ApiResponse (
val message: kotlin.String? = null
)


1 change: 0 additions & 1 deletion samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ data class Category (
val name: kotlin.String? = null
)


4 changes: 2 additions & 2 deletions samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ data class Order (
@Json(name = "complete")
val complete: kotlin.Boolean? = null
)

{

/**
* Order Status
* Values: placed,approved,delivered
Expand All @@ -52,6 +52,6 @@ data class Order (
@Json(name = "delivered") delivered("delivered");

}
}

}

4 changes: 2 additions & 2 deletions samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ data class Pet (
@Json(name = "status")
val status: Pet.Status? = null
)

{

/**
* pet status in the store
* Values: available,pending,sold
Expand All @@ -54,6 +54,6 @@ data class Pet (
@Json(name = "sold") sold("sold");

}
}

}

1 change: 0 additions & 1 deletion samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ data class Tag (
val name: kotlin.String? = null
)


1 change: 0 additions & 1 deletion samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@ data class User (
val userStatus: kotlin.Int? = null
)