loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix kotlin spring boot configuration conflict (#19515)

Browse Source
This commit is contained in:
Evgeny Shichenko 2024-09-09 06:03:18 +03:00 committed by GitHub
parent 8511a533d6
commit 0026e15030
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/resources/kotlin-spring/exceptions.mustache vendored
View File

@ -1,5 +1,6 @@
package {{apiPackage}} package {{apiPackage}}
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("{{apiPackage}}.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {

3
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/Exceptions.kt
View File

@ -1,5 +1,6 @@
package org.openapitools.api package org.openapitools.api
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ControllerAdvice
import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ExceptionHandler
@ -11,7 +12,7 @@ sealed class ApiException(msg: String, val code: Int) : Exception(msg)
class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code)
@Configuration("org.openapitools.api.DefaultExceptionHandler")
@ControllerAdvice @ControllerAdvice
class DefaultExceptionHandler { class DefaultExceptionHandler {