[kotlin-spring][server] Feat: Return from controllers without ResponseEntity wrapper.

modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache

@@ -61,7 +61,7 @@ import kotlin.collections.Map
 {{/swagger1AnnotationLibrary}}
 {{#useRequestMappingOnController}}
 {{=<% %>=}}
-@RequestMapping("\${api.<%title%>.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.<%title%>.base-path:\${api.base-path:$BASE_PATH}}")
 <%={{ }}=%>
 {{/useRequestMappingOnController}}
 {{#operations}}

modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache

@@ -3,13 +3,16 @@ package {{package}}
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.RequestMapping
 import java.util.Optional
+{{#useRequestMappingOnController}}
+import {{#apiPackage}}{{.}}.{{/apiPackage}}{{classname}}Controller.Companion.BASE_PATH
+{{/useRequestMappingOnController}}
 
 {{>generatedAnnotation}}
 
 @Controller{{#beanQualifiers}}("{{package}}.{{classname}}Controller"){{/beanQualifiers}}
 {{#useRequestMappingOnController}}
 {{=<% %>=}}
-@RequestMapping("\${openapi.<%title%>.base-path:<%>defaultBasePath%>}")
+@RequestMapping("\${openapi.<%title%>.base-path:\${api.base-path:$BASE_PATH}}")
 <%={{ }}=%>
 {{/useRequestMappingOnController}}
 {{#operations}}
@@ -30,5 +33,13 @@ class {{classname}}Controller(
 {{/skipDefaultDelegateInterface}}
 
     override fun getDelegate(): {{classname}}Delegate = delegate
+{{#useRequestMappingOnController}}
+
+    companion object {
+    //for your own safety never directly reuse these path definitions in tests
+        const val BASE_PATH: String = "{{=<% %>=}}<%>defaultBasePath%><%={{ }}=%>"
+    }
+
+{{/useRequestMappingOnController}}
 }
 {{/operations}}

modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache

@@ -68,7 +68,7 @@ import kotlin.collections.Map
 {{/swagger1AnnotationLibrary}}
 {{#useRequestMappingOnInterface}}
 {{=<% %>=}}
-@RequestMapping("\${api.<%title%>.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.<%title%>.base-path:\${api.base-path:$BASE_PATH}}")
 <%={{ }}=%>
 {{/useRequestMappingOnInterface}}
 {{#operations}}

modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache

@@ -50,9 +50,11 @@ import reactor.core.publisher.Mono
 import kotlin.collections.List
 import kotlin.collections.Map
 
-{{#useRequestMappingOnInterface}}@HttpExchange(
-"{{=<% %>=}}\${api.<%title%>.base-path:api.base-path:$BASE_PATH}<%={{ }}=%>"
-){{/useRequestMappingOnInterface}}
+{{#useRequestMappingOnInterface}}
+{{=<% %>=}}
+@HttpExchange("\${openapi.<%title%>.base-path:\${api.base-path:$BASE_PATH}}")
+<%={{ }}=%>
+{{/useRequestMappingOnInterface}}
 {{#useBeanValidation}}
 @Validated
 {{/useBeanValidation}}

modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache

@@ -36,7 +36,7 @@ class SpringFoxConfiguration {
 
     @Bean
 {{=<% %>=}}
-    fun customImplementation(servletContext: ServletContext, @Value("\${openapi.<%title%>.base-path:<%>defaultBasePath%>}") basePath: String): Docket {
+    fun customImplementation(servletContext: ServletContext, @Value("\${openapi.<%title%>.base-path:\${api.base-path:<%>defaultBasePath%>}}") basePath: String): Docket {
 <%={{ }}=%>
         return Docket(DocumentationType.SWAGGER_2)
                 .select()

modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java

@@ -143,7 +143,11 @@ public void testNoRequestMappingAnnotationController() throws IOException {
         // Check that the @RequestMapping annotation is generated in the ApiController file
         assertFileContains(
                 Paths.get(output + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"),
-                "@RequestMapping(\"\\${"
+                "@RequestMapping(\"\\${openapi.openAPIPetstore.base-path:\\${api.base-path:$BASE_PATH}}\")",
+                "    companion object {\n"
+                + "    //for your own safety never directly reuse these path definitions in tests\n"
+                + "        const val BASE_PATH: String = \"/v2\"\n"
+                + "    }"
         );
     }
 
@@ -154,7 +158,10 @@ public void testNoRequestMappingAnnotationApiInterface() throws IOException {
         // Check that the @RequestMapping annotation is generated in the Api file
         assertFileContains(
                 Paths.get(output + "/src/main/kotlin/org/openapitools/api/PetApi.kt"),
-                "@RequestMapping(\"\\${"
+                "@RequestMapping(\"\\${openapi.openAPIPetstore.base-path:\\${api.base-path:$BASE_PATH}}\")",
+                "    companion object {\n"
+                + "        //for your own safety never directly reuse these path definitions in tests\n"
+                + "        const val BASE_PATH: String = \"/v2\""
         );
         // Check that the @RequestMapping annotation is not generated in the ApiController file
         assertFileNotContains(
@@ -1286,7 +1293,7 @@ public void generateHttpInterface() throws Exception {
         codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface");
         codegen.additionalProperties().put(REACTIVE, false);
         codegen.additionalProperties().put(USE_RESPONSE_ENTITY, false);
-        codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none");
+        codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "api_interface");
         codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false);
 
         ClientOptInput input = new ClientOptInput()
@@ -1305,6 +1312,9 @@ public void generateHttpInterface() throws Exception {
         Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/StoreApiClient.kt");
         assertFileContains(
                 path,
+                "@HttpExchange(\n"
+                + "\"\\${openapi.openAPIPetstore.base-path:\\${api.base-path:$BASE_PATH}}\"\n"
+                + ")",
                 "    fun getInventory(\n"
                 + "    ): Map<String, kotlin.Int>",
                 "    fun deleteOrder(\n"

samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt

@@ -25,7 +25,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface PetApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt

@@ -24,7 +24,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface StoreApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt

@@ -24,7 +24,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface UserApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt

@@ -27,7 +27,6 @@ import reactor.core.publisher.Mono
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface PetApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt

@@ -26,7 +26,6 @@ import reactor.core.publisher.Mono
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface StoreApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt

@@ -26,7 +26,6 @@ import reactor.core.publisher.Mono
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface UserApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt

@@ -25,7 +25,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface PetApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt

@@ -24,7 +24,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface StoreApi {
 

samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt

@@ -24,7 +24,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface UserApi {
 

samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt

@@ -25,7 +25,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface PetApi {
 

samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt

@@ -24,7 +24,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface StoreApi {
 

samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt

@@ -24,7 +24,6 @@ import jakarta.validation.constraints.*
 import kotlin.collections.List
 import kotlin.collections.Map
 
-
 @Validated
 interface UserApi {
 

samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt

@@ -31,7 +31,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class FakeApiController() {
 
     @Operation(

samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt

@@ -32,7 +32,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class PetApiController() {
 
     @Operation(

samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt

@@ -31,7 +31,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class StoreApiController() {
 
     @Operation(

samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt

@@ -31,7 +31,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class UserApiController() {
 
     @Operation(

samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt

@@ -31,7 +31,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.demo.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.demo.base-path:\${api.base-path:$BASE_PATH}}")
 class TestApiController() {
 
     @Operation(

samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt

@@ -37,7 +37,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 interface PetApi {
 
     fun getDelegate(): PetApiDelegate

samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt

@@ -36,7 +36,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 interface StoreApi {
 
     fun getDelegate(): StoreApiDelegate

samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt

@@ -36,7 +36,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 interface UserApi {
 
     fun getDelegate(): UserApiDelegate

samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt

@@ -3,13 +3,20 @@ package org.openapitools.api
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.RequestMapping
 import java.util.Optional
+import org.openapitools.api.PetApiController.Companion.BASE_PATH
 
 @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT")
 @Controller
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class PetApiController(
         private val delegate: PetApiDelegate
 ) : PetApi {
 
     override fun getDelegate(): PetApiDelegate = delegate
+
+    companion object {
+    //for your own safety never directly reuse these path definitions in tests
+        const val BASE_PATH: String = "/v2"
+    }
+
 }

samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt

@@ -3,13 +3,20 @@ package org.openapitools.api
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.RequestMapping
 import java.util.Optional
+import org.openapitools.api.StoreApiController.Companion.BASE_PATH
 
 @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT")
 @Controller
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class StoreApiController(
         private val delegate: StoreApiDelegate
 ) : StoreApi {
 
     override fun getDelegate(): StoreApiDelegate = delegate
+
+    companion object {
+    //for your own safety never directly reuse these path definitions in tests
+        const val BASE_PATH: String = "/v2"
+    }
+
 }

samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt

@@ -3,13 +3,20 @@ package org.openapitools.api
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.RequestMapping
 import java.util.Optional
+import org.openapitools.api.UserApiController.Companion.BASE_PATH
 
 @javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT")
 @Controller
-@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class UserApiController(
         private val delegate: UserApiDelegate
 ) : UserApi {
 
     override fun getDelegate(): UserApiDelegate = delegate
+
+    companion object {
+    //for your own safety never directly reuse these path definitions in tests
+        const val BASE_PATH: String = "/v2"
+    }
+
 }

samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt

@@ -32,7 +32,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class PetApiController(@Autowired(required = true) val service: PetApiService) {
 
     @Operation(

samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt

@@ -31,7 +31,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class StoreApiController(@Autowired(required = true) val service: StoreApiService) {
 
     @Operation(

samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt

@@ -31,7 +31,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.openAPIPetstore.base-path:\${api.base-path:$BASE_PATH}}")
 class UserApiController(@Autowired(required = true) val service: UserApiService) {
 
     @Operation(

samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt

@@ -32,7 +32,7 @@ import kotlin.collections.Map
 
 @RestController
 @Validated
-@RequestMapping("\${api.multipartFileTest.base-path:api.base-path:$BASE_PATH}")
+@RequestMapping("\${openapi.multipartFileTest.base-path:\${api.base-path:$BASE_PATH}}")
 class MultipartMixedApiController() {
 
     @Operation(