mirror of
https://github.com/OpenAPITools/openapi-generator.git
synced 2025-12-05 21:46:10 +00:00
[BUG] [KOTLIN] Fix default value generation for Kotlin Strings (#5776)
* fix default value generation for kotlin
* add updated pet templates
* Revert "add updated pet templates"
This reverts commit 7e8168ad
* regen pet store projects code
This commit is contained in:
@@ -1 +1 @@
|
||||
4.2.3-SNAPSHOT
|
||||
4.3.1-SNAPSHOT
|
||||
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
maven { url = uri("https://repo1.maven.org/maven2") }
|
||||
}
|
||||
dependencies {
|
||||
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.M3")
|
||||
@@ -15,7 +15,7 @@ version = "1.0.0"
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
maven { url = uri("https://repo1.maven.org/maven2") }
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
@@ -48,7 +48,7 @@ dependencies {
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url = uri("https://repo1.maven.org/maven2") }
|
||||
maven { url = uri("https://repo.spring.io/snapshot") }
|
||||
maven { url = uri("https://repo.spring.io/milestone") }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package org.openapitools.api
|
||||
|
||||
import org.springframework.web.context.request.NativeWebRequest
|
||||
|
||||
import javax.servlet.http.HttpServletResponse
|
||||
import java.io.IOException
|
||||
|
||||
object ApiUtil {
|
||||
fun setExampleResponse(req: NativeWebRequest, contentType: String, example: String) {
|
||||
try {
|
||||
val res = req.getNativeResponse(HttpServletResponse::class.java)
|
||||
res.setCharacterEncoding("UTF-8")
|
||||
res.addHeader("Content-Type", contentType)
|
||||
res.getWriter().print(example)
|
||||
} catch (e: IOException) {
|
||||
throw RuntimeException(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,13 +17,13 @@ class DefaultExceptionHandler {
|
||||
|
||||
@ExceptionHandler(value = [ApiException::class])
|
||||
fun onApiException(ex: ApiException, response: HttpServletResponse): Unit =
|
||||
response.sendError(ex.code, ex.message)
|
||||
response.sendError(ex.code, ex.message)
|
||||
|
||||
@ExceptionHandler(value = [NotImplementedError::class])
|
||||
fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit =
|
||||
response.sendError(HttpStatus.NOT_IMPLEMENTED.value())
|
||||
response.sendError(HttpStatus.NOT_IMPLEMENTED.value())
|
||||
|
||||
@ExceptionHandler(value = [ConstraintViolationException::class])
|
||||
fun onConstraintViolation(ex: ConstraintViolationException, response: HttpServletResponse): Unit =
|
||||
response.sendError(HttpStatus.BAD_REQUEST.value(), ex.constraintViolations.joinToString(", ") { it.message })
|
||||
response.sendError(HttpStatus.BAD_REQUEST.value(), ex.constraintViolations.joinToString(", ") { it.message })
|
||||
}
|
||||
|
||||
@@ -16,13 +16,13 @@ import io.swagger.annotations.ApiModelProperty
|
||||
* @param id
|
||||
* @param name
|
||||
*/
|
||||
data class Category (
|
||||
data class Category(
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("name") var name: kotlin.String? = null
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("name") var name: kotlin.String? = null
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
@@ -17,16 +17,16 @@ import io.swagger.annotations.ApiModelProperty
|
||||
* @param type
|
||||
* @param message
|
||||
*/
|
||||
data class ModelApiResponse (
|
||||
data class ModelApiResponse(
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("code") var code: kotlin.Int? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("code") var code: kotlin.Int? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("type") var type: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("type") var type: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("message") var message: kotlin.String? = null
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("message") var message: kotlin.String? = null
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
@@ -21,25 +21,25 @@ import io.swagger.annotations.ApiModelProperty
|
||||
* @param status Order Status
|
||||
* @param complete
|
||||
*/
|
||||
data class Order (
|
||||
data class Order(
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("petId") var petId: kotlin.Long? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("petId") var petId: kotlin.Long? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("quantity") var quantity: kotlin.Int? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("quantity") var quantity: kotlin.Int? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("shipDate") var shipDate: java.time.OffsetDateTime? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("shipDate") var shipDate: java.time.OffsetDateTime? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "Order Status")
|
||||
@JsonProperty("status") var status: Order.Status? = null,
|
||||
@ApiModelProperty(example = "null", value = "Order Status")
|
||||
@JsonProperty("status") var status: Order.Status? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("complete") var complete: kotlin.Boolean? = null
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("complete") var complete: kotlin.Boolean? = null
|
||||
) {
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,27 +23,27 @@ import io.swagger.annotations.ApiModelProperty
|
||||
* @param tags
|
||||
* @param status pet status in the store
|
||||
*/
|
||||
data class Pet (
|
||||
data class Pet(
|
||||
|
||||
@get:NotNull
|
||||
@ApiModelProperty(example = "doggie", required = true, value = "")
|
||||
@JsonProperty("name") var name: kotlin.String,
|
||||
@get:NotNull
|
||||
@ApiModelProperty(example = "doggie", required = true, value = "")
|
||||
@JsonProperty("name") var name: kotlin.String,
|
||||
|
||||
@get:NotNull
|
||||
@ApiModelProperty(example = "null", required = true, value = "")
|
||||
@JsonProperty("photoUrls") var photoUrls: kotlin.collections.List<kotlin.String>,
|
||||
@get:NotNull
|
||||
@ApiModelProperty(example = "null", required = true, value = "")
|
||||
@JsonProperty("photoUrls") var photoUrls: kotlin.collections.List<kotlin.String>,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("category") var category: Category? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("category") var category: Category? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("tags") var tags: kotlin.collections.List<Tag>? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("tags") var tags: kotlin.collections.List<Tag>? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "pet status in the store")
|
||||
@JsonProperty("status") var status: Pet.Status? = null
|
||||
@ApiModelProperty(example = "null", value = "pet status in the store")
|
||||
@JsonProperty("status") var status: Pet.Status? = null
|
||||
) {
|
||||
|
||||
/**
|
||||
|
||||
@@ -16,13 +16,13 @@ import io.swagger.annotations.ApiModelProperty
|
||||
* @param id
|
||||
* @param name
|
||||
*/
|
||||
data class Tag (
|
||||
data class Tag(
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("name") var name: kotlin.String? = null
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("name") var name: kotlin.String? = null
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
@@ -22,31 +22,31 @@ import io.swagger.annotations.ApiModelProperty
|
||||
* @param phone
|
||||
* @param userStatus User Status
|
||||
*/
|
||||
data class User (
|
||||
data class User(
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("id") var id: kotlin.Long? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("username") var username: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("username") var username: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("firstName") var firstName: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("firstName") var firstName: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("lastName") var lastName: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("lastName") var lastName: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("email") var email: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("email") var email: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("password") var password: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("password") var password: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("phone") var phone: kotlin.String? = null,
|
||||
@ApiModelProperty(example = "null", value = "")
|
||||
@JsonProperty("phone") var phone: kotlin.String? = null,
|
||||
|
||||
@ApiModelProperty(example = "null", value = "User Status")
|
||||
@JsonProperty("userStatus") var userStatus: kotlin.Int? = null
|
||||
@ApiModelProperty(example = "null", value = "User Status")
|
||||
@JsonProperty("userStatus") var userStatus: kotlin.Int? = null
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user