fix kotlin spring boot configuration conflict (#19515)

OpenAPITools · Sep 9, 2024 · 0026e15 · 0026e15
1 parent 8511a53
commit 0026e15
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 14 deletions.
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/exceptions.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/exceptions.mustache
@@ -1,5 +1,6 @@
 package {{apiPackage}}
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("{{apiPackage}}.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/.../server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/Exceptions.kt b/.../server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...es/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...es/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...e/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...e/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/.../kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/Exceptions.kt b/.../kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...er/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...er/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...etstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...etstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...etstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...etstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...lin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...lin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...store/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...store/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...tore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...tore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...tore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...tore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/...r/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/Exceptions.kt b/...r/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {
 

diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/Exceptions.kt
@@ -1,5 +1,6 @@
 package org.openapitools.api
 
+import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.ControllerAdvice
 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)
 
-
+@Configuration("org.openapitools.api.DefaultExceptionHandler")
 @ControllerAdvice
 class DefaultExceptionHandler {