From b87b6e91a43e2fd6723d1f48352f154445573da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Tue, 18 Nov 2025 13:38:17 +0100 Subject: [PATCH 01/19] remove "async" and "responseWrapper" from template as these are not supported by kotlin-spring generator --- .../kotlin-spring/apiDelegate.mustache | 5 +--- .../kotlin-spring/methodBody.mustache | 26 ++++++++----------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache index 403f55f33c67..a5435b944e3c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache @@ -14,9 +14,6 @@ import kotlinx.coroutines.flow.Flow {{/reactive}} import java.util.Optional -{{#async}} -import java.util.concurrent.CompletableFuture -{{/async}} {{#operations}} /** @@ -35,7 +32,7 @@ interface {{classname}}Delegate { */ {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}{{#isBodyParam}}Flow<{{{baseType}}}>{{/isBodyParam}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{/isArray}}{{/reactive}}{{^-last}}, {{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, - {{/hasParams}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}}{{^skipDefaultDelegateInterface}} { + {{/hasParams}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultDelegateInterface}} { {{>methodBody}}{{! prevent indent}} }{{/skipDefaultDelegateInterface}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache index 30be6d64a4b4..99705d188ddd 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache @@ -1,26 +1,22 @@ {{^reactive}} {{#examples}} {{#-first}} - {{#async}} -return CompletableFuture.supplyAsync(()-> { - {{/async}}getRequest().ifPresent { request -> -{{#async}} {{/async}} for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { {{/-first}} -{{#async}} {{/async}}{{^async}} {{/async}} if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) { -{{#async}} {{/async}}{{^async}} {{/async}} ApiUtil.setExampleResponse(request, "{{{contentType}}}", "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{example}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}") -{{#async}} {{/async}}{{^async}} {{/async}} break -{{#async}} {{/async}}{{^async}} {{/async}} } + if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) { + ApiUtil.setExampleResponse(request, "{{{contentType}}}", "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{example}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}") + break + } {{#-last}} -{{#async}} {{/async}}{{^async}} {{/async}} } -{{#async}} {{/async}} } -{{#async}} {{/async}} return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) - {{#async}} - }, Runnable::run) - {{/async}} + } + } + return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) + {{/-last}} {{/examples}} {{^examples}} -return {{#async}}CompletableFuture.completedFuture({{/async}}ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) +return ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) {{/examples}} {{/reactive}} {{#reactive}} From 26f9dc0923b669ee43ff22a4b9c930b1381cb4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Tue, 18 Nov 2025 14:10:36 +0100 Subject: [PATCH 02/19] try to force pipelines rerun --- .../codegen/languages/KotlinSpringServerCodegen.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 448561f250ac..329a63ff54da 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -109,6 +109,7 @@ public enum DeclarativeInterfaceReactiveMode { } } + public enum RequestMappingMode { api_interface("Generate the @RequestMapping annotation on the generated Api Interface."), controller("Generate the @RequestMapping annotation on the generated Api Controller Implementation."), From 2f80415022a4184010f079409a05bfeb81f0e51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Tue, 18 Nov 2025 17:31:54 +0100 Subject: [PATCH 03/19] force pipelines rerun --- .../codegen/languages/KotlinSpringServerCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 329a63ff54da..448561f250ac 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -109,7 +109,6 @@ public enum DeclarativeInterfaceReactiveMode { } } - public enum RequestMappingMode { api_interface("Generate the @RequestMapping annotation on the generated Api Interface."), controller("Generate the @RequestMapping annotation on the generated Api Controller Implementation."), From c573b43401c77df5ff0f398737792fe0a21db07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Tue, 18 Nov 2025 17:53:02 +0100 Subject: [PATCH 04/19] fix mustache to keep generated code identical --- .../src/main/resources/kotlin-spring/methodBody.mustache | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache index 99705d188ddd..1ea16de46f8f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache @@ -1,7 +1,7 @@ {{^reactive}} {{#examples}} {{#-first}} - getRequest().ifPresent { request -> +getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { {{/-first}} if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) { @@ -12,7 +12,6 @@ } } return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) - {{/-last}} {{/examples}} {{^examples}} From 2c3b065c5c61a9de4929106285489312fd438674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 19 Nov 2025 01:15:56 +0100 Subject: [PATCH 05/19] Revert "fix mustache to keep generated code identical" This reverts commit c573b43401c77df5ff0f398737792fe0a21db07a. --- .../src/main/resources/kotlin-spring/methodBody.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache index 1ea16de46f8f..99705d188ddd 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache @@ -1,7 +1,7 @@ {{^reactive}} {{#examples}} {{#-first}} -getRequest().ifPresent { request -> + getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { {{/-first}} if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) { @@ -12,6 +12,7 @@ getRequest().ifPresent { request -> } } return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) + {{/-last}} {{/examples}} {{^examples}} From 0ad331517c6591dbbb0e752ead864d3ac93bbf0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 19 Nov 2025 01:16:02 +0100 Subject: [PATCH 06/19] Reapply "fix mustache to keep generated code identical" This reverts commit 2c3b065c5c61a9de4929106285489312fd438674. --- .../src/main/resources/kotlin-spring/methodBody.mustache | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache index 99705d188ddd..1ea16de46f8f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache @@ -1,7 +1,7 @@ {{^reactive}} {{#examples}} {{#-first}} - getRequest().ifPresent { request -> +getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { {{/-first}} if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) { @@ -12,7 +12,6 @@ } } return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) - {{/-last}} {{/examples}} {{^examples}} From b92e778588a29c3b4035687f4986a7dd8da9d8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 19 Nov 2025 08:58:17 +0100 Subject: [PATCH 07/19] Add support for 'useResponseEntity' in kotlin-spring. Consolidate with the separate flag 'declarativeInterfaceWrapResponses' as these can now be controlled both by one flag. Default to true. --- ...arative-interface-reactive-coroutines.yaml | 2 +- ...ve-interface-reactive-reactor-wrapped.yaml | 2 +- ...-spring-declarative-interface-wrapped.yaml | 2 +- .../kotlin-spring-declarative-interface.yaml | 2 +- docs/generators/kotlin-spring.md | 2 +- .../languages/KotlinSpringServerCodegen.java | 16 +++++++--- .../main/resources/kotlin-spring/api.mustache | 7 +++- .../kotlin-spring/apiDelegate.mustache | 4 ++- .../kotlin-spring/apiInterface.mustache | 7 +++- .../resources/kotlin-spring/api_test.mustache | 7 +++- .../apiInterface.mustache | 2 ++ .../httpInterfaceReturnTypes.mustache | 32 +++++++++---------- .../kotlin-spring/methodBody.mustache | 6 ++-- .../kotlin-spring/returnValue.mustache | 5 ++- .../spring/KotlinSpringServerCodegenTest.java | 12 +++---- .../org/openapitools/api/PetApiClient.kt | 1 - .../org/openapitools/api/StoreApiClient.kt | 1 - .../org/openapitools/api/UserApiClient.kt | 1 - 18 files changed, 68 insertions(+), 43 deletions(-) diff --git a/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml b/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml index e2ad5943459f..f5375f8f0fb7 100644 --- a/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml @@ -11,6 +11,6 @@ additionalProperties: beanValidations: "true" interfaceOnly: true reactive: true - declarativeInterfaceWrapResponses: false + useResponseEntity: false useFlowForArrayReturnType: false declarativeInterfaceReactiveMode: "coroutines" diff --git a/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml b/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml index 99ea39a3c8a6..0826f5059e33 100644 --- a/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml @@ -11,6 +11,6 @@ additionalProperties: beanValidations: "true" interfaceOnly: true reactive: true - declarativeInterfaceWrapResponses: true + useResponseEntity: true useFlowForArrayReturnType: false declarativeInterfaceReactiveMode: "reactor" diff --git a/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml b/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml index 978584977ae2..ce0d79f6e97b 100644 --- a/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml +++ b/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml @@ -11,5 +11,5 @@ additionalProperties: beanValidations: "true" interfaceOnly: true reactive: false - declarativeInterfaceWrapResponses: true + useResponseEntity: true useFlowForArrayReturnType: false diff --git a/bin/configs/kotlin-spring-declarative-interface.yaml b/bin/configs/kotlin-spring-declarative-interface.yaml index 436e59186636..da5c9c0a8854 100644 --- a/bin/configs/kotlin-spring-declarative-interface.yaml +++ b/bin/configs/kotlin-spring-declarative-interface.yaml @@ -11,5 +11,5 @@ additionalProperties: beanValidations: "true" interfaceOnly: true reactive: false - declarativeInterfaceWrapResponses: true + useResponseEntity: true useFlowForArrayReturnType: false diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index f9334caaccca..9dfba5d3e6c8 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -28,7 +28,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl |beanQualifiers|Whether to add fully-qualifier class names as bean qualifiers in @Component and @RestController annotations. May be used to prevent bean names clash if multiple generated libraries (contexts) added to single project.| |false| |configPackage|configuration package for generated code| |org.openapitools.configuration| |declarativeInterfaceReactiveMode|What type of reactive style to use in Spring Http declarative interface|
**coroutines**
Use kotlin-idiomatic 'suspend' functions
**reactor**
Use reactor return wrappers 'Mono' and 'Flux'
|coroutines| -|declarativeInterfaceWrapResponses|Whether (when false) to return actual type (e.g. List<Fruit>) and handle non 2xx responses via exceptions or (when true) return entire ResponseEntity (e.g. ResponseEntity<List<Fruit>>)| |false| |delegatePattern|Whether to generate the server files using the delegate pattern| |false| |documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**source**
Publish the original input OpenAPI specification.
**springfox**
Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using SpringFox 2.x. Deprecated (for removal); use springdoc instead.
**springdoc**
Generate an OpenAPI 3 specification using SpringDoc.
|springdoc| |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original| @@ -56,6 +55,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useBeanValidation|Use BeanValidation API annotations to validate data types| |true| |useFeignClientUrl|Whether to generate Feign client with url parameter.| |true| |useFlowForArrayReturnType|Whether to use Flow for array/collection return types when reactive is enabled. If false, will use List instead.| |true| +|useResponseEntity|Whether (when false) to return actual type (e.g. List<Fruit>) and handle non-happy path responses via exceptions flow or (when true) return entire ResponseEntity (e.g. ResponseEntity<List<Fruit>>). If disabled, method are annotated using a @ResponseStatus annotation, which has the status of the first response declared in the Api definition| |true| |useSpringBoot3|Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.| |false| |useSwaggerUI|Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies| |true| |useTags|Whether to use tags for creating interface and controller class names| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 448561f250ac..fb41df632c4a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -85,7 +85,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String DELEGATE_PATTERN = "delegatePattern"; public static final String USE_TAGS = "useTags"; public static final String BEAN_QUALIFIERS = "beanQualifiers"; - public static final String DECLARATIVE_INTERFACE_WRAP_RESPONSES = "declarativeInterfaceWrapResponses"; + public static final String USE_RESPONSE_ENTITY = "useResponseEntity"; public static final String DECLARATIVE_INTERFACE_REACTIVE_MODE = "declarativeInterfaceReactiveMode"; public static final String USE_SPRING_BOOT3 = "useSpringBoot3"; @@ -109,6 +109,7 @@ public enum DeclarativeInterfaceReactiveMode { } } + public enum RequestMappingMode { api_interface("Generate the @RequestMapping annotation on the generated Api Interface."), controller("Generate the @RequestMapping annotation on the generated Api Controller Implementation."), @@ -155,7 +156,7 @@ public String getDescription() { @Setter protected boolean useTags = false; @Setter private boolean beanQualifiers = false; @Setter private DeclarativeInterfaceReactiveMode declarativeInterfaceReactiveMode = DeclarativeInterfaceReactiveMode.coroutines; - @Setter private boolean declarativeInterfaceWrapResponses = false; + @Setter private boolean useResponseEntity = true; @Getter @Setter protected boolean useSpringBoot3 = false; @@ -242,9 +243,9 @@ public KotlinSpringServerCodegen() { addSwitch(USE_SPRING_BOOT3, "Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.", useSpringBoot3); addSwitch(USE_FLOW_FOR_ARRAY_RETURN_TYPE, "Whether to use Flow for array/collection return types when reactive is enabled. If false, will use List instead.", useFlowForArrayReturnType); addSwitch(INCLUDE_HTTP_REQUEST_CONTEXT, "Whether to include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods.", includeHttpRequestContext); - addSwitch(DECLARATIVE_INTERFACE_WRAP_RESPONSES, - "Whether (when false) to return actual type (e.g. List) and handle non 2xx responses via exceptions or (when true) return entire ResponseEntity (e.g. ResponseEntity>)", - declarativeInterfaceWrapResponses); + addSwitch(USE_RESPONSE_ENTITY, + "Whether (when false) to return actual type (e.g. List) and handle non-happy path responses via exceptions flow or (when true) return entire ResponseEntity (e.g. ResponseEntity>). If disabled, method are annotated using a @ResponseStatus annotation, which has the status of the first response declared in the Api definition", + useResponseEntity); supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application."); supportedLibraries.put(SPRING_CLOUD_LIBRARY, "Spring-Cloud-Feign client with Spring-Boot auto-configured settings."); @@ -468,6 +469,11 @@ public void processOpts() { additionalProperties.put(CodegenConstants.LIBRARY, library); } + if(additionalProperties.containsKey(USE_RESPONSE_ENTITY)) { + this.setUseResponseEntity(Boolean.parseBoolean(additionalProperties.get(USE_RESPONSE_ENTITY).toString())); + } + writePropertyBack(USE_RESPONSE_ENTITY, useResponseEntity); + // Set basePackage from invokerPackage if (!additionalProperties.containsKey(BASE_PACKAGE) && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 5a371f6309c6..9fd649794f59 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -20,7 +20,9 @@ import io.swagger.annotations.AuthorizationScope {{/swagger1AnnotationLibrary}} import org.springframework.http.HttpStatus import org.springframework.http.MediaType +{{#useResponseEntity}} import org.springframework.http.ResponseEntity +{{/useResponseEntity}} import org.springframework.web.bind.annotation.* {{#useBeanValidation}} @@ -63,6 +65,9 @@ import kotlin.collections.Map class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { {{#operation}} + {{^useResponseEntity}} + @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}) + {{/useResponseEntity}} {{#swagger2AnnotationLibrary}} @Operation( summary = "{{{summary}}}", @@ -89,7 +94,7 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): ResponseEntity<{{>returnTypes}}> { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} { return {{>returnValue}} } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache index a5435b944e3c..5ae576a08bec 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache @@ -4,7 +4,9 @@ package {{package}} {{/imports}} import org.springframework.http.HttpStatus import org.springframework.http.MediaType +{{#useResponseEntity}} import org.springframework.http.ResponseEntity +{{/useResponseEntity}} import org.springframework.web.context.request.NativeWebRequest {{#appendRequestToHandler}} import org.springframework.http.server.reactive.ServerHttpRequest @@ -32,7 +34,7 @@ interface {{classname}}Delegate { */ {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}{{#isBodyParam}}Flow<{{{baseType}}}>{{/isBodyParam}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{/isArray}}{{/reactive}}{{^-last}}, {{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, - {{/hasParams}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultDelegateInterface}} { + {{/hasParams}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{^skipDefaultDelegateInterface}} { {{>methodBody}}{{! prevent indent}} }{{/skipDefaultDelegateInterface}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 386a41479b5b..169f06f402ac 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -25,7 +25,9 @@ import io.swagger.annotations.AuthorizationScope {{/swagger1AnnotationLibrary}} import org.springframework.http.HttpStatus import org.springframework.http.MediaType +{{#useResponseEntity}} import org.springframework.http.ResponseEntity +{{/useResponseEntity}} import org.springframework.web.bind.annotation.* {{#useBeanValidation}} @@ -74,6 +76,9 @@ interface {{classname}} { {{/isDelegate}} {{#operation}} + {{^useResponseEntity}} + @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}) + {{/useResponseEntity}} {{#swagger2AnnotationLibrary}} @Operation( tags = [{{#tags}}"{{{name}}}",{{/tags}}], @@ -102,7 +107,7 @@ interface {{classname}} { produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultApiInterface}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{^skipDefaultApiInterface}} { {{^isDelegate}} return {{>returnValue}} {{/isDelegate}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache index 32b1134d7e46..eda2afcd0c18 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache @@ -7,7 +7,12 @@ import org.junit.jupiter.api.Test import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.test.runBlockingTest {{/reactive}} +{{^useResponseEntity}} +import org.springframework.http.HttpStatus +{{/useResponseEntity}} +{{#useResponseEntity}} import org.springframework.http.ResponseEntity +{{/useResponseEntity}} class {{classname}}Test { @@ -30,7 +35,7 @@ class {{classname}}Test { val {{{paramName}}}: {{>optionalDataType}} = TODO() {{/allParams}} {{#includeHttpRequestContext}}val {{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}} = TODO(){{/includeHttpRequestContext}} - val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#reactive}}exchange{{/reactive}}{{^reactive}}request{{/reactive}}{{/includeHttpRequestContext}}) + val response: {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} = api.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#reactive}}exchange{{/reactive}}{{^reactive}}request{{/reactive}}{{/includeHttpRequestContext}}) // TODO: test validations } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache index 6f724779ff6c..f2a784ddba05 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache @@ -29,7 +29,9 @@ import io.swagger.annotations.AuthorizationScope import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* +{{#useResponseEntity}} import org.springframework.http.ResponseEntity +{{/useResponseEntity}} {{#useBeanValidation}} import org.springframework.validation.annotation.Validated diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceReturnTypes.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceReturnTypes.mustache index 86f9cea77382..9ea0fdf05f16 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceReturnTypes.mustache @@ -1,47 +1,47 @@ {{! handle reactive map and array}} {{#reactive}} {{#isMap}} -{{#reactiveModeReactor}}Mono<{{/reactiveModeReactor}}{{#declarativeInterfaceWrapResponses}}ResponseEntity<{{/declarativeInterfaceWrapResponses}}Map{{#declarativeInterfaceWrapResponses}}>{{/declarativeInterfaceWrapResponses}}{{#reactiveModeReactor}}>{{/reactiveModeReactor}} +{{#reactiveModeReactor}}Mono<{{/reactiveModeReactor}}{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}Map{{#useResponseEntity}}>{{/useResponseEntity}}{{#reactiveModeReactor}}>{{/reactiveModeReactor}} {{/isMap}} {{#isArray}} {{! array handle reactive - reactor with/without ResponseEntity wrapper}} {{#reactiveModeReactor}} -{{#declarativeInterfaceWrapResponses}}Mono{{#declarativeInterfaceWrapResponses}}>>{{/declarativeInterfaceWrapResponses}} +{{#useResponseEntity}}Mono{{#useResponseEntity}}>>{{/useResponseEntity}} {{/reactiveModeReactor}} {{! array handle reactive - coroutines with/without ResponseEntity wrapper}} {{#reactiveModeCoroutines}} -{{#declarativeInterfaceWrapResponses}}ResponseEntity<{{/declarativeInterfaceWrapResponses}}{{{returnContainer}}}<{{{returnType}}}>{{#declarativeInterfaceWrapResponses}}>{{/declarativeInterfaceWrapResponses}} +{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{{returnContainer}}}<{{{returnType}}}>{{#useResponseEntity}}>{{/useResponseEntity}} {{/reactiveModeCoroutines}} {{/isArray}} {{! handle reactive non-container - with/without ResponseEntity wrapper}} {{^returnContainer}} {{#reactiveModeReactor}} -Mono<{{#declarativeInterfaceWrapResponses}}ResponseEntity<{{/declarativeInterfaceWrapResponses}}{{{returnType}}}{{#declarativeInterfaceWrapResponses}}>{{/declarativeInterfaceWrapResponses}}> +Mono<{{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{{returnType}}}{{#useResponseEntity}}>{{/useResponseEntity}}> {{/reactiveModeReactor}} {{#reactiveModeCoroutines}} -{{#declarativeInterfaceWrapResponses}} -ResponseEntity<{{/declarativeInterfaceWrapResponses}}{{{returnType}}}{{#declarativeInterfaceWrapResponses}}> -{{/declarativeInterfaceWrapResponses}} +{{#useResponseEntity}} +ResponseEntity<{{/useResponseEntity}}{{{returnType}}}{{#useResponseEntity}}> +{{/useResponseEntity}} {{/reactiveModeCoroutines}} {{/returnContainer}} {{/reactive}} {{^reactive}} {{! handle non-reactive map and array}} {{#isMap}} -{{#declarativeInterfaceWrapResponses}} -ResponseEntity<{{/declarativeInterfaceWrapResponses}}Map{{#declarativeInterfaceWrapResponses}}> -{{/declarativeInterfaceWrapResponses}} +{{#useResponseEntity}} +ResponseEntity<{{/useResponseEntity}}Map{{#useResponseEntity}}> +{{/useResponseEntity}} {{/isMap}} {{#isArray}} {{! array handle non-reactive - with/without ResponseEntity wrapper}} -{{#declarativeInterfaceWrapResponses}} -ResponseEntity<{{/declarativeInterfaceWrapResponses}}{{{returnContainer}}}<{{{returnType}}}>{{#declarativeInterfaceWrapResponses}}> -{{/declarativeInterfaceWrapResponses}} +{{#useResponseEntity}} +ResponseEntity<{{/useResponseEntity}}{{{returnContainer}}}<{{{returnType}}}>{{#useResponseEntity}}> +{{/useResponseEntity}} {{/isArray}} {{! handle reactive non-container - with/without ResponseEntity wrapper}} {{^returnContainer}} -{{#declarativeInterfaceWrapResponses}} -ResponseEntity<{{/declarativeInterfaceWrapResponses}}{{{returnType}}}{{#declarativeInterfaceWrapResponses}}> -{{/declarativeInterfaceWrapResponses}} +{{#useResponseEntity}} +ResponseEntity<{{/useResponseEntity}}{{{returnType}}}{{#useResponseEntity}}> +{{/useResponseEntity}} {{/returnContainer}} {{/reactive}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache index 1ea16de46f8f..0a6660b342a8 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/methodBody.mustache @@ -11,13 +11,13 @@ getRequest().ifPresent { request -> {{#-last}} } } - return ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) + return {{#useResponseEntity}}ResponseEntity({{#returnSuccessCode}}HttpStatus.valueOf({{{statusCode}}}){{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}){{/useResponseEntity}}{{^useResponseEntity}}TODO("Not yet implemented"){{/useResponseEntity}} {{/-last}} {{/examples}} {{^examples}} -return ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) +return {{#useResponseEntity}}ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}){{/useResponseEntity}}{{^useResponseEntity}}TODO("Not yet implemented"){{/useResponseEntity}} {{/examples}} {{/reactive}} {{#reactive}} -return ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}) +return {{#useResponseEntity}}ResponseEntity({{#returnSuccessCode}}HttpStatus.OK{{/returnSuccessCode}}{{^returnSuccessCode}}HttpStatus.NOT_IMPLEMENTED{{/returnSuccessCode}}){{/useResponseEntity}}{{^useResponseEntity}}TODO("Not yet implemented"){{/useResponseEntity}} {{/reactive}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/returnValue.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/returnValue.mustache index 8c7c1aa4f5ce..44336bb5db69 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/returnValue.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/returnValue.mustache @@ -1 +1,4 @@ -{{#serviceInterface}}ResponseEntity(service.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}), {{#responses}}{{#-first}}HttpStatus.valueOf({{code}}){{/-first}}{{/responses}}){{/serviceInterface}}{{^serviceInterface}}ResponseEntity(HttpStatus.NOT_IMPLEMENTED){{/serviceInterface}} \ No newline at end of file +{{!}}{{#useResponseEntity}}{{#serviceInterface}}ResponseEntity(service.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}), {{#responses}}{{#-first}}HttpStatus.valueOf({{code}}){{/-first}}{{/responses}}){{/serviceInterface}}{{/useResponseEntity}}{{! +---}}{{#useResponseEntity}}{{^serviceInterface}}ResponseEntity(HttpStatus.NOT_IMPLEMENTED){{/serviceInterface}}{{/useResponseEntity}}{{! +---}}{{^useResponseEntity}}{{#serviceInterface}}service.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}){{/serviceInterface}}{{/useResponseEntity}}{{! +---}}{{^useResponseEntity}}{{^serviceInterface}}TODO("Not yet implemented"){{/serviceInterface}}{{/useResponseEntity}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index b697029a4151..c86296f90f7a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -1038,7 +1038,7 @@ public void generateHttpInterfaceReactiveWithReactorResponseEntity() throws Exce codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface"); codegen.additionalProperties().put(REACTIVE, true); codegen.additionalProperties().put(DECLARATIVE_INTERFACE_REACTIVE_MODE, "reactor"); - codegen.additionalProperties().put(DECLARATIVE_INTERFACE_WRAP_RESPONSES, true); + codegen.additionalProperties().put(USE_RESPONSE_ENTITY, true); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none"); codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false); @@ -1105,7 +1105,7 @@ public void generateHttpInterfaceReactiveWithCoroutinesResponseEntity() throws E codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface"); codegen.additionalProperties().put(REACTIVE, true); codegen.additionalProperties().put(DECLARATIVE_INTERFACE_REACTIVE_MODE, "coroutines"); - codegen.additionalProperties().put(DECLARATIVE_INTERFACE_WRAP_RESPONSES, true); + codegen.additionalProperties().put(USE_RESPONSE_ENTITY, true); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none"); codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false); @@ -1147,7 +1147,7 @@ public void generateHttpInterfaceReactiveWithReactor() throws Exception { codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface"); codegen.additionalProperties().put(REACTIVE, true); codegen.additionalProperties().put(DECLARATIVE_INTERFACE_REACTIVE_MODE, "reactor"); - codegen.additionalProperties().put(DECLARATIVE_INTERFACE_WRAP_RESPONSES, false); + codegen.additionalProperties().put(USE_RESPONSE_ENTITY, false); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none"); codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false); @@ -1196,7 +1196,7 @@ public void generateHttpInterfaceReactiveWithCoroutines() throws Exception { codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface"); codegen.additionalProperties().put(REACTIVE, true); codegen.additionalProperties().put(DECLARATIVE_INTERFACE_REACTIVE_MODE, "coroutines"); - codegen.additionalProperties().put(DECLARATIVE_INTERFACE_WRAP_RESPONSES, false); + codegen.additionalProperties().put(USE_RESPONSE_ENTITY, false); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none"); codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false); @@ -1237,7 +1237,7 @@ public void generateHttpInterfaceResponseEntity() throws Exception { codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface"); codegen.additionalProperties().put(REACTIVE, false); - codegen.additionalProperties().put(DECLARATIVE_INTERFACE_WRAP_RESPONSES, true); + codegen.additionalProperties().put(USE_RESPONSE_ENTITY, true); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none"); codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false); @@ -1282,7 +1282,7 @@ public void generateHttpInterface() throws Exception { codegen.setOutputDir(output.getAbsolutePath()); codegen.additionalProperties().put(CodegenConstants.LIBRARY, "spring-declarative-http-interface"); codegen.additionalProperties().put(REACTIVE, false); - codegen.additionalProperties().put(DECLARATIVE_INTERFACE_WRAP_RESPONSES, false); + codegen.additionalProperties().put(USE_RESPONSE_ENTITY, false); codegen.additionalProperties().put(REQUEST_MAPPING_OPTION, "none"); codegen.additionalProperties().put(USE_FLOW_FOR_ARRAY_RETURN_TYPE, false); diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 986ac550b93a..5f78b78f0162 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -15,7 +15,6 @@ import io.swagger.v3.oas.annotations.security.* import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* -import org.springframework.http.ResponseEntity import org.springframework.validation.annotation.Validated import jakarta.validation.Valid diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index b0d74b2a4807..b5e2ac2f18e1 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt @@ -14,7 +14,6 @@ import io.swagger.v3.oas.annotations.security.* import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* -import org.springframework.http.ResponseEntity import org.springframework.validation.annotation.Validated import jakarta.validation.Valid diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt index dff2d3849af6..714efdfebc62 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt @@ -14,7 +14,6 @@ import io.swagger.v3.oas.annotations.security.* import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* -import org.springframework.http.ResponseEntity import org.springframework.validation.annotation.Validated import jakarta.validation.Valid From d1863063d89438751ca56b097013c048600a3a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 19 Nov 2025 09:37:57 +0100 Subject: [PATCH 08/19] fix status annotation and add compile-test samples --- .../samples-kotlin-server-jdk17.yaml | 1 + .github/workflows/samples-kotlin-server.yaml | 2 + ...tlin-spring-boot-3-no-response-entity.yaml | 14 + ...ring-boot-no-response-entity-delegate.yaml | 15 ++ ...kotlin-spring-boot-no-response-entity.yaml | 14 + .../languages/KotlinSpringServerCodegen.java | 2 + .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 27 ++ .../.openapi-generator/VERSION | 1 + .../README.md | 21 ++ .../build.gradle.kts | 42 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../gradlew | 249 ++++++++++++++++++ .../gradlew.bat | 92 +++++++ .../pom.xml | 144 ++++++++++ .../settings.gradle | 15 ++ .../kotlin/org/openapitools/Application.kt | 13 + .../kotlin/org/openapitools/api/ApiUtil.kt | 19 ++ .../kotlin/org/openapitools/api/Exceptions.kt | 30 +++ .../org/openapitools/api/PetApiController.kt | 112 ++++++++ .../org/openapitools/api/PetApiService.kt | 103 ++++++++ .../org/openapitools/api/PetApiServiceImpl.kt | 40 +++ .../openapitools/api/StoreApiController.kt | 69 +++++ .../org/openapitools/api/StoreApiService.kt | 49 ++++ .../openapitools/api/StoreApiServiceImpl.kt | 23 ++ .../org/openapitools/api/UserApiController.kt | 107 ++++++++ .../org/openapitools/api/UserApiService.kt | 92 +++++++ .../openapitools/api/UserApiServiceImpl.kt | 39 +++ .../kotlin/org/openapitools/model/Category.kt | 34 +++ .../openapitools/model/ModelApiResponse.kt | 36 +++ .../kotlin/org/openapitools/model/Order.kt | 67 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 72 +++++ .../main/kotlin/org/openapitools/model/Tag.kt | 33 +++ .../kotlin/org/openapitools/model/User.kt | 51 ++++ .../src/main/resources/application.yaml | 10 + .../kotlin/org/openapitools/api/PetApiTest.kt | 137 ++++++++++ .../org/openapitools/api/StoreApiTest.kt | 70 +++++ .../org/openapitools/api/UserApiTest.kt | 132 ++++++++++ .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 34 +++ .../.openapi-generator/VERSION | 1 + .../README.md | 21 ++ .../build.gradle.kts | 48 ++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../gradlew | 249 ++++++++++++++++++ .../gradlew.bat | 92 +++++++ .../pom.xml | 131 +++++++++ .../settings.gradle | 15 ++ .../kotlin/org/openapitools/Application.kt | 13 + .../kotlin/org/openapitools/api/ApiUtil.kt | 19 ++ .../kotlin/org/openapitools/api/Exceptions.kt | 30 +++ .../kotlin/org/openapitools/api/PetApi.kt | 124 +++++++++ .../org/openapitools/api/PetApiController.kt | 20 ++ .../org/openapitools/api/PetApiDelegate.kt | 140 ++++++++++ .../org/openapitools/api/PetApiService.kt | 94 +++++++ .../org/openapitools/api/PetApiServiceImpl.kt | 40 +++ .../kotlin/org/openapitools/api/StoreApi.kt | 78 ++++++ .../openapitools/api/StoreApiController.kt | 20 ++ .../org/openapitools/api/StoreApiDelegate.kt | 78 ++++++ .../org/openapitools/api/StoreApiService.kt | 48 ++++ .../openapitools/api/StoreApiServiceImpl.kt | 23 ++ .../kotlin/org/openapitools/api/UserApi.kt | 117 ++++++++ .../org/openapitools/api/UserApiController.kt | 20 ++ .../org/openapitools/api/UserApiDelegate.kt | 104 ++++++++ .../org/openapitools/api/UserApiService.kt | 87 ++++++ .../openapitools/api/UserApiServiceImpl.kt | 39 +++ .../kotlin/org/openapitools/model/Category.kt | 33 +++ .../openapitools/model/ModelApiResponse.kt | 36 +++ .../kotlin/org/openapitools/model/Order.kt | 67 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 71 +++++ .../main/kotlin/org/openapitools/model/Tag.kt | 33 +++ .../kotlin/org/openapitools/model/User.kt | 51 ++++ .../src/main/resources/application.yaml | 10 + .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 27 ++ .../.openapi-generator/VERSION | 1 + .../README.md | 21 ++ .../build.gradle.kts | 48 ++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../gradlew | 249 ++++++++++++++++++ .../gradlew.bat | 92 +++++++ .../pom.xml | 131 +++++++++ .../settings.gradle | 15 ++ .../kotlin/org/openapitools/Application.kt | 13 + .../kotlin/org/openapitools/api/ApiUtil.kt | 19 ++ .../kotlin/org/openapitools/api/Exceptions.kt | 30 +++ .../org/openapitools/api/PetApiController.kt | 118 +++++++++ .../org/openapitools/api/PetApiService.kt | 94 +++++++ .../org/openapitools/api/PetApiServiceImpl.kt | 40 +++ .../openapitools/api/StoreApiController.kt | 72 +++++ .../org/openapitools/api/StoreApiService.kt | 48 ++++ .../openapitools/api/StoreApiServiceImpl.kt | 23 ++ .../org/openapitools/api/UserApiController.kt | 111 ++++++++ .../org/openapitools/api/UserApiService.kt | 87 ++++++ .../openapitools/api/UserApiServiceImpl.kt | 39 +++ .../kotlin/org/openapitools/model/Category.kt | 33 +++ .../openapitools/model/ModelApiResponse.kt | 36 +++ .../kotlin/org/openapitools/model/Order.kt | 67 +++++ .../main/kotlin/org/openapitools/model/Pet.kt | 71 +++++ .../main/kotlin/org/openapitools/model/Tag.kt | 33 +++ .../kotlin/org/openapitools/model/User.kt | 51 ++++ .../src/main/resources/application.yaml | 10 + .../kotlin/org/openapitools/api/PetApiTest.kt | 137 ++++++++++ .../org/openapitools/api/StoreApiTest.kt | 70 +++++ .../org/openapitools/api/UserApiTest.kt | 132 ++++++++++ 108 files changed, 5971 insertions(+) create mode 100644 bin/configs/kotlin-spring-boot-3-no-response-entity.yaml create mode 100644 bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml create mode 100644 bin/configs/kotlin-spring-boot-no-response-entity.yaml create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator-ignore create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/FILES create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/VERSION create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/README.md create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/gradlew create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/gradlew.bat create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/settings.gradle create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/Application.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/resources/application.yaml create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator-ignore create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/VERSION create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/README.md create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/build.gradle.kts create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradlew create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradlew.bat create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/pom.xml create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/settings.gradle create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/Application.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/ApiUtil.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/resources/application.yaml create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator-ignore create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/FILES create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/VERSION create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/README.md create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/build.gradle.kts create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/gradlew create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/gradlew.bat create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/pom.xml create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/settings.gradle create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/Application.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/main/resources/application.yaml create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt diff --git a/.github/workflows/samples-kotlin-server-jdk17.yaml b/.github/workflows/samples-kotlin-server-jdk17.yaml index 22d45ef94c88..999e2f4d817b 100644 --- a/.github/workflows/samples-kotlin-server-jdk17.yaml +++ b/.github/workflows/samples-kotlin-server-jdk17.yaml @@ -36,6 +36,7 @@ jobs: # server - samples/server/petstore/kotlin-server-required-and-nullable-properties - samples/server/petstore/kotlin-springboot-3 + - samples/server/petstore/kotlin-springboot-3-no-response-entity - samples/server/petstore/kotlin-springboot-additionalproperties - samples/server/petstore/kotlin-springboot-delegate-nodefaults - samples/server/petstore/kotlin-springboot-request-cookie diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml index 5b6f3f0a0884..0ab8e5389059 100644 --- a/.github/workflows/samples-kotlin-server.yaml +++ b/.github/workflows/samples-kotlin-server.yaml @@ -29,6 +29,8 @@ jobs: sample: # server - samples/server/petstore/kotlin-springboot + - samples/server/petstore/kotlin-springboot-no-response-entity + - samples/server/petstore/kotlin-springboot-no-response-entity-delegate - samples/server/petstore/kotlin-springboot-multipart-request-model - samples/server/petstore/kotlin-springboot-bigdecimal-default - samples/server/petstore/kotlin-springboot-delegate diff --git a/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml b/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml new file mode 100644 index 000000000000..661548dcd783 --- /dev/null +++ b/bin/configs/kotlin-spring-boot-3-no-response-entity.yaml @@ -0,0 +1,14 @@ +generatorName: kotlin-spring +outputDir: samples/server/petstore/kotlin-springboot-3-no-response-entity +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + documentationProvider: none + annotationLibrary: none + useSwaggerUI: "false" + serviceImplementation: "true" + serializableModel: "true" + beanValidations: "true" + useSpringBoot3: "true" + requestMappingMode: api_interface diff --git a/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml b/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml new file mode 100644 index 000000000000..00c2a32823f8 --- /dev/null +++ b/bin/configs/kotlin-spring-boot-no-response-entity-delegate.yaml @@ -0,0 +1,15 @@ +generatorName: kotlin-spring +outputDir: samples/server/petstore/kotlin-springboot-no-response-entity-delegate +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + documentationProvider: none + annotationLibrary: none + useSwaggerUI: "false" + serviceImplementation: "true" + serializableModel: "true" + beanValidations: "true" + useResponseEntity: "false" + delegatePattern: true + requestMappingMode: controller diff --git a/bin/configs/kotlin-spring-boot-no-response-entity.yaml b/bin/configs/kotlin-spring-boot-no-response-entity.yaml new file mode 100644 index 000000000000..d4d1daa263d5 --- /dev/null +++ b/bin/configs/kotlin-spring-boot-no-response-entity.yaml @@ -0,0 +1,14 @@ +generatorName: kotlin-spring +outputDir: samples/server/petstore/kotlin-springboot-no-response-entity +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + documentationProvider: none + annotationLibrary: none + useSwaggerUI: "false" + serviceImplementation: "true" + serializableModel: "true" + beanValidations: "true" + useResponseEntity: "false" + requestMappingMode: controller diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index fb41df632c4a..62404681c5cb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -33,6 +33,7 @@ import org.openapitools.codegen.model.ModelsMap; import org.openapitools.codegen.model.OperationMap; import org.openapitools.codegen.model.OperationsMap; +import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; @@ -473,6 +474,7 @@ public void processOpts() { this.setUseResponseEntity(Boolean.parseBoolean(additionalProperties.get(USE_RESPONSE_ENTITY).toString())); } writePropertyBack(USE_RESPONSE_ENTITY, useResponseEntity); + additionalProperties.put("springHttpStatus", new SpringHttpStatusLambda()); // Set basePackage from invokerPackage if (!additionalProperties.containsKey(BASE_PACKAGE) diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/FILES new file mode 100644 index 000000000000..c7afb2eda91e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/FILES @@ -0,0 +1,27 @@ +README.md +build.gradle.kts +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/kotlin/org/openapitools/Application.kt +src/main/kotlin/org/openapitools/api/ApiUtil.kt +src/main/kotlin/org/openapitools/api/Exceptions.kt +src/main/kotlin/org/openapitools/api/PetApiController.kt +src/main/kotlin/org/openapitools/api/PetApiService.kt +src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/StoreApiController.kt +src/main/kotlin/org/openapitools/api/StoreApiService.kt +src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/UserApiController.kt +src/main/kotlin/org/openapitools/api/UserApiService.kt +src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +src/main/kotlin/org/openapitools/model/Category.kt +src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +src/main/kotlin/org/openapitools/model/Order.kt +src/main/kotlin/org/openapitools/model/Pet.kt +src/main/kotlin/org/openapitools/model/Tag.kt +src/main/kotlin/org/openapitools/model/User.kt +src/main/resources/application.yaml diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/VERSION new file mode 100644 index 000000000000..2fb556b60635 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.18.0-SNAPSHOT diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/README.md b/samples/server/petstore/kotlin-springboot-3-no-response-entity/README.md new file mode 100644 index 000000000000..b6865a081135 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/README.md @@ -0,0 +1,21 @@ +# openAPIPetstore + +This Kotlin based [Spring Boot](https://spring.io/projects/spring-boot) application has been generated using the [OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator). + +## Getting Started + +This document assumes you have either maven or gradle available, either via the wrapper or otherwise. This does not come with a gradle / maven wrapper checked in. + +By default a [`pom.xml`](pom.xml) file will be generated. If you specified `gradleBuildFile=true` when generating this project, a `build.gradle.kts` will also be generated. Note this uses [Gradle Kotlin DSL](https://github.com/gradle/kotlin-dsl). + +To build the project using maven, run: +```bash +mvn package && java -jar target/openapi-spring-1.0.0.jar +``` + +To build the project using gradle, run: +```bash +gradle build && java -jar build/libs/openapi-spring-1.0.0.jar +``` + +If all builds successfully, the server should run on [http://localhost:8080/](http://localhost:8080/) diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts new file mode 100644 index 000000000000..473c0162e0f4 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts @@ -0,0 +1,42 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +group = "org.openapitools" +version = "1.0.0" +java.sourceCompatibility = JavaVersion.VERSION_17 + +repositories { + mavenCentral() + maven { url = uri("https://repo.spring.io/milestone") } +} + +tasks.withType { + kotlinOptions.jvmTarget = "17" +} + +plugins { + val kotlinVersion = "1.9.25" + id("org.jetbrains.kotlin.jvm") version kotlinVersion + id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion + id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion + id("org.springframework.boot") version "3.0.2" + id("io.spring.dependency-management") version "1.0.14.RELEASE" +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-web") + + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("jakarta.validation:jakarta.validation-api") + implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") + + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude(module = "junit") + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-3-no-response-entity/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/gradlew.bat b/samples/server/petstore/kotlin-springboot-3-no-response-entity/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml b/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml new file mode 100644 index 000000000000..3c52a401bf8a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml @@ -0,0 +1,144 @@ + + 4.0.0 + org.openapitools + openapi-spring + jar + openapi-spring + 1.0.0 + + 3.0.2 + 2.1.0 + 1.7.10 + + 1.7.10 + UTF-8 + + + org.springframework.boot + spring-boot-starter-parent + 3.1.3 + + + + repository.spring.milestone + Spring Milestone Repository + https://repo.spring.io/milestone + + + + + spring-milestones + https://repo.spring.io/milestone + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + spring + + 17 + + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + org.jetbrains.kotlin + kotlin-maven-allopen + ${kotlin.version} + + + + + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin.version} + + + org.springframework.boot + spring-boot-starter-web + + + + + + + com.google.code.findbugs + jsr305 + ${findbugs-jsr305.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.fasterxml.jackson.module + jackson-module-kotlin + + + + jakarta.validation + jakarta.validation-api + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} + provided + + + org.jetbrains.kotlin + kotlin-test-junit5 + ${kotlin-test-junit5.version} + test + + + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/settings.gradle b/samples/server/petstore/kotlin-springboot-3-no-response-entity/settings.gradle new file mode 100644 index 000000000000..14844905cd40 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/settings.gradle @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + maven { url = uri("https://repo.spring.io/snapshot") } + maven { url = uri("https://repo.spring.io/milestone") } + gradlePluginPortal() + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.springframework.boot") { + useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}") + } + } + } +} +rootProject.name = "openapi-spring" diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/Application.kt new file mode 100644 index 000000000000..2fe6de62479e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/Application.kt @@ -0,0 +1,13 @@ +package org.openapitools + +import org.springframework.boot.runApplication +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.ComponentScan + +@SpringBootApplication +@ComponentScan(basePackages = ["org.openapitools", "org.openapitools.api", "org.openapitools.model"]) +class Application + +fun main(args: Array) { + runApplication(*args) +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt new file mode 100644 index 000000000000..03344e13b474 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -0,0 +1,19 @@ +package org.openapitools.api + +import org.springframework.web.context.request.NativeWebRequest + +import jakarta.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?.characterEncoding = "UTF-8" + res?.addHeader("Content-Type", contentType) + res?.writer?.print(example) + } catch (e: IOException) { + throw RuntimeException(e) + } + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt new file mode 100644 index 000000000000..1bd78f54576a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt @@ -0,0 +1,30 @@ +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 +import jakarta.servlet.http.HttpServletResponse +import jakarta.validation.ConstraintViolationException + +// TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception +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 { + + @ExceptionHandler(value = [ApiException::class]) + fun onApiException(ex: ApiException, response: HttpServletResponse): Unit = + response.sendError(ex.code, ex.message) + + @ExceptionHandler(value = [NotImplementedError::class]) + fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit = + 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 }) +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt new file mode 100644 index 000000000000..da8c6b076bb5 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -0,0 +1,112 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +class PetApiController(@Autowired(required = true) val service: PetApiService) { + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] + ) + fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { + return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] + ) + fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] + ) + fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] + ) + fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { + return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt new file mode 100644 index 000000000000..031da963d22d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt @@ -0,0 +1,103 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet + +interface PetApiService { + + /** + * POST /pet : Add a new pet to the store + * + * + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid input (status code 405) + * @see PetApi#addPet + */ + fun addPet(pet: Pet): Pet + + /** + * DELETE /pet/{petId} : Deletes a pet + * + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @return Invalid pet value (status code 400) + * @see PetApi#deletePet + */ + fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit + + /** + * GET /pet/findByStatus : Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return successful operation (status code 200) + * or Invalid status value (status code 400) + * @see PetApi#findPetsByStatus + */ + fun findPetsByStatus(status: kotlin.collections.List): List + + /** + * GET /pet/findByTags : Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return successful operation (status code 200) + * or Invalid tag value (status code 400) + * @deprecated + * @see PetApi#findPetsByTags + */ + fun findPetsByTags(tags: kotlin.collections.List): List + + /** + * GET /pet/{petId} : Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * @see PetApi#getPetById + */ + fun getPetById(petId: kotlin.Long): Pet + + /** + * PUT /pet : Update an existing pet + * + * + * @param pet Pet object that needs to be added to the store (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * or Validation exception (status code 405) + * API documentation for the updatePet operation + * @see Update an existing pet Documentation + * @see PetApi#updatePet + */ + fun updatePet(pet: Pet): Pet + + /** + * POST /pet/{petId} : Updates a pet in the store with form data + * + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @return Invalid input (status code 405) + * @see PetApi#updatePetWithForm + */ + fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit + + /** + * POST /pet/{petId}/uploadImage : uploads an image + * + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return successful operation (status code 200) + * @see PetApi#uploadFile + */ + fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile): ModelApiResponse +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt new file mode 100644 index 000000000000..6600f5535137 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt @@ -0,0 +1,40 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.stereotype.Service +@Service +class PetApiServiceImpl : PetApiService { + + override fun addPet(pet: Pet): Pet { + TODO("Implement me") + } + + override fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun findPetsByStatus(status: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun findPetsByTags(tags: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun getPetById(petId: kotlin.Long): Pet { + TODO("Implement me") + } + + override fun updatePet(pet: Pet): Pet { + TODO("Implement me") + } + + override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt new file mode 100644 index 000000000000..dfec4ecc73fc --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -0,0 +1,69 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +class StoreApiController(@Autowired(required = true) val service: StoreApiService) { + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] + ) + fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] + ) + fun getInventory(): ResponseEntity> { + return ResponseEntity(service.getInventory(), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] + ) + fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"], + consumes = ["application/json"] + ) + fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { + return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt new file mode 100644 index 000000000000..474b51456b27 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt @@ -0,0 +1,49 @@ +package org.openapitools.api + +import org.openapitools.model.Order + +interface StoreApiService { + + /** + * DELETE /store/order/{orderId} : Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @param orderId ID of the order that needs to be deleted (required) + * @return Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#deleteOrder + */ + fun deleteOrder(orderId: kotlin.String): Unit + + /** + * GET /store/inventory : Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return successful operation (status code 200) + * @see StoreApi#getInventory + */ + fun getInventory(): Map + + /** + * GET /store/order/{orderId} : Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#getOrderById + */ + fun getOrderById(orderId: kotlin.Long): Order + + /** + * POST /store/order : Place an order for a pet + * + * + * @param order order placed for purchasing the pet (required) + * @return successful operation (status code 200) + * or Invalid Order (status code 400) + * @see StoreApi#placeOrder + */ + fun placeOrder(order: Order): Order +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt new file mode 100644 index 000000000000..70e1e76b06b3 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt @@ -0,0 +1,23 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.stereotype.Service +@Service +class StoreApiServiceImpl : StoreApiService { + + override fun deleteOrder(orderId: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getInventory(): Map { + TODO("Implement me") + } + + override fun getOrderById(orderId: kotlin.Long): Order { + TODO("Implement me") + } + + override fun placeOrder(order: Order): Order { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt new file mode 100644 index 000000000000..ce2c67c60423 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -0,0 +1,107 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +class UserApiController(@Autowired(required = true) val service: UserApiService) { + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] + ) + fun createUser( @Valid @RequestBody user: User): ResponseEntity { + return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] + ) + fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] + ) + fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/user/{username}"] + ) + fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] + ) + fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/logout"] + ) + fun logoutUser(): ResponseEntity { + return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] + ) + fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { + return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt new file mode 100644 index 000000000000..8c28d098389a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt @@ -0,0 +1,92 @@ +package org.openapitools.api + +import org.openapitools.model.User + +interface UserApiService { + + /** + * POST /user : Create user + * This can only be done by the logged in user. + * + * @param user Created user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUser + */ + fun createUser(user: User): Unit + + /** + * POST /user/createWithArray : Creates list of users with given input array + * + * + * @param user List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithArrayInput + */ + fun createUsersWithArrayInput(user: kotlin.collections.List): Unit + + /** + * POST /user/createWithList : Creates list of users with given input array + * + * + * @param user List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithListInput + */ + fun createUsersWithListInput(user: kotlin.collections.List): Unit + + /** + * DELETE /user/{username} : Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + * @return Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#deleteUser + */ + fun deleteUser(username: kotlin.String): Unit + + /** + * GET /user/{username} : Get user by user name + * + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return successful operation (status code 200) + * or Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#getUserByName + */ + fun getUserByName(username: kotlin.String): User + + /** + * GET /user/login : Logs user into the system + * + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return successful operation (status code 200) + * or Invalid username/password supplied (status code 400) + * @see UserApi#loginUser + */ + fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String + + /** + * GET /user/logout : Logs out current logged in user session + * + * + * @return successful operation (status code 200) + * @see UserApi#logoutUser + */ + fun logoutUser(): Unit + + /** + * PUT /user/{username} : Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param user Updated user object (required) + * @return Invalid user supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#updateUser + */ + fun updateUser(username: kotlin.String, user: User): Unit +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt new file mode 100644 index 000000000000..0c24688975c9 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt @@ -0,0 +1,39 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.stereotype.Service +@Service +class UserApiServiceImpl : UserApiService { + + override fun createUser(user: User): Unit { + TODO("Implement me") + } + + override fun createUsersWithArrayInput(user: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun createUsersWithListInput(user: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun deleteUser(username: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getUserByName(username: kotlin.String): User { + TODO("Implement me") + } + + override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + TODO("Implement me") + } + + override fun logoutUser(): Unit { + TODO("Implement me") + } + + override fun updateUser(username: kotlin.String, user: User): Unit { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt new file mode 100644 index 000000000000..50cfbcf80623 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt @@ -0,0 +1,34 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import jakarta.validation.Valid + +/** + * A category for a pet + * @param id + * @param name + */ +data class Category( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt new file mode 100644 index 000000000000..4d12f23ba411 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -0,0 +1,36 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import jakarta.validation.Valid + +/** + * Describes the result of uploading an image resource + * @param code + * @param type + * @param message + */ +data class ModelApiResponse( + + @get:JsonProperty("code") val code: kotlin.Int? = null, + + @get:JsonProperty("type") val type: kotlin.String? = null, + + @get:JsonProperty("message") val message: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt new file mode 100644 index 000000000000..bee507c64e65 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt @@ -0,0 +1,67 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import java.io.Serializable +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import jakarta.validation.Valid + +/** + * An order for a pets from the pet store + * @param id + * @param petId + * @param quantity + * @param shipDate + * @param status Order Status + * @param complete + */ +data class Order( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("petId") val petId: kotlin.Long? = null, + + @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + + @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + + @get:JsonProperty("status") val status: Order.Status? = null, + + @get:JsonProperty("complete") val complete: kotlin.Boolean? = false +) : Serializable { + + /** + * Order Status + * Values: placed,approved,delivered + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + placed("placed"), + approved("approved"), + delivered("delivered"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Order'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt new file mode 100644 index 000000000000..e78365b47814 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt @@ -0,0 +1,72 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import org.openapitools.model.Category +import org.openapitools.model.Tag +import java.io.Serializable +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import jakarta.validation.Valid + +/** + * A pet for sale in the pet store + * @param name + * @param photoUrls + * @param id + * @param category + * @param tags + * @param status pet status in the store + */ +data class Pet( + + @get:JsonProperty("name", required = true) val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + + @Deprecated(message = "") + @get:JsonProperty("status") val status: Pet.Status? = null +) : Serializable { + + /** + * pet status in the store + * Values: available,pending,sold + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + available("available"), + pending("pending"), + sold("sold"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt new file mode 100644 index 000000000000..bee0b3c419dd --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import jakarta.validation.Valid + +/** + * A tag for a pet + * @param id + * @param name + */ +data class Tag( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt new file mode 100644 index 000000000000..df4b7c3b5883 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt @@ -0,0 +1,51 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import jakarta.validation.Valid + +/** + * A User who is purchasing from the pet store + * @param id + * @param username + * @param firstName + * @param lastName + * @param email + * @param password + * @param phone + * @param userStatus User Status + */ +data class User( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("username") val username: kotlin.String? = null, + + @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + + @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + + @get:JsonProperty("email") val email: kotlin.String? = null, + + @get:JsonProperty("password") val password: kotlin.String? = null, + + @get:JsonProperty("phone") val phone: kotlin.String? = null, + + @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/resources/application.yaml new file mode 100644 index 000000000000..8e2ebcde976d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/resources/application.yaml @@ -0,0 +1,10 @@ +spring: + application: + name: openAPIPetstore + + jackson: + serialization: + WRITE_DATES_AS_TIMESTAMPS: false + +server: + port: 8080 diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt new file mode 100644 index 000000000000..48966ac74eca --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt @@ -0,0 +1,137 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.junit.jupiter.api.Test +import org.springframework.http.ResponseEntity + +class PetApiTest { + + private val service: PetApiService = PetApiServiceImpl() + private val api: PetApiController = PetApiController(service) + + /** + * To test PetApiController.addPet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun addPetTest() { + val pet: Pet = TODO() + + val response: ResponseEntity = api.addPet(pet) + + // TODO: test validations + } + + /** + * To test PetApiController.deletePet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deletePetTest() { + val petId: kotlin.Long = TODO() + val apiKey: kotlin.String? = TODO() + + val response: ResponseEntity = api.deletePet(petId, apiKey) + + // TODO: test validations + } + + /** + * To test PetApiController.findPetsByStatus + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByStatusTest() { + val status: kotlin.collections.List = TODO() + + val response: ResponseEntity> = api.findPetsByStatus(status) + + // TODO: test validations + } + + /** + * To test PetApiController.findPetsByTags + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByTagsTest() { + val tags: kotlin.collections.List = TODO() + + val response: ResponseEntity> = api.findPetsByTags(tags) + + // TODO: test validations + } + + /** + * To test PetApiController.getPetById + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getPetByIdTest() { + val petId: kotlin.Long = TODO() + + val response: ResponseEntity = api.getPetById(petId) + + // TODO: test validations + } + + /** + * To test PetApiController.updatePet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetTest() { + val pet: Pet = TODO() + + val response: ResponseEntity = api.updatePet(pet) + + // TODO: test validations + } + + /** + * To test PetApiController.updatePetWithForm + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetWithFormTest() { + val petId: kotlin.Long = TODO() + val name: kotlin.String? = TODO() + val status: kotlin.String? = TODO() + + val response: ResponseEntity = api.updatePetWithForm(petId, name, status) + + // TODO: test validations + } + + /** + * To test PetApiController.uploadFile + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun uploadFileTest() { + val petId: kotlin.Long = TODO() + val additionalMetadata: kotlin.String? = TODO() + val file: org.springframework.web.multipart.MultipartFile = TODO() + + val response: ResponseEntity = api.uploadFile(petId, additionalMetadata, file) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt new file mode 100644 index 000000000000..f8a87c71bca2 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt @@ -0,0 +1,70 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.junit.jupiter.api.Test +import org.springframework.http.ResponseEntity + +class StoreApiTest { + + private val service: StoreApiService = StoreApiServiceImpl() + private val api: StoreApiController = StoreApiController(service) + + /** + * To test StoreApiController.deleteOrder + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteOrderTest() { + val orderId: kotlin.String = TODO() + + val response: ResponseEntity = api.deleteOrder(orderId) + + // TODO: test validations + } + + /** + * To test StoreApiController.getInventory + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getInventoryTest() { + + val response: ResponseEntity> = api.getInventory() + + // TODO: test validations + } + + /** + * To test StoreApiController.getOrderById + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getOrderByIdTest() { + val orderId: kotlin.Long = TODO() + + val response: ResponseEntity = api.getOrderById(orderId) + + // TODO: test validations + } + + /** + * To test StoreApiController.placeOrder + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun placeOrderTest() { + val order: Order = TODO() + + val response: ResponseEntity = api.placeOrder(order) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt new file mode 100644 index 000000000000..805c8bd0a8a1 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt @@ -0,0 +1,132 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.junit.jupiter.api.Test +import org.springframework.http.ResponseEntity + +class UserApiTest { + + private val service: UserApiService = UserApiServiceImpl() + private val api: UserApiController = UserApiController(service) + + /** + * To test UserApiController.createUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUserTest() { + val user: User = TODO() + + val response: ResponseEntity = api.createUser(user) + + // TODO: test validations + } + + /** + * To test UserApiController.createUsersWithArrayInput + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithArrayInputTest() { + val user: kotlin.collections.List = TODO() + + val response: ResponseEntity = api.createUsersWithArrayInput(user) + + // TODO: test validations + } + + /** + * To test UserApiController.createUsersWithListInput + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithListInputTest() { + val user: kotlin.collections.List = TODO() + + val response: ResponseEntity = api.createUsersWithListInput(user) + + // TODO: test validations + } + + /** + * To test UserApiController.deleteUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteUserTest() { + val username: kotlin.String = TODO() + + val response: ResponseEntity = api.deleteUser(username) + + // TODO: test validations + } + + /** + * To test UserApiController.getUserByName + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getUserByNameTest() { + val username: kotlin.String = TODO() + + val response: ResponseEntity = api.getUserByName(username) + + // TODO: test validations + } + + /** + * To test UserApiController.loginUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun loginUserTest() { + val username: kotlin.String = TODO() + val password: kotlin.String = TODO() + + val response: ResponseEntity = api.loginUser(username, password) + + // TODO: test validations + } + + /** + * To test UserApiController.logoutUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun logoutUserTest() { + + val response: ResponseEntity = api.logoutUser() + + // TODO: test validations + } + + /** + * To test UserApiController.updateUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updateUserTest() { + val username: kotlin.String = TODO() + val user: User = TODO() + + val response: ResponseEntity = api.updateUser(username, user) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES new file mode 100644 index 000000000000..1130231108a9 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES @@ -0,0 +1,34 @@ +.openapi-generator-ignore +README.md +build.gradle.kts +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/kotlin/org/openapitools/Application.kt +src/main/kotlin/org/openapitools/api/ApiUtil.kt +src/main/kotlin/org/openapitools/api/Exceptions.kt +src/main/kotlin/org/openapitools/api/PetApi.kt +src/main/kotlin/org/openapitools/api/PetApiController.kt +src/main/kotlin/org/openapitools/api/PetApiDelegate.kt +src/main/kotlin/org/openapitools/api/PetApiService.kt +src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/StoreApi.kt +src/main/kotlin/org/openapitools/api/StoreApiController.kt +src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt +src/main/kotlin/org/openapitools/api/StoreApiService.kt +src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/UserApi.kt +src/main/kotlin/org/openapitools/api/UserApiController.kt +src/main/kotlin/org/openapitools/api/UserApiDelegate.kt +src/main/kotlin/org/openapitools/api/UserApiService.kt +src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +src/main/kotlin/org/openapitools/model/Category.kt +src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +src/main/kotlin/org/openapitools/model/Order.kt +src/main/kotlin/org/openapitools/model/Pet.kt +src/main/kotlin/org/openapitools/model/Tag.kt +src/main/kotlin/org/openapitools/model/User.kt +src/main/resources/application.yaml diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/VERSION new file mode 100644 index 000000000000..2fb556b60635 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.18.0-SNAPSHOT diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/README.md b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/README.md new file mode 100644 index 000000000000..b6865a081135 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/README.md @@ -0,0 +1,21 @@ +# openAPIPetstore + +This Kotlin based [Spring Boot](https://spring.io/projects/spring-boot) application has been generated using the [OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator). + +## Getting Started + +This document assumes you have either maven or gradle available, either via the wrapper or otherwise. This does not come with a gradle / maven wrapper checked in. + +By default a [`pom.xml`](pom.xml) file will be generated. If you specified `gradleBuildFile=true` when generating this project, a `build.gradle.kts` will also be generated. Note this uses [Gradle Kotlin DSL](https://github.com/gradle/kotlin-dsl). + +To build the project using maven, run: +```bash +mvn package && java -jar target/openapi-spring-1.0.0.jar +``` + +To build the project using gradle, run: +```bash +gradle build && java -jar build/libs/openapi-spring-1.0.0.jar +``` + +If all builds successfully, the server should run on [http://localhost:8080/](http://localhost:8080/) diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/build.gradle.kts b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/build.gradle.kts new file mode 100644 index 000000000000..3507e44d515a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/build.gradle.kts @@ -0,0 +1,48 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") + } +} + +group = "org.openapitools" +version = "1.0.0" + +repositories { + mavenCentral() +} + +tasks.withType { + kotlinOptions.jvmTarget = "11" +} + +plugins { + val kotlinVersion = "1.9.25" + id("org.jetbrains.kotlin.jvm") version kotlinVersion + id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion + id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-web") + + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("javax.validation:validation-api") + implementation("javax.annotation:javax.annotation-api:1.3.2") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude(module = "junit") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`; zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z!9)DPf zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl z7D=Js!i~0=u3rox^eO3i@$0=n{K1lPNU zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwAyRPZo2Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS} z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby z1Qaw8lU4jZpQ_$;*7RME+gq1KySGG#Wql>aL~k9tLrSO()LWn*q&YxHEuzmwd1?aAtI zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(!{a z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br# z#Q61gBzEpmy`$pA*6!87 zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J* z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4 z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5 zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*| z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^ z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+mg&7$u!! z-^+Z%;-3IDwqZ|K=ah85OLwkO zKxNBh+4QHh)u9D?MFtpbl)us}9+V!D%w9jfAMYEb>%$A;u)rrI zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0 z^2>|DxhQw(mtNEI2Kj(;KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4& zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|( zRi{Uw%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*( zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi z4vtM;+uPsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc ztw6Mh2d>_iO*$Rd8(-Cr1_V8EO1f*^@wRoSozS) zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;sIav&gu z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{XBdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<3>n{Iuo`r3UZp;>GkT2YBNAh|b z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9% zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx| z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ibNBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR` zEAu4B8l>NPuhsk5a`rReSya2nfV1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3# z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe zklbm8+zB_syQv5A2rj!Vbw8;|$@C!vfNmNV!yJIWDQ>{+2x zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^ zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6QK=mbA-|Cf* zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2 z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%+clM1xQEdPYt_g<2K+z!$>*$9nQ>; zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9 z5VK_kkSJ3?zOH)OezMT{!YkCuSSn!K#-Rhl$uUM(bq*jY? zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x z7sLP1&3^%Nld9Dhm@$3f2}87!quhI@nwd@3~fZl_3LYW-B?Ia>ui`ELg z&Qfe!7m6ze=mZ`Ia9$z|ARSw|IdMpooY4YiPN8K z4B(ts3p%2i(Td=tgEHX z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&NykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z` zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWDqZ7J&~gAm1#~maIGJ1sls^gxL9LLG_NhU!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q zhBv$n5j0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY; z-HB&Je%Gg}Jt@={_C{L$!RM;$$|iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN- zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf; zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26Y(3%TL; zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_ z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f z&J_}jskj|Q;73NP4<4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0 z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i) z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor% z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj z=*dXG&n0>)_)N5oc6v!>-bd(2ragD8O=M|wGW z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9 zx+EuMkC>(4j1;m6NoGqEkpJYJ?vc|B zOlwT3t&UgL!pX_P*6g36`ZXQ; z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&FwI=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%) zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5! zpZy5Jc{`r{1e(jd%jsG7k%I+m#CGS*BPA65ZVW~fLYw0dA-H_}O zrkGFL&P1PG9p2(%QiEWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradlew.bat b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/pom.xml b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/pom.xml new file mode 100644 index 000000000000..cab717f26a33 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/pom.xml @@ -0,0 +1,131 @@ + + 4.0.0 + org.openapitools + openapi-spring + jar + openapi-spring + 1.0.0 + + 3.0.2 + 1.3.2 + 1.6.21 + + 1.6.21 + UTF-8 + + + org.springframework.boot + spring-boot-starter-parent + 2.7.15 + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + spring + + 11 + + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + org.jetbrains.kotlin + kotlin-maven-allopen + ${kotlin.version} + + + + + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin.version} + + + org.springframework.boot + spring-boot-starter-web + + + + + + + com.google.code.findbugs + jsr305 + ${findbugs-jsr305.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.fasterxml.jackson.module + jackson-module-kotlin + + + + javax.validation + validation-api + + + javax.annotation + javax.annotation-api + ${javax-annotation.version} + provided + + + org.jetbrains.kotlin + kotlin-test-junit5 + ${kotlin-test-junit5.version} + test + + + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/settings.gradle b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/settings.gradle new file mode 100644 index 000000000000..14844905cd40 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/settings.gradle @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + maven { url = uri("https://repo.spring.io/snapshot") } + maven { url = uri("https://repo.spring.io/milestone") } + gradlePluginPortal() + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.springframework.boot") { + useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}") + } + } + } +} +rootProject.name = "openapi-spring" diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/Application.kt new file mode 100644 index 000000000000..2fe6de62479e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/Application.kt @@ -0,0 +1,13 @@ +package org.openapitools + +import org.springframework.boot.runApplication +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.ComponentScan + +@SpringBootApplication +@ComponentScan(basePackages = ["org.openapitools", "org.openapitools.api", "org.openapitools.model"]) +class Application + +fun main(args: Array) { + runApplication(*args) +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/ApiUtil.kt new file mode 100644 index 000000000000..88e892d0f49a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -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?.characterEncoding = "UTF-8" + res?.addHeader("Content-Type", contentType) + res?.writer?.print(example) + } catch (e: IOException) { + throw RuntimeException(e) + } + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt new file mode 100644 index 000000000000..901db1237ee7 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/Exceptions.kt @@ -0,0 +1,30 @@ +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 +import javax.servlet.http.HttpServletResponse +import javax.validation.ConstraintViolationException + +// TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception +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 { + + @ExceptionHandler(value = [ApiException::class]) + fun onApiException(ex: ApiException, response: HttpServletResponse): Unit = + response.sendError(ex.code, ex.message) + + @ExceptionHandler(value = [NotImplementedError::class]) + fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit = + 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 }) +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt new file mode 100644 index 000000000000..071e03cca525 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -0,0 +1,124 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. +*/ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +interface PetApi { + + fun getDelegate(): PetApiDelegate = object: PetApiDelegate {} + + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json", "application/xml"] + ) + fun addPet( @Valid @RequestBody body: Pet): Unit { + return getDelegate().addPet(body) + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] + ) + fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): Unit { + return getDelegate().deletePet(petId, apiKey) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): List { + return getDelegate().findPetsByStatus(status) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): List { + return getDelegate().findPetsByTags(tags) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] + ) + fun getPetById( @PathVariable("petId") petId: kotlin.Long): Pet { + return getDelegate().getPetById(petId) + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json", "application/xml"] + ) + fun updatePet( @Valid @RequestBody body: Pet): Unit { + return getDelegate().updatePet(body) + } + + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit { + return getDelegate().updatePetWithForm(petId, name, status) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + return getDelegate().uploadFile(petId, additionalMetadata, file) + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt new file mode 100644 index 000000000000..bda17886a9fb --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -0,0 +1,20 @@ +package org.openapitools.api + +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import java.util.Optional + +@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT") +@Controller +@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") +class PetApiController( + delegate: PetApiDelegate? +) : PetApi { + private lateinit var delegate: PetApiDelegate + + init { + this.delegate = Optional.ofNullable(delegate).orElse(object : PetApiDelegate {}) + } + + override fun getDelegate(): PetApiDelegate = delegate +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt new file mode 100644 index 000000000000..a96a547cf8b0 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt @@ -0,0 +1,140 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.web.context.request.NativeWebRequest + +import java.util.Optional + +/** + * A delegate to be called by the {@link PetApiController}}. + * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. + */ +@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT") +interface PetApiDelegate { + + fun getRequest(): Optional = Optional.empty() + + /** + * @see PetApi#addPet + */ + fun addPet(body: Pet): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#deletePet + */ + fun deletePet(petId: kotlin.Long, + apiKey: kotlin.String?): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#findPetsByStatus + */ + fun findPetsByStatus(status: kotlin.collections.List): List { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]") + break + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + ApiUtil.setExampleResponse(request, "application/xml", " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou") + break + } + } + } + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#findPetsByTags + */ + fun findPetsByTags(tags: kotlin.collections.List): List { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]") + break + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + ApiUtil.setExampleResponse(request, "application/xml", " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou") + break + } + } + } + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#getPetById + */ + fun getPetById(petId: kotlin.Long): Pet { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}") + break + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + ApiUtil.setExampleResponse(request, "application/xml", " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou") + break + } + } + } + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#updatePet + */ + fun updatePet(body: Pet): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#updatePetWithForm + */ + fun updatePetWithForm(petId: kotlin.Long, + name: kotlin.String?, + status: kotlin.String?): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see PetApi#uploadFile + */ + fun uploadFile(petId: kotlin.Long, + additionalMetadata: kotlin.String?, + file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}") + break + } + } + } + return TODO("Not yet implemented") + + } + +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiService.kt new file mode 100644 index 000000000000..db655b8a7978 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiService.kt @@ -0,0 +1,94 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet + +interface PetApiService { + + /** + * POST /pet : Add a new pet to the store + * + * @param body Pet object that needs to be added to the store (required) + * @return Invalid input (status code 405) + * @see PetApi#addPet + */ + fun addPet(body: Pet): Unit + + /** + * DELETE /pet/{petId} : Deletes a pet + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @return Invalid pet value (status code 400) + * @see PetApi#deletePet + */ + fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit + + /** + * GET /pet/findByStatus : Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return successful operation (status code 200) + * or Invalid status value (status code 400) + * @see PetApi#findPetsByStatus + */ + fun findPetsByStatus(status: kotlin.collections.List): List + + /** + * GET /pet/findByTags : Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return successful operation (status code 200) + * or Invalid tag value (status code 400) + * @deprecated + * @see PetApi#findPetsByTags + */ + fun findPetsByTags(tags: kotlin.collections.List): List + + /** + * GET /pet/{petId} : Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * @see PetApi#getPetById + */ + fun getPetById(petId: kotlin.Long): Pet + + /** + * PUT /pet : Update an existing pet + * + * @param body Pet object that needs to be added to the store (required) + * @return Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * or Validation exception (status code 405) + * @see PetApi#updatePet + */ + fun updatePet(body: Pet): Unit + + /** + * POST /pet/{petId} : Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @return Invalid input (status code 405) + * @see PetApi#updatePetWithForm + */ + fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit + + /** + * POST /pet/{petId}/uploadImage : uploads an image + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return successful operation (status code 200) + * @see PetApi#uploadFile + */ + fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile): ModelApiResponse +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt new file mode 100644 index 000000000000..a48482be32bd --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt @@ -0,0 +1,40 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.stereotype.Service +@Service +class PetApiServiceImpl : PetApiService { + + override fun addPet(body: Pet): Unit { + TODO("Implement me") + } + + override fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun findPetsByStatus(status: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun findPetsByTags(tags: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun getPetById(petId: kotlin.Long): Pet { + TODO("Implement me") + } + + override fun updatePet(body: Pet): Unit { + TODO("Implement me") + } + + override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt new file mode 100644 index 000000000000..d4419da023a6 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -0,0 +1,78 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. +*/ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +interface StoreApi { + + fun getDelegate(): StoreApiDelegate = object: StoreApiDelegate {} + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] + ) + fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): Unit { + return getDelegate().deleteOrder(orderId) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] + ) + fun getInventory(): Map { + return getDelegate().getInventory() + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] + ) + fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): Order { + return getDelegate().getOrderById(orderId) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"] + ) + fun placeOrder( @Valid @RequestBody body: Order): Order { + return getDelegate().placeOrder(body) + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt new file mode 100644 index 000000000000..d716a4f9b76b --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -0,0 +1,20 @@ +package org.openapitools.api + +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import java.util.Optional + +@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT") +@Controller +@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") +class StoreApiController( + delegate: StoreApiDelegate? +) : StoreApi { + private lateinit var delegate: StoreApiDelegate + + init { + this.delegate = Optional.ofNullable(delegate).orElse(object : StoreApiDelegate {}) + } + + override fun getDelegate(): StoreApiDelegate = delegate +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt new file mode 100644 index 000000000000..9c4233db165d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt @@ -0,0 +1,78 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.web.context.request.NativeWebRequest + +import java.util.Optional + +/** + * A delegate to be called by the {@link StoreApiController}}. + * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. + */ +@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT") +interface StoreApiDelegate { + + fun getRequest(): Optional = Optional.empty() + + /** + * @see StoreApi#deleteOrder + */ + fun deleteOrder(orderId: kotlin.String): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see StoreApi#getInventory + */ + fun getInventory(): Map { + return TODO("Not yet implemented") + + } + + + /** + * @see StoreApi#getOrderById + */ + fun getOrderById(orderId: kotlin.Long): Order { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}") + break + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + ApiUtil.setExampleResponse(request, "application/xml", " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true") + break + } + } + } + return TODO("Not yet implemented") + + } + + + /** + * @see StoreApi#placeOrder + */ + fun placeOrder(body: Order): Order { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}") + break + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + ApiUtil.setExampleResponse(request, "application/xml", " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true") + break + } + } + } + return TODO("Not yet implemented") + + } + +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiService.kt new file mode 100644 index 000000000000..60e754529448 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiService.kt @@ -0,0 +1,48 @@ +package org.openapitools.api + +import org.openapitools.model.Order + +interface StoreApiService { + + /** + * DELETE /store/order/{orderId} : Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @param orderId ID of the order that needs to be deleted (required) + * @return Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#deleteOrder + */ + fun deleteOrder(orderId: kotlin.String): Unit + + /** + * GET /store/inventory : Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return successful operation (status code 200) + * @see StoreApi#getInventory + */ + fun getInventory(): Map + + /** + * GET /store/order/{orderId} : Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#getOrderById + */ + fun getOrderById(orderId: kotlin.Long): Order + + /** + * POST /store/order : Place an order for a pet + * + * @param body order placed for purchasing the pet (required) + * @return successful operation (status code 200) + * or Invalid Order (status code 400) + * @see StoreApi#placeOrder + */ + fun placeOrder(body: Order): Order +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt new file mode 100644 index 000000000000..7e733e28dc50 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt @@ -0,0 +1,23 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.stereotype.Service +@Service +class StoreApiServiceImpl : StoreApiService { + + override fun deleteOrder(orderId: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getInventory(): Map { + TODO("Implement me") + } + + override fun getOrderById(orderId: kotlin.Long): Order { + TODO("Implement me") + } + + override fun placeOrder(body: Order): Order { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt new file mode 100644 index 000000000000..866abb97503b --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -0,0 +1,117 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.18.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. +*/ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +interface UserApi { + + fun getDelegate(): UserApiDelegate = object: UserApiDelegate {} + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user"] + ) + fun createUser( @Valid @RequestBody body: User): Unit { + return getDelegate().createUser(body) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithArray"] + ) + fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + return getDelegate().createUsersWithArrayInput(body) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithList"] + ) + fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + return getDelegate().createUsersWithListInput(body) + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/user/{username}"] + ) + fun deleteUser( @PathVariable("username") username: kotlin.String): Unit { + return getDelegate().deleteUser(username) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] + ) + fun getUserByName( @PathVariable("username") username: kotlin.String): User { + return getDelegate().getUserByName(username) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): kotlin.String { + return getDelegate().loginUser(username, password) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/logout"] + ) + fun logoutUser(): Unit { + return getDelegate().logoutUser() + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/user/{username}"] + ) + fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): Unit { + return getDelegate().updateUser(username, body) + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt new file mode 100644 index 000000000000..d298504ed57a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -0,0 +1,20 @@ +package org.openapitools.api + +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import java.util.Optional + +@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT") +@Controller +@RequestMapping("\${openapi.openAPIPetstore.base-path:/v2}") +class UserApiController( + delegate: UserApiDelegate? +) : UserApi { + private lateinit var delegate: UserApiDelegate + + init { + this.delegate = Optional.ofNullable(delegate).orElse(object : UserApiDelegate {}) + } + + override fun getDelegate(): UserApiDelegate = delegate +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt new file mode 100644 index 000000000000..d3479ff78aad --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt @@ -0,0 +1,104 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.web.context.request.NativeWebRequest + +import java.util.Optional + +/** + * A delegate to be called by the {@link UserApiController}}. + * Implement this interface with a {@link org.springframework.stereotype.Service} annotated class. + */ +@javax.annotation.Generated(value = ["org.openapitools.codegen.languages.KotlinSpringServerCodegen"], comments = "Generator version: 7.18.0-SNAPSHOT") +interface UserApiDelegate { + + fun getRequest(): Optional = Optional.empty() + + /** + * @see UserApi#createUser + */ + fun createUser(body: User): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#createUsersWithArrayInput + */ + fun createUsersWithArrayInput(body: kotlin.collections.List): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#createUsersWithListInput + */ + fun createUsersWithListInput(body: kotlin.collections.List): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#deleteUser + */ + fun deleteUser(username: kotlin.String): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#getUserByName + */ + fun getUserByName(username: kotlin.String): User { + getRequest().ifPresent { request -> + for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + ApiUtil.setExampleResponse(request, "application/json", "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}") + break + } + if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { + ApiUtil.setExampleResponse(request, "application/xml", " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123") + break + } + } + } + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#loginUser + */ + fun loginUser(username: kotlin.String, + password: kotlin.String): kotlin.String { + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#logoutUser + */ + fun logoutUser(): Unit { + return TODO("Not yet implemented") + + } + + + /** + * @see UserApi#updateUser + */ + fun updateUser(username: kotlin.String, + body: User): Unit { + return TODO("Not yet implemented") + + } + +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiService.kt new file mode 100644 index 000000000000..a1bcf6be237c --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiService.kt @@ -0,0 +1,87 @@ +package org.openapitools.api + +import org.openapitools.model.User + +interface UserApiService { + + /** + * POST /user : Create user + * This can only be done by the logged in user. + * + * @param body Created user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUser + */ + fun createUser(body: User): Unit + + /** + * POST /user/createWithArray : Creates list of users with given input array + * + * @param body List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithArrayInput + */ + fun createUsersWithArrayInput(body: kotlin.collections.List): Unit + + /** + * POST /user/createWithList : Creates list of users with given input array + * + * @param body List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithListInput + */ + fun createUsersWithListInput(body: kotlin.collections.List): Unit + + /** + * DELETE /user/{username} : Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + * @return Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#deleteUser + */ + fun deleteUser(username: kotlin.String): Unit + + /** + * GET /user/{username} : Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return successful operation (status code 200) + * or Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#getUserByName + */ + fun getUserByName(username: kotlin.String): User + + /** + * GET /user/login : Logs user into the system + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return successful operation (status code 200) + * or Invalid username/password supplied (status code 400) + * @see UserApi#loginUser + */ + fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String + + /** + * GET /user/logout : Logs out current logged in user session + * + * @return successful operation (status code 200) + * @see UserApi#logoutUser + */ + fun logoutUser(): Unit + + /** + * PUT /user/{username} : Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param body Updated user object (required) + * @return Invalid user supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#updateUser + */ + fun updateUser(username: kotlin.String, body: User): Unit +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt new file mode 100644 index 000000000000..ebd822220153 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt @@ -0,0 +1,39 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.stereotype.Service +@Service +class UserApiServiceImpl : UserApiService { + + override fun createUser(body: User): Unit { + TODO("Implement me") + } + + override fun createUsersWithArrayInput(body: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun createUsersWithListInput(body: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun deleteUser(username: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getUserByName(username: kotlin.String): User { + TODO("Implement me") + } + + override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + TODO("Implement me") + } + + override fun logoutUser(): Unit { + TODO("Implement me") + } + + override fun updateUser(username: kotlin.String, body: User): Unit { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt new file mode 100644 index 000000000000..0638b1718f3d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A category for a pet + * @param id + * @param name + */ +data class Category( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt new file mode 100644 index 000000000000..f520047d850d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -0,0 +1,36 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * Describes the result of uploading an image resource + * @param code + * @param type + * @param message + */ +data class ModelApiResponse( + + @get:JsonProperty("code") val code: kotlin.Int? = null, + + @get:JsonProperty("type") val type: kotlin.String? = null, + + @get:JsonProperty("message") val message: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt new file mode 100644 index 000000000000..4ebe51e765ed --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -0,0 +1,67 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * An order for a pets from the pet store + * @param id + * @param petId + * @param quantity + * @param shipDate + * @param status Order Status + * @param complete + */ +data class Order( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("petId") val petId: kotlin.Long? = null, + + @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + + @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + + @get:JsonProperty("status") val status: Order.Status? = null, + + @get:JsonProperty("complete") val complete: kotlin.Boolean? = false +) : Serializable { + + /** + * Order Status + * Values: placed,approved,delivered + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + placed("placed"), + approved("approved"), + delivered("delivered"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Order'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt new file mode 100644 index 000000000000..cf9ccf2f4f7d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -0,0 +1,71 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import org.openapitools.model.Category +import org.openapitools.model.Tag +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A pet for sale in the pet store + * @param name + * @param photoUrls + * @param id + * @param category + * @param tags + * @param status pet status in the store + */ +data class Pet( + + @get:JsonProperty("name", required = true) val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + + @get:JsonProperty("status") val status: Pet.Status? = null +) : Serializable { + + /** + * pet status in the store + * Values: available,pending,sold + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + available("available"), + pending("pending"), + sold("sold"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt new file mode 100644 index 000000000000..36f841600047 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A tag for a pet + * @param id + * @param name + */ +data class Tag( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt new file mode 100644 index 000000000000..b04c9e312592 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -0,0 +1,51 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A User who is purchasing from the pet store + * @param id + * @param username + * @param firstName + * @param lastName + * @param email + * @param password + * @param phone + * @param userStatus User Status + */ +data class User( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("username") val username: kotlin.String? = null, + + @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + + @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + + @get:JsonProperty("email") val email: kotlin.String? = null, + + @get:JsonProperty("password") val password: kotlin.String? = null, + + @get:JsonProperty("phone") val phone: kotlin.String? = null, + + @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/resources/application.yaml new file mode 100644 index 000000000000..8e2ebcde976d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/resources/application.yaml @@ -0,0 +1,10 @@ +spring: + application: + name: openAPIPetstore + + jackson: + serialization: + WRITE_DATES_AS_TIMESTAMPS: false + +server: + port: 8080 diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/FILES new file mode 100644 index 000000000000..c7afb2eda91e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/FILES @@ -0,0 +1,27 @@ +README.md +build.gradle.kts +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/kotlin/org/openapitools/Application.kt +src/main/kotlin/org/openapitools/api/ApiUtil.kt +src/main/kotlin/org/openapitools/api/Exceptions.kt +src/main/kotlin/org/openapitools/api/PetApiController.kt +src/main/kotlin/org/openapitools/api/PetApiService.kt +src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/StoreApiController.kt +src/main/kotlin/org/openapitools/api/StoreApiService.kt +src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/UserApiController.kt +src/main/kotlin/org/openapitools/api/UserApiService.kt +src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +src/main/kotlin/org/openapitools/model/Category.kt +src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +src/main/kotlin/org/openapitools/model/Order.kt +src/main/kotlin/org/openapitools/model/Pet.kt +src/main/kotlin/org/openapitools/model/Tag.kt +src/main/kotlin/org/openapitools/model/User.kt +src/main/resources/application.yaml diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/VERSION new file mode 100644 index 000000000000..2fb556b60635 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.18.0-SNAPSHOT diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/README.md b/samples/server/petstore/kotlin-springboot-no-response-entity/README.md new file mode 100644 index 000000000000..b6865a081135 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/README.md @@ -0,0 +1,21 @@ +# openAPIPetstore + +This Kotlin based [Spring Boot](https://spring.io/projects/spring-boot) application has been generated using the [OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator). + +## Getting Started + +This document assumes you have either maven or gradle available, either via the wrapper or otherwise. This does not come with a gradle / maven wrapper checked in. + +By default a [`pom.xml`](pom.xml) file will be generated. If you specified `gradleBuildFile=true` when generating this project, a `build.gradle.kts` will also be generated. Note this uses [Gradle Kotlin DSL](https://github.com/gradle/kotlin-dsl). + +To build the project using maven, run: +```bash +mvn package && java -jar target/openapi-spring-1.0.0.jar +``` + +To build the project using gradle, run: +```bash +gradle build && java -jar build/libs/openapi-spring-1.0.0.jar +``` + +If all builds successfully, the server should run on [http://localhost:8080/](http://localhost:8080/) diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/build.gradle.kts b/samples/server/petstore/kotlin-springboot-no-response-entity/build.gradle.kts new file mode 100644 index 000000000000..3507e44d515a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/build.gradle.kts @@ -0,0 +1,48 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") + } +} + +group = "org.openapitools" +version = "1.0.0" + +repositories { + mavenCentral() +} + +tasks.withType { + kotlinOptions.jvmTarget = "11" +} + +plugins { + val kotlinVersion = "1.9.25" + id("org.jetbrains.kotlin.jvm") version kotlinVersion + id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion + id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-web") + + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("javax.validation:validation-api") + implementation("javax.annotation:javax.annotation-api:1.3.2") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude(module = "junit") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-no-response-entity/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/gradlew.bat b/samples/server/petstore/kotlin-springboot-no-response-entity/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/pom.xml b/samples/server/petstore/kotlin-springboot-no-response-entity/pom.xml new file mode 100644 index 000000000000..cab717f26a33 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/pom.xml @@ -0,0 +1,131 @@ + + 4.0.0 + org.openapitools + openapi-spring + jar + openapi-spring + 1.0.0 + + 3.0.2 + 1.3.2 + 1.6.21 + + 1.6.21 + UTF-8 + + + org.springframework.boot + spring-boot-starter-parent + 2.7.15 + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + spring + + 11 + + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + org.jetbrains.kotlin + kotlin-maven-allopen + ${kotlin.version} + + + + + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin.version} + + + org.springframework.boot + spring-boot-starter-web + + + + + + + com.google.code.findbugs + jsr305 + ${findbugs-jsr305.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.fasterxml.jackson.module + jackson-module-kotlin + + + + javax.validation + validation-api + + + javax.annotation + javax.annotation-api + ${javax-annotation.version} + provided + + + org.jetbrains.kotlin + kotlin-test-junit5 + ${kotlin-test-junit5.version} + test + + + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/settings.gradle b/samples/server/petstore/kotlin-springboot-no-response-entity/settings.gradle new file mode 100644 index 000000000000..14844905cd40 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/settings.gradle @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + maven { url = uri("https://repo.spring.io/snapshot") } + maven { url = uri("https://repo.spring.io/milestone") } + gradlePluginPortal() + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.springframework.boot") { + useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}") + } + } + } +} +rootProject.name = "openapi-spring" diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/Application.kt new file mode 100644 index 000000000000..2fe6de62479e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/Application.kt @@ -0,0 +1,13 @@ +package org.openapitools + +import org.springframework.boot.runApplication +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.ComponentScan + +@SpringBootApplication +@ComponentScan(basePackages = ["org.openapitools", "org.openapitools.api", "org.openapitools.model"]) +class Application + +fun main(args: Array) { + runApplication(*args) +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt new file mode 100644 index 000000000000..88e892d0f49a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -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?.characterEncoding = "UTF-8" + res?.addHeader("Content-Type", contentType) + res?.writer?.print(example) + } catch (e: IOException) { + throw RuntimeException(e) + } + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt new file mode 100644 index 000000000000..901db1237ee7 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/Exceptions.kt @@ -0,0 +1,30 @@ +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 +import javax.servlet.http.HttpServletResponse +import javax.validation.ConstraintViolationException + +// TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception +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 { + + @ExceptionHandler(value = [ApiException::class]) + fun onApiException(ex: ApiException, response: HttpServletResponse): Unit = + response.sendError(ex.code, ex.message) + + @ExceptionHandler(value = [NotImplementedError::class]) + fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit = + 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 }) +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt new file mode 100644 index 000000000000..cbf34f4cc519 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -0,0 +1,118 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class PetApiController(@Autowired(required = true) val service: PetApiService) { + + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json", "application/xml"] + ) + fun addPet( @Valid @RequestBody body: Pet): Unit { + return service.addPet(body) + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] + ) + fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): Unit { + return service.deletePet(petId, apiKey) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): List { + return service.findPetsByStatus(status) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): List { + return service.findPetsByTags(tags) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] + ) + fun getPetById( @PathVariable("petId") petId: kotlin.Long): Pet { + return service.getPetById(petId) + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json", "application/xml"] + ) + fun updatePet( @Valid @RequestBody body: Pet): Unit { + return service.updatePet(body) + } + + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit { + return service.updatePetWithForm(petId, name, status) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + return service.uploadFile(petId, additionalMetadata, file) + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt new file mode 100644 index 000000000000..db655b8a7978 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiService.kt @@ -0,0 +1,94 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet + +interface PetApiService { + + /** + * POST /pet : Add a new pet to the store + * + * @param body Pet object that needs to be added to the store (required) + * @return Invalid input (status code 405) + * @see PetApi#addPet + */ + fun addPet(body: Pet): Unit + + /** + * DELETE /pet/{petId} : Deletes a pet + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @return Invalid pet value (status code 400) + * @see PetApi#deletePet + */ + fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit + + /** + * GET /pet/findByStatus : Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return successful operation (status code 200) + * or Invalid status value (status code 400) + * @see PetApi#findPetsByStatus + */ + fun findPetsByStatus(status: kotlin.collections.List): List + + /** + * GET /pet/findByTags : Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return successful operation (status code 200) + * or Invalid tag value (status code 400) + * @deprecated + * @see PetApi#findPetsByTags + */ + fun findPetsByTags(tags: kotlin.collections.List): List + + /** + * GET /pet/{petId} : Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * @see PetApi#getPetById + */ + fun getPetById(petId: kotlin.Long): Pet + + /** + * PUT /pet : Update an existing pet + * + * @param body Pet object that needs to be added to the store (required) + * @return Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * or Validation exception (status code 405) + * @see PetApi#updatePet + */ + fun updatePet(body: Pet): Unit + + /** + * POST /pet/{petId} : Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @return Invalid input (status code 405) + * @see PetApi#updatePetWithForm + */ + fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit + + /** + * POST /pet/{petId}/uploadImage : uploads an image + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return successful operation (status code 200) + * @see PetApi#uploadFile + */ + fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile): ModelApiResponse +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt new file mode 100644 index 000000000000..a48482be32bd --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt @@ -0,0 +1,40 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.stereotype.Service +@Service +class PetApiServiceImpl : PetApiService { + + override fun addPet(body: Pet): Unit { + TODO("Implement me") + } + + override fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun findPetsByStatus(status: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun findPetsByTags(tags: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun getPetById(petId: kotlin.Long): Pet { + TODO("Implement me") + } + + override fun updatePet(body: Pet): Unit { + TODO("Implement me") + } + + override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt new file mode 100644 index 000000000000..4052d93bc2b7 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -0,0 +1,72 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class StoreApiController(@Autowired(required = true) val service: StoreApiService) { + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] + ) + fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): Unit { + return service.deleteOrder(orderId) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] + ) + fun getInventory(): Map { + return service.getInventory() + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] + ) + fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): Order { + return service.getOrderById(orderId) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"] + ) + fun placeOrder( @Valid @RequestBody body: Order): Order { + return service.placeOrder(body) + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt new file mode 100644 index 000000000000..60e754529448 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiService.kt @@ -0,0 +1,48 @@ +package org.openapitools.api + +import org.openapitools.model.Order + +interface StoreApiService { + + /** + * DELETE /store/order/{orderId} : Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @param orderId ID of the order that needs to be deleted (required) + * @return Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#deleteOrder + */ + fun deleteOrder(orderId: kotlin.String): Unit + + /** + * GET /store/inventory : Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return successful operation (status code 200) + * @see StoreApi#getInventory + */ + fun getInventory(): Map + + /** + * GET /store/order/{orderId} : Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#getOrderById + */ + fun getOrderById(orderId: kotlin.Long): Order + + /** + * POST /store/order : Place an order for a pet + * + * @param body order placed for purchasing the pet (required) + * @return successful operation (status code 200) + * or Invalid Order (status code 400) + * @see StoreApi#placeOrder + */ + fun placeOrder(body: Order): Order +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt new file mode 100644 index 000000000000..7e733e28dc50 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt @@ -0,0 +1,23 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.stereotype.Service +@Service +class StoreApiServiceImpl : StoreApiService { + + override fun deleteOrder(orderId: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getInventory(): Map { + TODO("Implement me") + } + + override fun getOrderById(orderId: kotlin.Long): Order { + TODO("Implement me") + } + + override fun placeOrder(body: Order): Order { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt new file mode 100644 index 000000000000..f7c3d54bb521 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -0,0 +1,111 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class UserApiController(@Autowired(required = true) val service: UserApiService) { + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user"] + ) + fun createUser( @Valid @RequestBody body: User): Unit { + return service.createUser(body) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithArray"] + ) + fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + return service.createUsersWithArrayInput(body) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithList"] + ) + fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + return service.createUsersWithListInput(body) + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/user/{username}"] + ) + fun deleteUser( @PathVariable("username") username: kotlin.String): Unit { + return service.deleteUser(username) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] + ) + fun getUserByName( @PathVariable("username") username: kotlin.String): User { + return service.getUserByName(username) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): kotlin.String { + return service.loginUser(username, password) + } + + @ResponseStatus(HttpStatus.OK) + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/logout"] + ) + fun logoutUser(): Unit { + return service.logoutUser() + } + + @ResponseStatus(HttpStatus.BAD_REQUEST) + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/user/{username}"] + ) + fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): Unit { + return service.updateUser(username, body) + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt new file mode 100644 index 000000000000..a1bcf6be237c --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiService.kt @@ -0,0 +1,87 @@ +package org.openapitools.api + +import org.openapitools.model.User + +interface UserApiService { + + /** + * POST /user : Create user + * This can only be done by the logged in user. + * + * @param body Created user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUser + */ + fun createUser(body: User): Unit + + /** + * POST /user/createWithArray : Creates list of users with given input array + * + * @param body List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithArrayInput + */ + fun createUsersWithArrayInput(body: kotlin.collections.List): Unit + + /** + * POST /user/createWithList : Creates list of users with given input array + * + * @param body List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithListInput + */ + fun createUsersWithListInput(body: kotlin.collections.List): Unit + + /** + * DELETE /user/{username} : Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + * @return Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#deleteUser + */ + fun deleteUser(username: kotlin.String): Unit + + /** + * GET /user/{username} : Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return successful operation (status code 200) + * or Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#getUserByName + */ + fun getUserByName(username: kotlin.String): User + + /** + * GET /user/login : Logs user into the system + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return successful operation (status code 200) + * or Invalid username/password supplied (status code 400) + * @see UserApi#loginUser + */ + fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String + + /** + * GET /user/logout : Logs out current logged in user session + * + * @return successful operation (status code 200) + * @see UserApi#logoutUser + */ + fun logoutUser(): Unit + + /** + * PUT /user/{username} : Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param body Updated user object (required) + * @return Invalid user supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#updateUser + */ + fun updateUser(username: kotlin.String, body: User): Unit +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt new file mode 100644 index 000000000000..ebd822220153 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt @@ -0,0 +1,39 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.stereotype.Service +@Service +class UserApiServiceImpl : UserApiService { + + override fun createUser(body: User): Unit { + TODO("Implement me") + } + + override fun createUsersWithArrayInput(body: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun createUsersWithListInput(body: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun deleteUser(username: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getUserByName(username: kotlin.String): User { + TODO("Implement me") + } + + override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + TODO("Implement me") + } + + override fun logoutUser(): Unit { + TODO("Implement me") + } + + override fun updateUser(username: kotlin.String, body: User): Unit { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt new file mode 100644 index 000000000000..0638b1718f3d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A category for a pet + * @param id + * @param name + */ +data class Category( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt new file mode 100644 index 000000000000..f520047d850d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -0,0 +1,36 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * Describes the result of uploading an image resource + * @param code + * @param type + * @param message + */ +data class ModelApiResponse( + + @get:JsonProperty("code") val code: kotlin.Int? = null, + + @get:JsonProperty("type") val type: kotlin.String? = null, + + @get:JsonProperty("message") val message: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt new file mode 100644 index 000000000000..4ebe51e765ed --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt @@ -0,0 +1,67 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * An order for a pets from the pet store + * @param id + * @param petId + * @param quantity + * @param shipDate + * @param status Order Status + * @param complete + */ +data class Order( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("petId") val petId: kotlin.Long? = null, + + @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + + @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + + @get:JsonProperty("status") val status: Order.Status? = null, + + @get:JsonProperty("complete") val complete: kotlin.Boolean? = false +) : Serializable { + + /** + * Order Status + * Values: placed,approved,delivered + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + placed("placed"), + approved("approved"), + delivered("delivered"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Order'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt new file mode 100644 index 000000000000..cf9ccf2f4f7d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt @@ -0,0 +1,71 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import org.openapitools.model.Category +import org.openapitools.model.Tag +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A pet for sale in the pet store + * @param name + * @param photoUrls + * @param id + * @param category + * @param tags + * @param status pet status in the store + */ +data class Pet( + + @get:JsonProperty("name", required = true) val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + + @get:JsonProperty("status") val status: Pet.Status? = null +) : Serializable { + + /** + * pet status in the store + * Values: available,pending,sold + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + available("available"), + pending("pending"), + sold("sold"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt new file mode 100644 index 000000000000..36f841600047 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A tag for a pet + * @param id + * @param name + */ +data class Tag( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt new file mode 100644 index 000000000000..b04c9e312592 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt @@ -0,0 +1,51 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * A User who is purchasing from the pet store + * @param id + * @param username + * @param firstName + * @param lastName + * @param email + * @param password + * @param phone + * @param userStatus User Status + */ +data class User( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("username") val username: kotlin.String? = null, + + @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + + @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + + @get:JsonProperty("email") val email: kotlin.String? = null, + + @get:JsonProperty("password") val password: kotlin.String? = null, + + @get:JsonProperty("phone") val phone: kotlin.String? = null, + + @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/resources/application.yaml new file mode 100644 index 000000000000..8e2ebcde976d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/resources/application.yaml @@ -0,0 +1,10 @@ +spring: + application: + name: openAPIPetstore + + jackson: + serialization: + WRITE_DATES_AS_TIMESTAMPS: false + +server: + port: 8080 diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt new file mode 100644 index 000000000000..5a7baad83f26 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/PetApiTest.kt @@ -0,0 +1,137 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.junit.jupiter.api.Test +import org.springframework.http.HttpStatus + +class PetApiTest { + + private val service: PetApiService = PetApiServiceImpl() + private val api: PetApiController = PetApiController(service) + + /** + * To test PetApiController.addPet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun addPetTest() { + val body: Pet = TODO() + + val response: Unit = api.addPet(body) + + // TODO: test validations + } + + /** + * To test PetApiController.deletePet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deletePetTest() { + val petId: kotlin.Long = TODO() + val apiKey: kotlin.String? = TODO() + + val response: Unit = api.deletePet(petId, apiKey) + + // TODO: test validations + } + + /** + * To test PetApiController.findPetsByStatus + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByStatusTest() { + val status: kotlin.collections.List = TODO() + + val response: List = api.findPetsByStatus(status) + + // TODO: test validations + } + + /** + * To test PetApiController.findPetsByTags + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByTagsTest() { + val tags: kotlin.collections.List = TODO() + + val response: List = api.findPetsByTags(tags) + + // TODO: test validations + } + + /** + * To test PetApiController.getPetById + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getPetByIdTest() { + val petId: kotlin.Long = TODO() + + val response: Pet = api.getPetById(petId) + + // TODO: test validations + } + + /** + * To test PetApiController.updatePet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetTest() { + val body: Pet = TODO() + + val response: Unit = api.updatePet(body) + + // TODO: test validations + } + + /** + * To test PetApiController.updatePetWithForm + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetWithFormTest() { + val petId: kotlin.Long = TODO() + val name: kotlin.String? = TODO() + val status: kotlin.String? = TODO() + + val response: Unit = api.updatePetWithForm(petId, name, status) + + // TODO: test validations + } + + /** + * To test PetApiController.uploadFile + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun uploadFileTest() { + val petId: kotlin.Long = TODO() + val additionalMetadata: kotlin.String? = TODO() + val file: org.springframework.web.multipart.MultipartFile = TODO() + + val response: ModelApiResponse = api.uploadFile(petId, additionalMetadata, file) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt new file mode 100644 index 000000000000..8a4438d8d588 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/StoreApiTest.kt @@ -0,0 +1,70 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.junit.jupiter.api.Test +import org.springframework.http.HttpStatus + +class StoreApiTest { + + private val service: StoreApiService = StoreApiServiceImpl() + private val api: StoreApiController = StoreApiController(service) + + /** + * To test StoreApiController.deleteOrder + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteOrderTest() { + val orderId: kotlin.String = TODO() + + val response: Unit = api.deleteOrder(orderId) + + // TODO: test validations + } + + /** + * To test StoreApiController.getInventory + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getInventoryTest() { + + val response: Map = api.getInventory() + + // TODO: test validations + } + + /** + * To test StoreApiController.getOrderById + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getOrderByIdTest() { + val orderId: kotlin.Long = TODO() + + val response: Order = api.getOrderById(orderId) + + // TODO: test validations + } + + /** + * To test StoreApiController.placeOrder + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun placeOrderTest() { + val body: Order = TODO() + + val response: Order = api.placeOrder(body) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt new file mode 100644 index 000000000000..77c111370513 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/test/kotlin/org/openapitools/api/UserApiTest.kt @@ -0,0 +1,132 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.junit.jupiter.api.Test +import org.springframework.http.HttpStatus + +class UserApiTest { + + private val service: UserApiService = UserApiServiceImpl() + private val api: UserApiController = UserApiController(service) + + /** + * To test UserApiController.createUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUserTest() { + val body: User = TODO() + + val response: Unit = api.createUser(body) + + // TODO: test validations + } + + /** + * To test UserApiController.createUsersWithArrayInput + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithArrayInputTest() { + val body: kotlin.collections.List = TODO() + + val response: Unit = api.createUsersWithArrayInput(body) + + // TODO: test validations + } + + /** + * To test UserApiController.createUsersWithListInput + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithListInputTest() { + val body: kotlin.collections.List = TODO() + + val response: Unit = api.createUsersWithListInput(body) + + // TODO: test validations + } + + /** + * To test UserApiController.deleteUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteUserTest() { + val username: kotlin.String = TODO() + + val response: Unit = api.deleteUser(username) + + // TODO: test validations + } + + /** + * To test UserApiController.getUserByName + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getUserByNameTest() { + val username: kotlin.String = TODO() + + val response: User = api.getUserByName(username) + + // TODO: test validations + } + + /** + * To test UserApiController.loginUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun loginUserTest() { + val username: kotlin.String = TODO() + val password: kotlin.String = TODO() + + val response: kotlin.String = api.loginUser(username, password) + + // TODO: test validations + } + + /** + * To test UserApiController.logoutUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun logoutUserTest() { + + val response: Unit = api.logoutUser() + + // TODO: test validations + } + + /** + * To test UserApiController.updateUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updateUserTest() { + val username: kotlin.String = TODO() + val body: User = TODO() + + val response: Unit = api.updateUser(username, body) + + // TODO: test validations + } +} From 816c009c3299a7b27921741d2b9f6b564ff72561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 19 Nov 2025 09:53:34 +0100 Subject: [PATCH 09/19] satisfy samples-up-to-date check --- .../.openapi-generator/FILES | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES index 1130231108a9..e69adb786fa0 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md build.gradle.kts gradle/wrapper/gradle-wrapper.jar From 3ed53dde1af3b67d6baca7660368853736574583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 19 Nov 2025 23:57:39 +0100 Subject: [PATCH 10/19] add unit tests covering both reactive and non-reactive --- .../spring/KotlinSpringServerCodegenTest.java | 155 +++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index c86296f90f7a..c23cadc3e2a3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -1184,7 +1184,6 @@ public void generateHttpInterfaceReactiveWithReactor() throws Exception { ); } - @Test public void generateHttpInterfaceReactiveWithCoroutines() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); @@ -1383,7 +1382,12 @@ private void verifyGeneratedFilesContain(Map> expectedSnippet for (var expectedSnippetsByPathToFile : expectedSnippetsByPathsToFiles.entrySet()) { assertFileContains(expectedSnippetsByPathToFile.getKey(), expectedSnippetsByPathToFile.getValue().toArray(new String[0])); } + } + private void verifyGeneratedFilesNotContain(Map> unexpectedSnippetsByPathsToFiles) { + for (var unexpectedSnippetsByPathToFile : unexpectedSnippetsByPathsToFiles.entrySet()) { + assertFileNotContains(unexpectedSnippetsByPathToFile.getKey(), unexpectedSnippetsByPathToFile.getValue().toArray(new String[0])); + } } @Test @@ -1825,7 +1829,6 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDeleg ); } - @Test public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegateWithApiTests() throws Exception { Path root = generateApiSources(Map.of( @@ -2399,6 +2402,154 @@ public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDeleg ); } + @Test + public void reactiveWithoutResponseEntity() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.USE_RESPONSE_ENTITY, false + ), Map.of( + CodegenConstants.MODELS, "false", + CodegenConstants.MODEL_TESTS, "false", + CodegenConstants.MODEL_DOCS, "false", + CodegenConstants.APIS, "true", + CodegenConstants.SUPPORTING_FILES, "false" + )); + verifyGeneratedFilesContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( + "@ResponseStatus(HttpStatus.BAD_REQUEST)", + "suspend fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): Unit", + "@ResponseStatus(HttpStatus.OK)", + "suspend fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): Pet"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "@ResponseStatus(HttpStatus.OK)", + "suspend fun logoutUser(): Unit" + ), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of( + "@ResponseStatus(HttpStatus.OK)", + "suspend fun getInventory(): Map") + ) + ); + } + + @Test + public void nonReactiveWithoutResponseEntity() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.USE_RESPONSE_ENTITY, false + ), Map.of( + CodegenConstants.MODELS, "false", + CodegenConstants.MODEL_TESTS, "false", + CodegenConstants.MODEL_DOCS, "false", + CodegenConstants.APIS, "true", + CodegenConstants.SUPPORTING_FILES, "false" + )); + verifyGeneratedFilesContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( + "@ResponseStatus(HttpStatus.BAD_REQUEST)", + "fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): Unit", + "@ResponseStatus(HttpStatus.OK)", + "fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): Pet"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "@ResponseStatus(HttpStatus.OK)", + "fun logoutUser(): Unit" + ), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of( + "@ResponseStatus(HttpStatus.OK)", + "fun getInventory(): Map") + ) + ); + + verifyGeneratedFilesNotContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of("suspend"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of("suspend"), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of("suspend") + ) + ); + } + + @Test + public void reactiveWithResponseEntity() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.USE_RESPONSE_ENTITY, true + ), Map.of( + CodegenConstants.MODELS, "false", + CodegenConstants.MODEL_TESTS, "false", + CodegenConstants.MODEL_DOCS, "false", + CodegenConstants.APIS, "true", + CodegenConstants.SUPPORTING_FILES, "false" + )); + verifyGeneratedFilesContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( + "suspend fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", + "suspend fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "suspend fun logoutUser(): ResponseEntity" + ), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of( + "suspend fun getInventory(): ResponseEntity>") + ) + ); + + verifyGeneratedFilesNotContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of("@ResponseStatus(HttpStatus."), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of("@ResponseStatus(HttpStatus."), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of("@ResponseStatus(HttpStatus.") + ) + ); + } + + @Test + public void nonReactiveWithResponseEntity() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.USE_RESPONSE_ENTITY, true + ), Map.of( + CodegenConstants.MODELS, "false", + CodegenConstants.MODEL_TESTS, "false", + CodegenConstants.MODEL_DOCS, "false", + CodegenConstants.APIS, "true", + CodegenConstants.SUPPORTING_FILES, "false" + )); + verifyGeneratedFilesContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( + "fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", + "fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "fun logoutUser(): ResponseEntity" + ), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of( + "fun getInventory(): ResponseEntity>") + ) + ); + + verifyGeneratedFilesNotContain( + Map.of( + root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of("suspend", "@ResponseStatus(HttpStatus."), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of("suspend", "@ResponseStatus(HttpStatus."), + root.resolve("src/main/kotlin/org/openapitools/api/StoreApi.kt"), List.of("suspend", "@ResponseStatus(HttpStatus.") + ) + ); + } + @Test public void reactiveWithoutFlow() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); From 54160a88b582558bba0508573ff17813d3d89797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 20 Nov 2025 00:04:00 +0100 Subject: [PATCH 11/19] fix template to avoid unnecessary empty line --- .../main/resources/kotlin-spring/apiInterface.mustache | 10 +++++----- .../src/main/kotlin/org/openapitools/api/PetApi.kt | 8 -------- .../src/main/kotlin/org/openapitools/api/StoreApi.kt | 4 ---- .../src/main/kotlin/org/openapitools/api/UserApi.kt | 8 -------- 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 169f06f402ac..4a4c3fbfd256 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -76,11 +76,11 @@ interface {{classname}} { {{/isDelegate}} {{#operation}} - {{^useResponseEntity}} - @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}) - {{/useResponseEntity}} - {{#swagger2AnnotationLibrary}} - @Operation( +{{^useResponseEntity}} + @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}){{! +}}{{/useResponseEntity}}{{! +}}{{#swagger2AnnotationLibrary}}{{! +}} @Operation( tags = [{{#tags}}"{{{name}}}",{{/tags}}], summary = "{{{summary}}}", operationId = "{{{operationId}}}", diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 071e03cca525..a1a6c925b7d3 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -35,7 +35,6 @@ interface PetApi { fun getDelegate(): PetApiDelegate = object: PetApiDelegate {} @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - @RequestMapping( method = [RequestMethod.POST], value = ["/pet"], @@ -46,7 +45,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.DELETE], value = ["/pet/{petId}"] @@ -56,7 +54,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByStatus"], @@ -67,7 +64,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByTags"], @@ -78,7 +74,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/pet/{petId}"], @@ -89,7 +84,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.PUT], value = ["/pet"], @@ -100,7 +94,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - @RequestMapping( method = [RequestMethod.POST], value = ["/pet/{petId}"], @@ -111,7 +104,6 @@ interface PetApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/pet/{petId}/uploadImage"], diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index d4419da023a6..276db3e918f4 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -34,7 +34,6 @@ interface StoreApi { fun getDelegate(): StoreApiDelegate = object: StoreApiDelegate {} @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] @@ -44,7 +43,6 @@ interface StoreApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/store/inventory"], @@ -55,7 +53,6 @@ interface StoreApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/store/order/{orderId}"], @@ -66,7 +63,6 @@ interface StoreApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/store/order"], diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 866abb97503b..bd79352e41d5 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -34,7 +34,6 @@ interface UserApi { fun getDelegate(): UserApiDelegate = object: UserApiDelegate {} @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/user"] @@ -44,7 +43,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithArray"] @@ -54,7 +52,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithList"] @@ -64,7 +61,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.DELETE], value = ["/user/{username}"] @@ -74,7 +70,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/user/{username}"], @@ -85,7 +80,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/user/login"], @@ -96,7 +90,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/user/logout"] @@ -106,7 +99,6 @@ interface UserApi { } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.PUT], value = ["/user/{username}"] From 0f695d5f54059c28aa55230b1bf7af67ccbd8d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 20 Nov 2025 00:17:34 +0100 Subject: [PATCH 12/19] fix template to avoid unnecessary empty line --- .../src/main/resources/kotlin-spring/api.mustache | 10 +++++----- .../kotlin/org/openapitools/api/PetApiController.kt | 8 -------- .../kotlin/org/openapitools/api/StoreApiController.kt | 4 ---- .../kotlin/org/openapitools/api/UserApiController.kt | 8 -------- 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 9fd649794f59..d9b21dba03a7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -65,11 +65,11 @@ import kotlin.collections.Map class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { {{#operation}} - {{^useResponseEntity}} - @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}) - {{/useResponseEntity}} - {{#swagger2AnnotationLibrary}} - @Operation( +{{^useResponseEntity}} + @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}){{! +}}{{/useResponseEntity}}{{! +}}{{#swagger2AnnotationLibrary}}{{! +}} @Operation( summary = "{{{summary}}}", operationId = "{{{operationId}}}", description = """{{{unescapedNotes}}}""", diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index cbf34f4cc519..3c6cc88d61fb 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -29,7 +29,6 @@ import kotlin.collections.Map class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - @RequestMapping( method = [RequestMethod.POST], value = ["/pet"], @@ -40,7 +39,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.DELETE], value = ["/pet/{petId}"] @@ -50,7 +48,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByStatus"], @@ -61,7 +58,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByTags"], @@ -72,7 +68,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/pet/{petId}"], @@ -83,7 +78,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.PUT], value = ["/pet"], @@ -94,7 +88,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - @RequestMapping( method = [RequestMethod.POST], value = ["/pet/{petId}"], @@ -105,7 +98,6 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/pet/{petId}/uploadImage"], diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 4052d93bc2b7..14fb48e01908 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -28,7 +28,6 @@ import kotlin.collections.Map class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] @@ -38,7 +37,6 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/store/inventory"], @@ -49,7 +47,6 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/store/order/{orderId}"], @@ -60,7 +57,6 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/store/order"], diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index f7c3d54bb521..4e9c15cd927f 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -28,7 +28,6 @@ import kotlin.collections.Map class UserApiController(@Autowired(required = true) val service: UserApiService) { @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/user"] @@ -38,7 +37,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithArray"] @@ -48,7 +46,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithList"] @@ -58,7 +55,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.DELETE], value = ["/user/{username}"] @@ -68,7 +64,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/user/{username}"], @@ -79,7 +74,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/user/login"], @@ -90,7 +84,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.OK) - @RequestMapping( method = [RequestMethod.GET], value = ["/user/logout"] @@ -100,7 +93,6 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) } @ResponseStatus(HttpStatus.BAD_REQUEST) - @RequestMapping( method = [RequestMethod.PUT], value = ["/user/{username}"] From fbcd4a9bf2ef88be29ccd7b64277f9a11ca65e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 20 Nov 2025 09:56:46 +0100 Subject: [PATCH 13/19] put method params (if present) on separate lines to improve readability --- .../kotlin-spring/apiInterface.mustache | 23 +- .../spring/KotlinSpringServerCodegenTest.java | 288 ++++++++++++++---- .../kotlin/org/openapitools/api/PetApi.kt | 89 +++--- .../kotlin/org/openapitools/api/StoreApi.kt | 36 ++- .../kotlin/org/openapitools/api/UserApi.kt | 74 +++-- .../kotlin/org/openapitools/api/PetApi.kt | 97 +++--- .../kotlin/org/openapitools/api/StoreApi.kt | 36 ++- .../kotlin/org/openapitools/api/UserApi.kt | 78 +++-- .../kotlin/org/openapitools/api/PetApi.kt | 97 +++--- .../kotlin/org/openapitools/api/StoreApi.kt | 36 ++- .../kotlin/org/openapitools/api/UserApi.kt | 78 +++-- .../kotlin/org/openapitools/api/PetApi.kt | 141 ++++++--- .../kotlin/org/openapitools/api/StoreApi.kt | 63 ++-- .../kotlin/org/openapitools/api/UserApi.kt | 129 +++++--- .../kotlin/org/openapitools/api/DefaultApi.kt | 6 +- .../kotlin/org/openapitools/api/PetApi.kt | 85 ++++-- .../kotlin/org/openapitools/api/StoreApi.kt | 34 ++- .../kotlin/org/openapitools/api/UserApi.kt | 66 ++-- .../kotlin/org/openapitools/api/FakeApi.kt | 10 +- .../openapitools/api/FakeClassnameTestApi.kt | 12 +- .../kotlin/org/openapitools/api/FooApi.kt | 6 +- .../kotlin/org/openapitools/api/PetApi.kt | 89 +++--- .../kotlin/org/openapitools/api/StoreApi.kt | 36 ++- .../kotlin/org/openapitools/api/UserApi.kt | 78 +++-- .../kotlin/org/openapitools/api/PetApi.kt | 141 ++++++--- .../kotlin/org/openapitools/api/StoreApi.kt | 63 ++-- .../kotlin/org/openapitools/api/UserApi.kt | 129 +++++--- 27 files changed, 1311 insertions(+), 709 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 4a4c3fbfd256..c3d3f50b234e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -96,18 +96,23 @@ interface {{classname}} { notes = "{{{notes}}}"{{#returnBaseType}}, response = {{{.}}}::class{{/returnBaseType}}{{#returnContainer}}, responseContainer = "{{{.}}}"{{/returnContainer}}{{#hasAuthMethods}}, - authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}}) + authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}} + ) @ApiResponses( - value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}}, {{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} + value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}}, {{/-last}}{{/responses}}] + ){{/swagger1AnnotationLibrary}} @RequestMapping( - method = [RequestMethod.{{httpMethod}}], - value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"]{{#singleContentTypes}}{{#hasProduces}}, - produces = [{{#vendorExtensions.x-accepts}}"{{{.}}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-accepts}}]{{/hasProduces}}{{#hasConsumes}}, - consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, - produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, - consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} + method = [RequestMethod.{{httpMethod}}], + value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"]{{#singleContentTypes}}{{#hasProduces}}, + produces = [{{#vendorExtensions.x-accepts}}"{{{.}}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-accepts}}]{{/hasProduces}}{{#hasConsumes}}, + consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, + produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, + consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{^skipDefaultApiInterface}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}} + {{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, + {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}{{#hasParams}} + {{/hasParams}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}}{{^skipDefaultApiInterface}} { {{^isDelegate}} return {{>returnValue}} {{/isDelegate}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index c23cadc3e2a3..59b859408c09 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -1625,8 +1625,15 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelega verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) @@ -1652,8 +1659,15 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) @@ -1679,8 +1693,15 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate( verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) @@ -1706,8 +1727,13 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelega verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(): ResponseEntity") ) @@ -1733,8 +1759,15 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDel verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) @@ -1760,8 +1793,15 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDe verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) @@ -1787,8 +1827,15 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelega verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) @@ -1882,8 +1929,13 @@ public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDel verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(): ResponseEntity") ) @@ -1909,8 +1961,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerDelegat verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -1941,8 +2000,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1Delega verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -1973,8 +2039,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNoneDelegate() verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2005,8 +2078,13 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneDelegat verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2037,8 +2115,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerDele verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2069,8 +2154,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1Del verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2101,8 +2193,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneDelegat verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "fun deletePet(\n" + + " @PathVariable(\"petId\") petId: kotlin.Long,\n" + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?,\n" + + " request: javax.servlet.http.HttpServletRequest\n" + + " ): ResponseEntity {", + "fun getPetById(\n" + + " @PathVariable(\"petId\") petId: kotlin.Long,\n" + + " request: javax.servlet.http.HttpServletRequest\n" + + " ): ResponseEntity {"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2133,8 +2232,13 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneDele verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2165,8 +2269,15 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerDelegate verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2197,8 +2308,15 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1Delegat verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2229,8 +2347,15 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneDelegate() verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2261,8 +2386,13 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDelegate verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2293,8 +2423,15 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2325,8 +2462,15 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1Dele verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2357,8 +2501,15 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneDelegate verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2389,8 +2540,13 @@ public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "logoutUser(): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( @@ -2421,9 +2577,14 @@ public void reactiveWithoutResponseEntity() throws Exception { Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( "@ResponseStatus(HttpStatus.BAD_REQUEST)", - "suspend fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): Unit", + "suspend fun deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): Unit", "@ResponseStatus(HttpStatus.OK)", - "suspend fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): Pet"), + "suspend fun getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): Pet"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "@ResponseStatus(HttpStatus.OK)", "suspend fun logoutUser(): Unit" @@ -2454,9 +2615,14 @@ public void nonReactiveWithoutResponseEntity() throws Exception { Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( "@ResponseStatus(HttpStatus.BAD_REQUEST)", - "fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): Unit", + "fun deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): Unit", "@ResponseStatus(HttpStatus.OK)", - "fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): Pet"), + "fun getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): Pet"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "@ResponseStatus(HttpStatus.OK)", "fun logoutUser(): Unit" @@ -2494,8 +2660,13 @@ public void reactiveWithResponseEntity() throws Exception { verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "suspend fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "suspend fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "suspend fun deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "suspend fun getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "suspend fun logoutUser(): ResponseEntity" ), @@ -2531,8 +2702,13 @@ public void nonReactiveWithResponseEntity() throws Exception { verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApi.kt"), List.of( - "fun deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "fun getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "fun deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "fun getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( "fun logoutUser(): ResponseEntity" ), diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt index 88fdcb3bdd40..fbbca91d2fc1 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -34,83 +34,104 @@ interface PetApi { @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - produces = ["application/xml", "application/json"], - consumes = ["application/json", "application/xml"] + method = [RequestMethod.POST], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun addPet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - produces = ["application/xml", "application/json"], - consumes = ["application/json", "application/xml"] + method = [RequestMethod.PUT], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun updatePet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt index 309f66b435d0..a6458382cd24 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -33,18 +33,20 @@ interface StoreApi { @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) fun getInventory(): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -52,22 +54,26 @@ interface StoreApi { @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/xml", "application/json"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"], + consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt index 318293a5e7f8..763d09a96fb6 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -33,67 +33,80 @@ interface UserApi { @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) fun logoutUser(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -101,11 +114,14 @@ interface UserApi { @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt index 792572559201..35625e526a2a 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -53,12 +53,14 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - produces = ["application/xml", "application/json"], - consumes = ["application/json", "application/xml"] - ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] + ) + fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return getDelegate().addPet(pet) } @@ -73,10 +75,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return getDelegate().deletePet(petId, apiKey) } @@ -92,11 +97,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return getDelegate().findPetsByStatus(status) } @@ -112,11 +119,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return getDelegate().findPetsByTags(tags) } @@ -133,11 +142,13 @@ interface PetApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return getDelegate().getPetById(petId) } @@ -155,12 +166,14 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - produces = ["application/xml", "application/json"], - consumes = ["application/json", "application/xml"] - ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + method = [RequestMethod.PUT], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] + ) + fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return getDelegate().updatePet(pet) } @@ -175,11 +188,15 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] - ) - fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return getDelegate().updatePetWithForm(petId, name, status) } @@ -194,12 +211,16 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] - ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt index 11108f5c6535..65a28693e5e0 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -51,10 +51,12 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] ) - fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return getDelegate().deleteOrder(orderId) } @@ -69,9 +71,9 @@ interface StoreApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) fun getInventory(): ResponseEntity> { return getDelegate().getInventory() @@ -89,11 +91,13 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return getDelegate().getOrderById(orderId) } @@ -108,12 +112,14 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/xml", "application/json"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"], + consumes = ["application/json"] ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order + ): ResponseEntity { return getDelegate().placeOrder(order) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt index 76b48c1ec0ae..fc1dd03f04d2 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -51,11 +51,13 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return getDelegate().createUser(user) } @@ -70,11 +72,13 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return getDelegate().createUsersWithArrayInput(user) } @@ -89,11 +93,13 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return getDelegate().createUsersWithListInput(user) } @@ -109,10 +115,12 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return getDelegate().deleteUser(username) } @@ -128,11 +136,13 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return getDelegate().getUserByName(username) } @@ -147,11 +157,14 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/xml", "application/json"] - ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return getDelegate().loginUser(username, password) } @@ -166,8 +179,8 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) fun logoutUser(): ResponseEntity { return getDelegate().logoutUser() @@ -185,11 +198,14 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] - ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] + ) + fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return getDelegate().updateUser(username, user) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 3816bc65b78b..5907be4b21f6 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -52,12 +52,14 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - produces = ["application/xml", "application/json"], - consumes = ["application/json", "application/xml"] - ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] + ) + fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return getDelegate().addPet(pet) } @@ -72,10 +74,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return getDelegate().deletePet(petId, apiKey) } @@ -91,11 +96,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return getDelegate().findPetsByStatus(status) } @@ -111,11 +118,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return getDelegate().findPetsByTags(tags) } @@ -132,11 +141,13 @@ interface PetApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return getDelegate().getPetById(petId) } @@ -154,12 +165,14 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - produces = ["application/xml", "application/json"], - consumes = ["application/json", "application/xml"] - ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + method = [RequestMethod.PUT], + value = ["/pet"], + produces = ["application/xml", "application/json"], + consumes = ["application/json", "application/xml"] + ) + fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return getDelegate().updatePet(pet) } @@ -174,11 +187,15 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] - ) - fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return getDelegate().updatePetWithForm(petId, name, status) } @@ -193,12 +210,16 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] - ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 6cd8dc53a457..844fc64b818b 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -50,10 +50,12 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] ) - fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return getDelegate().deleteOrder(orderId) } @@ -68,9 +70,9 @@ interface StoreApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) fun getInventory(): ResponseEntity> { return getDelegate().getInventory() @@ -88,11 +90,13 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return getDelegate().getOrderById(orderId) } @@ -107,12 +111,14 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/xml", "application/json"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"], + consumes = ["application/json"] ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order + ): ResponseEntity { return getDelegate().placeOrder(order) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 81391593ab86..e972e0b8d13b 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -50,11 +50,13 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return getDelegate().createUser(user) } @@ -69,11 +71,13 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return getDelegate().createUsersWithArrayInput(user) } @@ -88,11 +92,13 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return getDelegate().createUsersWithListInput(user) } @@ -108,10 +114,12 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return getDelegate().deleteUser(username) } @@ -127,11 +135,13 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return getDelegate().getUserByName(username) } @@ -146,11 +156,14 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/xml", "application/json"] - ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return getDelegate().loginUser(username, password) } @@ -165,8 +178,8 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) fun logoutUser(): ResponseEntity { return getDelegate().logoutUser() @@ -184,11 +197,14 @@ interface UserApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] - ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] + ) + fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return getDelegate().updateUser(username, user) } } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index a5484ab149dd..0e997b5a08bb 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -49,15 +49,20 @@ interface PetApi { value = "Add a new pet to the store", nickname = "addPet", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 405, message = "Invalid input")]) + value = [ApiResponse(code = 405, message = "Invalid input")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json"] ) - suspend fun addPet(@ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun addPet( + @ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().addPet(pet, exchange) } @@ -66,14 +71,20 @@ interface PetApi { value = "Deletes a pet", nickname = "deletePet", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid pet value")]) + value = [ApiResponse(code = 400, message = "Invalid pet value")] + ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - suspend fun deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun deletePet( + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().deletePet(petId, apiKey, exchange) } @@ -84,15 +95,20 @@ interface PetApi { notes = "Multiple status values can be provided with comma separated strings", response = Pet::class, responseContainer = "List", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid status value")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid status value")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/json"] ) - fun findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> { + fun findPetsByStatus( + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity> { return getDelegate().findPetsByStatus(status, exchange) } @@ -103,15 +119,20 @@ interface PetApi { notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet::class, responseContainer = "List", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid tag value")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid tag value")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/json"] ) - fun findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> { + fun findPetsByTags( + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity> { return getDelegate().findPetsByTags(tags, exchange) } @@ -121,15 +142,20 @@ interface PetApi { nickname = "getPetById", notes = "Returns a single pet", response = Pet::class, - authorizations = [Authorization(value = "api_key")]) + authorizations = [Authorization(value = "api_key")] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/json"] ) - suspend fun getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun getPetById( + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().getPetById(petId, exchange) } @@ -138,15 +164,20 @@ interface PetApi { value = "Update an existing pet", nickname = "updatePet", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found"), ApiResponse(code = 405, message = "Validation exception")]) + value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found"), ApiResponse(code = 405, message = "Validation exception")] + ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - consumes = ["application/json"] + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json"] ) - suspend fun updatePet(@ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun updatePet( + @ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().updatePet(pet, exchange) } @@ -155,15 +186,22 @@ interface PetApi { value = "Updates a pet in the store with form data", nickname = "updatePetWithForm", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 405, message = "Invalid input")]) + value = [ApiResponse(code = 405, message = "Invalid input")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] ) - suspend fun updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun updatePetWithForm( + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().updatePetWithForm(petId, name, status, exchange) } @@ -173,16 +211,23 @@ interface PetApi { nickname = "uploadFile", notes = "", response = ModelApiResponse::class, - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) + value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] ) - suspend fun uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun uploadFile( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file, exchange) } } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 8b42f54741f0..ee5e5a1b8cc8 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -47,14 +47,19 @@ interface StoreApi { @ApiOperation( value = "Delete purchase order by ID", nickname = "deleteOrder", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")]) + value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")] + ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] ) - suspend fun deleteOrder(@ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.String, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun deleteOrder( + @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.String, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().deleteOrder(orderId, exchange) } @@ -65,13 +70,15 @@ interface StoreApi { notes = "", response = kotlin.Int::class, responseContainer = "Map", - authorizations = [Authorization(value = "api_key")]) + authorizations = [Authorization(value = "api_key")] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) + value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) suspend fun getInventory(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> { return getDelegate().getInventory(exchange) @@ -82,15 +89,20 @@ interface StoreApi { value = "Find purchase order by ID", nickname = "getOrderById", notes = "", - response = Order::class) + response = Order::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/json"] ) - suspend fun getOrderById(@Min(value=1) @Max(value=5) @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.Int, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun getOrderById( + @Min(value=1) @Max(value=5) @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.Int, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().getOrderById(orderId, exchange) } @@ -99,16 +111,21 @@ interface StoreApi { value = "Place an order for a pet", nickname = "placeOrder", notes = "", - response = Order::class) + response = Order::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid Order")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid Order")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/json"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/json"], + consumes = ["application/json"] ) - suspend fun placeOrder(@ApiParam(value = "", required = true) @Valid @RequestBody order: Order, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun placeOrder( + @ApiParam(value = "", required = true) @Valid @RequestBody order: Order, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().placeOrder(order, exchange) } } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 8cddc539266b..9674c8131936 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -47,15 +47,20 @@ interface UserApi { @ApiOperation( value = "Create user", nickname = "createUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] ) - suspend fun createUser(@ApiParam(value = "", required = true) @Valid @RequestBody user: User, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun createUser( + @ApiParam(value = "", required = true) @Valid @RequestBody user: User, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().createUser(user, exchange) } @@ -63,15 +68,20 @@ interface UserApi { @ApiOperation( value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - suspend fun createUsersWithArrayInput(@ApiParam(value = "", required = true) @Valid @RequestBody user: Flow, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun createUsersWithArrayInput( + @ApiParam(value = "", required = true) @Valid @RequestBody user: Flow, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().createUsersWithArrayInput(user, exchange) } @@ -79,15 +89,20 @@ interface UserApi { @ApiOperation( value = "Creates list of users with given input array", nickname = "createUsersWithListInput", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] ) - suspend fun createUsersWithListInput(@ApiParam(value = "", required = true) @Valid @RequestBody user: Flow, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun createUsersWithListInput( + @ApiParam(value = "", required = true) @Valid @RequestBody user: Flow, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().createUsersWithListInput(user, exchange) } @@ -95,14 +110,19 @@ interface UserApi { @ApiOperation( value = "Delete user", nickname = "deleteUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")]) + value = [ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")] + ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - suspend fun deleteUser(@ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun deleteUser( + @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().deleteUser(username, exchange) } @@ -111,15 +131,20 @@ interface UserApi { value = "Get user by user name", nickname = "getUserByName", notes = "", - response = User::class) + response = User::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = User::class), ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")]) + value = [ApiResponse(code = 200, message = "successful operation", response = User::class), ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/json"] ) - suspend fun getUserByName(@ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun getUserByName( + @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().getUserByName(username, exchange) } @@ -128,15 +153,21 @@ interface UserApi { value = "Logs user into the system", nickname = "loginUser", notes = "", - response = kotlin.String::class) + response = kotlin.String::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class), ApiResponse(code = 400, message = "Invalid username/password supplied")]) + value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class), ApiResponse(code = 400, message = "Invalid username/password supplied")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/json"] ) - suspend fun loginUser(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun loginUser( + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().loginUser(username, password, exchange) } @@ -144,12 +175,14 @@ interface UserApi { @ApiOperation( value = "Logs out current logged in user session", nickname = "logoutUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) suspend fun logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { return getDelegate().logoutUser(exchange) @@ -159,15 +192,21 @@ interface UserApi { @ApiOperation( value = "Updated user", nickname = "updateUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid user supplied"), ApiResponse(code = 404, message = "User not found")]) + value = [ApiResponse(code = 400, message = "Invalid user supplied"), ApiResponse(code = 404, message = "User not found")] + ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] ) - suspend fun updateUser(@ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String,@ApiParam(value = "", required = true) @Valid @RequestBody user: User, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + suspend fun updateUser( + @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(value = "", required = true) @Valid @RequestBody user: User, + @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange + ): ResponseEntity { return getDelegate().updateUser(username, user, exchange) } } diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt index af1f1ebefb90..1d59076211bc 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt @@ -34,9 +34,9 @@ interface DefaultApi { @RequestMapping( - method = [RequestMethod.GET], - value = ["/healthcheck"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/healthcheck"], + produces = ["application/json"] ) fun healthcheck(): ResponseEntity } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index a1a6c925b7d3..ec377ba813c4 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -36,81 +36,102 @@ interface PetApi { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - consumes = ["application/json", "application/xml"] + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody body: Pet): Unit { + fun addPet( + @Valid @RequestBody body: Pet + ): Unit { return getDelegate().addPet(body) } @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): Unit { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): Unit { return getDelegate().deletePet(petId, apiKey) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): List { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): List { return getDelegate().findPetsByStatus(status) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): List { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): List { return getDelegate().findPetsByTags(tags) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): Pet { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): Pet { return getDelegate().getPetById(petId) } @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - consumes = ["application/json", "application/xml"] + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody body: Pet): Unit { + fun updatePet( + @Valid @RequestBody body: Pet + ): Unit { return getDelegate().updatePet(body) } @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): Unit { return getDelegate().updatePetWithForm(petId, name, status) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ModelApiResponse { return getDelegate().uploadFile(petId, additionalMetadata, file) } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 276db3e918f4..f850fb62cd04 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -35,18 +35,20 @@ interface StoreApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): Unit { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): Unit { return getDelegate().deleteOrder(orderId) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) fun getInventory(): Map { return getDelegate().getInventory() @@ -54,21 +56,25 @@ interface StoreApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): Order { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): Order { return getDelegate().getOrderById(orderId) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"] ) - fun placeOrder( @Valid @RequestBody body: Order): Order { + fun placeOrder( + @Valid @RequestBody body: Order + ): Order { return getDelegate().placeOrder(body) } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index bd79352e41d5..3c6863e8ae82 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -35,64 +35,77 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"] + method = [RequestMethod.POST], + value = ["/user"] ) - fun createUser( @Valid @RequestBody body: User): Unit { + fun createUser( + @Valid @RequestBody body: User + ): Unit { return getDelegate().createUser(body) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + fun createUsersWithArrayInput( + @Valid @RequestBody body: kotlin.collections.List + ): Unit { return getDelegate().createUsersWithArrayInput(body) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"] + method = [RequestMethod.POST], + value = ["/user/createWithList"] ) - fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + fun createUsersWithListInput( + @Valid @RequestBody body: kotlin.collections.List + ): Unit { return getDelegate().createUsersWithListInput(body) } @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): Unit { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): Unit { return getDelegate().deleteUser(username) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): User { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): User { return getDelegate().getUserByName(username) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): kotlin.String { + fun loginUser( + @NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): kotlin.String { return getDelegate().loginUser(username, password) } @ResponseStatus(HttpStatus.OK) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) fun logoutUser(): Unit { return getDelegate().logoutUser() @@ -100,10 +113,13 @@ interface UserApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"] + method = [RequestMethod.PUT], + value = ["/user/{username}"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): Unit { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody body: User + ): Unit { return getDelegate().updateUser(username, body) } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt index 1b78bc27d45d..6b9197d4819e 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt @@ -47,11 +47,13 @@ interface FakeApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/fake/cookie-suggestion"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/fake/cookie-suggestion"], + produces = ["application/json"] ) - fun fakeCookieSuggestion(@NotNull @CookieValue(name = "category.history") categoryHistory: kotlin.String): ResponseEntity> { + fun fakeCookieSuggestion( + @NotNull @CookieValue(name = "category.history") categoryHistory: kotlin.String + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt index 2b2ad61ab63d..ce97fc564acb 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt @@ -48,12 +48,14 @@ interface FakeClassnameTestApi { security = [ SecurityRequirement(name = "api_key_query") ] ) @RequestMapping( - method = [RequestMethod.PATCH], - value = ["/fake_classname_test"], - produces = ["application/json"], - consumes = ["application/json"] + method = [RequestMethod.PATCH], + value = ["/fake_classname_test"], + produces = ["application/json"], + consumes = ["application/json"] ) - fun testClassname(@Parameter(description = "client model", required = true) @Valid @RequestBody client: Client): ResponseEntity { + fun testClassname( + @Parameter(description = "client model", required = true) @Valid @RequestBody client: Client + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt index 1a2322eaa34b..41f896d9abf3 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt @@ -47,9 +47,9 @@ interface FooApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/foo"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/foo"], + produces = ["application/json"] ) fun fooGet(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt index 565b6264e4d7..5936f25bf28f 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -50,11 +50,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - consumes = ["application/json", "application/xml"] + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json", "application/xml"] ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -70,10 +72,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -89,11 +94,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -109,11 +116,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -130,11 +139,13 @@ interface PetApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -152,11 +163,13 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - consumes = ["application/json", "application/xml"] + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json", "application/xml"] ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -172,11 +185,15 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] - ) - fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -191,12 +208,16 @@ interface PetApi { security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] - ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt index 312e7f3d2365..56c8aebfb053 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -48,10 +48,12 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{order_id}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{order_id}"] ) - fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -66,9 +68,9 @@ interface StoreApi { security = [ SecurityRequirement(name = "api_key") ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) fun getInventory(): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -86,11 +88,13 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{order_id}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{order_id}"], + produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -105,12 +109,14 @@ interface StoreApi { ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/xml", "application/json"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"], + consumes = ["application/json"] ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt index 101e862d02ef..328ce0c16597 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -47,11 +47,13 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -65,11 +67,13 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -83,11 +87,13 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -102,10 +108,12 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -121,11 +129,13 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/xml", "application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -140,11 +150,14 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/xml", "application/json"] - ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser( + @NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -158,8 +171,8 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) fun logoutUser(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -176,11 +189,14 @@ interface UserApi { ] ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] - ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] + ) + fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt index e40570844574..7d802e200297 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -46,29 +46,40 @@ interface PetApi { value = "Add a new pet to the store", nickname = "addPet", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 405, message = "Invalid input")]) + value = [ApiResponse(code = 405, message = "Invalid input")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json"] ) - fun addPet(@ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun addPet( + @ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Deletes a pet", nickname = "deletePet", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid pet value")]) + value = [ApiResponse(code = 400, message = "Invalid pet value")] + ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] ) - fun deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun deletePet( + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( @@ -77,15 +88,20 @@ interface PetApi { notes = "Multiple status values can be provided with comma separated strings", response = Pet::class, responseContainer = "List", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid status value")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid status value")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/json"] ) - fun findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> + fun findPetsByStatus( + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity> @ApiOperation( @@ -94,15 +110,20 @@ interface PetApi { notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet::class, responseContainer = "List", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid tag value")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"), ApiResponse(code = 400, message = "Invalid tag value")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/json"] ) - fun findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> + fun findPetsByTags( + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity> @ApiOperation( @@ -110,45 +131,62 @@ interface PetApi { nickname = "getPetById", notes = "Returns a single pet", response = Pet::class, - authorizations = [Authorization(value = "api_key")]) + authorizations = [Authorization(value = "api_key")] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/json"] ) - fun getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun getPetById( + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Update an existing pet", nickname = "updatePet", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found"), ApiResponse(code = 405, message = "Validation exception")]) + value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Pet not found"), ApiResponse(code = 405, message = "Validation exception")] + ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - consumes = ["application/json"] + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json"] ) - fun updatePet(@ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun updatePet( + @ApiParam(value = "", required = true) @Valid @RequestBody pet: Pet, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Updates a pet in the store with form data", nickname = "updatePetWithForm", notes = "", - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 405, message = "Invalid input")]) + value = [ApiResponse(code = 405, message = "Invalid input")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun updatePetWithForm( + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( @@ -156,14 +194,21 @@ interface PetApi { nickname = "uploadFile", notes = "", response = ModelApiResponse::class, - authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])]) + authorizations = [Authorization(value = "petstore_auth", scopes = [AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), AuthorizationScope(scope = "read:pets", description = "read your pets")])] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) + value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] ) - fun uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun uploadFile( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt index 69b2aa749a65..556701580be4 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -44,14 +44,19 @@ interface StoreApi { @ApiOperation( value = "Delete purchase order by ID", nickname = "deleteOrder", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")]) + value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")] + ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] ) - fun deleteOrder(@ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.String, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun deleteOrder( + @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.String, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( @@ -60,13 +65,15 @@ interface StoreApi { notes = "", response = kotlin.Int::class, responseContainer = "Map", - authorizations = [Authorization(value = "api_key")]) + authorizations = [Authorization(value = "api_key")] + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) + value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] ) fun getInventory(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> @@ -75,29 +82,39 @@ interface StoreApi { value = "Find purchase order by ID", nickname = "getOrderById", notes = "", - response = Order::class) + response = Order::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/json"] ) - fun getOrderById(@Min(value=1) @Max(value=5) @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.Int, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun getOrderById( + @Min(value=1) @Max(value=5) @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.Int, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Place an order for a pet", nickname = "placeOrder", notes = "", - response = Order::class) + response = Order::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid Order")]) + value = [ApiResponse(code = 200, message = "successful operation", response = Order::class), ApiResponse(code = 400, message = "Invalid Order")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/json"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/json"], + consumes = ["application/json"] ) - fun placeOrder(@ApiParam(value = "", required = true) @Valid @RequestBody order: Order, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun placeOrder( + @ApiParam(value = "", required = true) @Valid @RequestBody order: Order, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt index acf9134e4931..7b89885d6038 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -44,97 +44,130 @@ interface UserApi { @ApiOperation( value = "Create user", nickname = "createUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] ) - fun createUser(@ApiParam(value = "", required = true) @Valid @RequestBody user: User, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun createUser( + @ApiParam(value = "", required = true) @Valid @RequestBody user: User, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - fun createUsersWithArrayInput(@ApiParam(value = "", required = true) @Valid @RequestBody user: kotlin.collections.List, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun createUsersWithArrayInput( + @ApiParam(value = "", required = true) @Valid @RequestBody user: kotlin.collections.List, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Creates list of users with given input array", nickname = "createUsersWithListInput", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] ) - fun createUsersWithListInput(@ApiParam(value = "", required = true) @Valid @RequestBody user: kotlin.collections.List, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun createUsersWithListInput( + @ApiParam(value = "", required = true) @Valid @RequestBody user: kotlin.collections.List, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Delete user", nickname = "deleteUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")]) + value = [ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")] + ) @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] + method = [RequestMethod.DELETE], + value = ["/user/{username}"] ) - fun deleteUser(@ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun deleteUser( + @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Get user by user name", nickname = "getUserByName", notes = "", - response = User::class) + response = User::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = User::class), ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")]) + value = [ApiResponse(code = 200, message = "successful operation", response = User::class), ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/json"] ) - fun getUserByName(@ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun getUserByName( + @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Logs user into the system", nickname = "loginUser", notes = "", - response = kotlin.String::class) + response = kotlin.String::class + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class), ApiResponse(code = 400, message = "Invalid username/password supplied")]) + value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class), ApiResponse(code = 400, message = "Invalid username/password supplied")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/json"] + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/json"] ) - fun loginUser(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun loginUser( + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity @ApiOperation( value = "Logs out current logged in user session", nickname = "logoutUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 200, message = "successful operation")]) + value = [ApiResponse(code = 200, message = "successful operation")] + ) @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] + method = [RequestMethod.GET], + value = ["/user/logout"] ) fun logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity @@ -142,13 +175,19 @@ interface UserApi { @ApiOperation( value = "Updated user", nickname = "updateUser", - notes = "") + notes = "" + ) @ApiResponses( - value = [ApiResponse(code = 400, message = "Invalid user supplied"), ApiResponse(code = 404, message = "User not found")]) + value = [ApiResponse(code = 400, message = "Invalid user supplied"), ApiResponse(code = 404, message = "User not found")] + ) @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] ) - fun updateUser(@ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String,@ApiParam(value = "", required = true) @Valid @RequestBody user: User, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun updateUser( + @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(value = "", required = true) @Valid @RequestBody user: User, + @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest + ): ResponseEntity } From c825a780381e72ae84e6b1743ad5833e62de26a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 20 Nov 2025 10:39:48 +0100 Subject: [PATCH 14/19] put method params (if present) on separate lines to improve readability; fix double spaces, spaces before comma, incorrect spaces --- .../main/resources/kotlin-spring/api.mustache | 5 +- .../kotlin-spring/bodyParams.mustache | 2 +- .../kotlin-spring/formParams.mustache | 2 +- .../kotlin-spring/headerParams.mustache | 2 +- .../httpInterfaceBodyParams.mustache | 2 +- .../kotlin-spring/pathParams.mustache | 2 +- .../kotlin-spring/queryParams.mustache | 2 +- .../spring/KotlinSpringServerCodegenTest.java | 118 ++++++++++++++---- .../kotlin/org/openapitools/api/PetApi.kt | 26 ++-- .../kotlin/org/openapitools/api/StoreApi.kt | 6 +- .../kotlin/org/openapitools/api/UserApi.kt | 18 +-- .../org/openapitools/api/PetApiClient.kt | 6 +- .../org/openapitools/api/PetApiClient.kt | 6 +- .../org/openapitools/api/PetApiClient.kt | 6 +- .../org/openapitools/api/PetApiClient.kt | 6 +- .../org/openapitools/api/FakeApiController.kt | 11 +- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/TestApiController.kt | 4 +- .../kotlin/org/openapitools/api/PetApi.kt | 6 +- .../kotlin/org/openapitools/api/PetApi.kt | 6 +- .../kotlin/org/openapitools/api/PetApi.kt | 6 +- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../api/MultipartMixedApiController.kt | 6 +- .../kotlin/org/openapitools/api/PetApi.kt | 26 ++-- .../kotlin/org/openapitools/api/StoreApi.kt | 6 +- .../kotlin/org/openapitools/api/UserApi.kt | 18 +-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../kotlin/org/openapitools/api/PetApi.kt | 6 +- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- .../kotlin/org/openapitools/api/PetApi.kt | 6 +- .../org/openapitools/api/PetApiController.kt | 37 ++++-- .../openapitools/api/StoreApiController.kt | 12 +- .../org/openapitools/api/UserApiController.kt | 30 +++-- 62 files changed, 930 insertions(+), 328 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index d9b21dba03a7..9ac784471687 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -94,7 +94,10 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}} + {{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, + {{/hasParams}}{{#swagger1AnnotationLibrary}}@ApiParam(hidden = true) {{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}@Parameter(hidden = true) {{/swagger2AnnotationLibrary}}{{#reactive}}exchange: org.springframework.web.server.ServerWebExchange{{/reactive}}{{^reactive}}request: {{javaxPackage}}.servlet.http.HttpServletRequest{{/reactive}}{{/includeHttpRequestContext}}{{#hasParams}} + {{/hasParams}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} { return {{>returnValue}} } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache index 4ca6b20ca93d..b4f03475cd0b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"], defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"]){{/defaultValue}}{{/allowableValues}}{{/isContainer}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}, allowableValues = "{{{.}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"], defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"]){{/defaultValue}}{{/allowableValues}}{{/isContainer}}) {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}, allowableValues = "{{{.}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{/swagger1AnnotationLibrary}}{{#useBeanValidation}}@Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/formParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/formParams.mustache index c6eb0799686a..456af893718f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@RequestParam{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "file detail"){{/swagger1AnnotationLibrary}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}) {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{/swagger1AnnotationLibrary}}{{#useBeanValidation}}@Valid {{/useBeanValidation}}{{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@RequestParam{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{#isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}") {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "file detail") {{/swagger1AnnotationLibrary}}{{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/headerParams.mustache index a6fa7386e360..0c2678f1bf67 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/headerParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}", `in` = ParameterIn.HEADER{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}{{#defaultValue}}, defaultValue = {{^isString}}"{{{.}}}"{{/isString}}{{#isString}}{{#isEnum}}"{{{.}}}"{{/isEnum}}{{^isEnum}}{{{.}}}{{/isEnum}}{{/isString}}{{/defaultValue}}) {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}", `in` = ParameterIn.HEADER{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}) {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{/swagger1AnnotationLibrary}}@RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}{{#defaultValue}}, defaultValue = {{^isString}}"{{{.}}}"{{/isString}}{{#isString}}{{#isEnum}}"{{{.}}}"{{/isEnum}}{{^isEnum}}{{{.}}}{{/isEnum}}{{/isString}}{{/defaultValue}}) {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceBodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceBodyParams.mustache index c6383a787c4a..e884046f7d6d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceBodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/httpInterfaceBodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"], defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"]){{/defaultValue}}{{/allowableValues}}{{/isContainer}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}, allowableValues = "{{{.}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"], defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"]){{/defaultValue}}{{/allowableValues}}{{/isContainer}}) {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}, allowableValues = "{{{.}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{/swagger1AnnotationLibrary}}{{#useBeanValidation}}@Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/pathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/pathParams.mustache index 0fd5398a244f..2e28d18c78fa 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/pathParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @PathVariable("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}) {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{/swagger1AnnotationLibrary}}@PathVariable("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache index 2bf764c99633..27d7e286bb33 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}) {{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{/swagger1AnnotationLibrary}}{{#useBeanValidation}}@Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 59b859408c09..8bcb0cdb3993 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -402,13 +402,17 @@ public void testNullableMultipartFile() throws IOException { generator.opts(input).generate(); assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/NullableMultipartfileApiController.kt"), - "file: org.springframework.web.multipart.MultipartFile?)"); + "file: org.springframework.web.multipart.MultipartFile?" + + " )"); assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/NullableMultipartfileArrayApiController.kt"), - "files: Array?)"); + "files: Array?" + + " )"); assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/NonNullableMultipartfileApiController.kt"), - "file: org.springframework.web.multipart.MultipartFile)"); + "file: org.springframework.web.multipart.MultipartFile" + + " )"); assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/NonNullableMultipartfileArrayApiController.kt"), - "files: Array)"); + "files: Array" + + " )"); } @Test @@ -1409,8 +1413,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange)") ) @@ -1436,8 +1447,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDele verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange") ) @@ -1463,8 +1481,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) @@ -1490,8 +1515,13 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(): ResponseEntity") ) @@ -1517,8 +1547,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDe verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(description = \"\", `in` = ParameterIn.HEADER) @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) @@ -1544,8 +1581,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoD verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,@ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(value = \"\") @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + + " @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) @@ -1571,8 +1615,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) @@ -1598,8 +1649,13 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDe verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(): ResponseEntity") ) @@ -1862,8 +1918,15 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDeleg verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, request: javax.servlet.http.HttpServletRequest): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " request: javax.servlet.http.HttpServletRequest" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity"), root.resolve("src/test/kotlin/org/openapitools/api/PetApiTest.kt"), List.of( @@ -1896,8 +1959,15 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate verifyGeneratedFilesContain( Map.of( root.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"), List.of( - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long, exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + "deletePet(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity", + "getPetById(" + + " @PathVariable(\"petId\") petId: kotlin.Long," + + " exchange: org.springframework.web.server.ServerWebExchange" + + " ): ResponseEntity"), root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( "logoutUser(exchange: org.springframework.web.server.ServerWebExchange)"), root.resolve("src/test/kotlin/org/openapitools/api/PetApiTest.kt"), List.of( diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt index fbbca91d2fc1..e8c4ff3af791 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -40,7 +40,7 @@ interface PetApi { consumes = ["application/json", "application/xml"] ) fun addPet( - @Valid @RequestBody pet: Pet + @Valid @RequestBody pet: Pet ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -51,8 +51,8 @@ interface PetApi { value = ["/pet/{petId}"] ) fun deletePet( - @PathVariable("petId") petId: kotlin.Long, - @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -64,7 +64,7 @@ interface PetApi { produces = ["application/xml", "application/json"] ) fun findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -76,7 +76,7 @@ interface PetApi { produces = ["application/xml", "application/json"] ) fun findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -88,7 +88,7 @@ interface PetApi { produces = ["application/xml", "application/json"] ) fun getPetById( - @PathVariable("petId") petId: kotlin.Long + @PathVariable("petId") petId: kotlin.Long ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -101,7 +101,7 @@ interface PetApi { consumes = ["application/json", "application/xml"] ) fun updatePet( - @Valid @RequestBody pet: Pet + @Valid @RequestBody pet: Pet ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -113,9 +113,9 @@ interface PetApi { consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( - @PathVariable("petId") petId: kotlin.Long, - @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -128,9 +128,9 @@ interface PetApi { consumes = ["multipart/form-data"] ) fun uploadFile( - @PathVariable("petId") petId: kotlin.Long, - @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , - @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt index a6458382cd24..a38cbf14d6bb 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -37,7 +37,7 @@ interface StoreApi { value = ["/store/order/{orderId}"] ) fun deleteOrder( - @PathVariable("orderId") orderId: kotlin.String + @PathVariable("orderId") orderId: kotlin.String ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -59,7 +59,7 @@ interface StoreApi { produces = ["application/xml", "application/json"] ) fun getOrderById( - @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -72,7 +72,7 @@ interface StoreApi { consumes = ["application/json"] ) fun placeOrder( - @Valid @RequestBody order: Order + @Valid @RequestBody order: Order ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt index 763d09a96fb6..4816ec88d580 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -38,7 +38,7 @@ interface UserApi { consumes = ["application/json"] ) fun createUser( - @Valid @RequestBody user: User + @Valid @RequestBody user: User ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -50,7 +50,7 @@ interface UserApi { consumes = ["application/json"] ) fun createUsersWithArrayInput( - @Valid @RequestBody user: kotlin.collections.List + @Valid @RequestBody user: kotlin.collections.List ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -62,7 +62,7 @@ interface UserApi { consumes = ["application/json"] ) fun createUsersWithListInput( - @Valid @RequestBody user: kotlin.collections.List + @Valid @RequestBody user: kotlin.collections.List ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -73,7 +73,7 @@ interface UserApi { value = ["/user/{username}"] ) fun deleteUser( - @PathVariable("username") username: kotlin.String + @PathVariable("username") username: kotlin.String ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -85,7 +85,7 @@ interface UserApi { produces = ["application/xml", "application/json"] ) fun getUserByName( - @PathVariable("username") username: kotlin.String + @PathVariable("username") username: kotlin.String ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -97,8 +97,8 @@ interface UserApi { produces = ["application/xml", "application/json"] ) fun loginUser( - @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String, - @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -119,8 +119,8 @@ interface UserApi { consumes = ["application/json"] ) fun updateUser( - @PathVariable("username") username: kotlin.String, - @Valid @RequestBody user: User + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody user: User ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 5f78b78f0162..1ce7e1657ab1 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -85,8 +85,8 @@ interface PetApi { ) suspend fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit @HttpExchange( @@ -95,7 +95,7 @@ interface PetApi { ) suspend fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ModelApiResponse diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt index dc86929e4990..b754ba1276eb 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -92,8 +92,8 @@ interface PetApi { ) fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Mono> @@ -103,7 +103,7 @@ interface PetApi { ) fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): Mono> diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 19d77d469605..829cc97fd017 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -90,8 +90,8 @@ interface PetApi { ) fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity @@ -101,7 +101,7 @@ interface PetApi { ) fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ResponseEntity diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 19d77d469605..829cc97fd017 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -90,8 +90,8 @@ interface PetApi { ) fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity @@ -101,7 +101,7 @@ interface PetApi { ) fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ResponseEntity diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt index e89b886bd6a3..7b16016be8ae 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt @@ -45,7 +45,9 @@ class FakeApiController() { value = ["/fake/annotations"], consumes = ["application/json"] ) - fun annotations(@Parameter(description = "", required = true) @Valid @RequestBody `annotation`: Annotation): ResponseEntity { + fun annotations( + @Parameter(description = "", required = true) @Valid @RequestBody `annotation`: Annotation + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -62,7 +64,12 @@ class FakeApiController() { value = ["/fake/annotations"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithFormNumber(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "integer type") @Valid @RequestParam(value = "status", required = false) status: kotlin.Int? ,@Parameter(description = "number type") @Valid @RequestParam(value = "status2", required = false) status2: java.math.BigDecimal? ): ResponseEntity { + fun updatePetWithFormNumber( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "integer type") @Valid @RequestParam(value = "status", required = false) status: kotlin.Int?, + @Parameter(description = "number type") @Valid @RequestParam(value = "status2", required = false) status2: java.math.BigDecimal? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt index 4da69ab07131..e8849bcb03f2 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -49,7 +49,9 @@ class PetApiController() { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -65,7 +67,10 @@ class PetApiController() { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -83,7 +88,9 @@ class PetApiController() { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -101,7 +108,9 @@ class PetApiController() { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -120,7 +129,9 @@ class PetApiController() { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -141,7 +152,9 @@ class PetApiController() { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -158,7 +171,11 @@ class PetApiController() { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -176,7 +193,11 @@ class PetApiController() { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt index c7a3cab4ff92..b59669664289 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -45,7 +45,9 @@ class StoreApiController() { method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -80,7 +82,9 @@ class StoreApiController() { value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -98,7 +102,9 @@ class StoreApiController() { produces = ["application/xml", "application/json"], consumes = ["application/json"] ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt index 6577de75e45f..397f15598b74 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -46,7 +46,9 @@ class UserApiController() { value = ["/user"], consumes = ["application/json"] ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -63,7 +65,9 @@ class UserApiController() { value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -80,7 +84,9 @@ class UserApiController() { value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -97,7 +103,9 @@ class UserApiController() { method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -115,7 +123,9 @@ class UserApiController() { value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -132,7 +142,10 @@ class UserApiController() { value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -166,7 +179,10 @@ class UserApiController() { value = ["/user/{username}"], consumes = ["application/json"] ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index da8c6b076bb5..3c6fe48891a6 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -35,7 +35,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun addPet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200)) } @@ -44,7 +46,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -54,7 +59,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -64,7 +71,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -74,7 +83,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -85,7 +96,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun updatePet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200)) } @@ -95,7 +108,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -106,7 +123,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index dfec4ecc73fc..4d8ada5958b5 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -32,7 +32,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -52,7 +54,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -63,7 +67,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic produces = ["application/xml", "application/json"], consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index ce2c67c60423..581d2015d7cf 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -33,7 +33,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user"], consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) } @@ -43,7 +45,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) } @@ -53,7 +57,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) } @@ -62,7 +68,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -72,7 +80,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -82,7 +92,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -101,7 +114,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], consumes = ["application/json"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt index da8c6b076bb5..3c6fe48891a6 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -35,7 +35,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun addPet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200)) } @@ -44,7 +46,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -54,7 +59,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -64,7 +71,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -74,7 +83,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -85,7 +96,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun updatePet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200)) } @@ -95,7 +108,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -106,7 +123,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt index dfec4ecc73fc..4d8ada5958b5 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -32,7 +32,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -52,7 +54,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -63,7 +67,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic produces = ["application/xml", "application/json"], consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt index ce2c67c60423..581d2015d7cf 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -33,7 +33,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user"], consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) } @@ -43,7 +45,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) } @@ -53,7 +57,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) } @@ -62,7 +68,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -72,7 +80,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -82,7 +92,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -101,7 +114,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], consumes = ["application/json"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt index da8c6b076bb5..3c6fe48891a6 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -35,7 +35,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun addPet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200)) } @@ -44,7 +46,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -54,7 +59,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -64,7 +71,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -74,7 +83,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -85,7 +96,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { + fun updatePet( + @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200)) } @@ -95,7 +108,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -106,7 +123,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt index dfec4ecc73fc..4d8ada5958b5 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -32,7 +32,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -52,7 +54,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -63,7 +67,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic produces = ["application/xml", "application/json"], consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { + fun placeOrder( + @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt index ce2c67c60423..581d2015d7cf 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -33,7 +33,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user"], consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody user: User): ResponseEntity { + fun createUser( + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) } @@ -43,7 +45,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) } @@ -53,7 +57,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Valid @RequestBody user: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) } @@ -62,7 +68,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -72,7 +80,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -82,7 +92,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -101,7 +114,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], consumes = ["application/json"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt index 79d88b8d26b2..c4f90b0b6a7f 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt @@ -45,7 +45,9 @@ class TestApiController() { value = ["/test"], consumes = ["application/json"] ) - fun testPost(@Parameter(description = "", required = true) @Valid @RequestBody apa: Apa): ResponseEntity { + fun testPost( + @Parameter(description = "", required = true) @Valid @RequestBody apa: Apa + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt index 35625e526a2a..b74c7f8c8402 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -194,8 +194,8 @@ interface PetApi { ) fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { return getDelegate().updatePetWithForm(petId, name, status) } @@ -218,7 +218,7 @@ interface PetApi { ) fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file) diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 5907be4b21f6..c9d23cb9066c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -193,8 +193,8 @@ interface PetApi { ) fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { return getDelegate().updatePetWithForm(petId, name, status) } @@ -217,7 +217,7 @@ interface PetApi { ) fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file) diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 0e997b5a08bb..91276e20f698 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -198,8 +198,8 @@ interface PetApi { ) suspend fun updatePetWithForm( @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String?, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange ): ResponseEntity { return getDelegate().updatePetWithForm(petId, name, status, exchange) @@ -224,7 +224,7 @@ interface PetApi { ) suspend fun uploadFile( @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange ): ResponseEntity { diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt index d227b75281a7..a7fdbceafbd3 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -47,7 +47,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) } @@ -63,7 +65,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -81,7 +86,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -99,7 +106,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -118,7 +127,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -137,7 +148,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) } @@ -154,7 +167,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -172,7 +189,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt index a74a81d00667..589e49ffdb3f 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -45,7 +45,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -80,7 +82,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -97,7 +101,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order"], produces = ["application/xml", "application/json"] ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity { + fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt index 08160bfaf0fc..adbdd091f0bb 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -44,7 +44,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user"] ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) } @@ -59,7 +61,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) } @@ -74,7 +78,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithList"] ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) } @@ -90,7 +96,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -108,7 +116,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -125,7 +135,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -156,7 +169,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.PUT], value = ["/user/{username}"] ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt index 2934906f7d74..62b0cc6909a8 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt @@ -46,7 +46,11 @@ class MultipartMixedApiController() { value = ["/multipart-mixed"], consumes = ["multipart/form-data"] ) - fun multipartMixed(@Parameter(description = "", required = true, schema = Schema(allowableValues = ["ALLOWED", "IN_PROGRESS", "REJECTED"])) @Valid @RequestParam(value = "status", required = true) status: MultipartMixedStatus ,@Parameter(description = "a file") @Valid @RequestPart("file", required = true) file: org.springframework.web.multipart.MultipartFile,@Parameter(description = "") @Valid @RequestPart(value = "marker", required = false) marker: MultipartMixedRequestMarker? ): ResponseEntity { + fun multipartMixed( + @Parameter(description = "", required = true, schema = Schema(allowableValues = ["ALLOWED", "IN_PROGRESS", "REJECTED"])) @Valid @RequestParam(value = "status", required = true) status: MultipartMixedStatus, + @Parameter(description = "a file") @Valid @RequestPart("file", required = true) file: org.springframework.web.multipart.MultipartFile, + @Parameter(description = "") @Valid @RequestPart(value = "marker", required = false) marker: MultipartMixedRequestMarker? + ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index ec377ba813c4..70a85b1f8852 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -41,7 +41,7 @@ interface PetApi { consumes = ["application/json", "application/xml"] ) fun addPet( - @Valid @RequestBody body: Pet + @Valid @RequestBody body: Pet ): Unit { return getDelegate().addPet(body) } @@ -52,8 +52,8 @@ interface PetApi { value = ["/pet/{petId}"] ) fun deletePet( - @PathVariable("petId") petId: kotlin.Long, - @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? ): Unit { return getDelegate().deletePet(petId, apiKey) } @@ -65,7 +65,7 @@ interface PetApi { produces = ["application/xml", "application/json"] ) fun findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List ): List { return getDelegate().findPetsByStatus(status) } @@ -77,7 +77,7 @@ interface PetApi { produces = ["application/xml", "application/json"] ) fun findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List ): List { return getDelegate().findPetsByTags(tags) } @@ -89,7 +89,7 @@ interface PetApi { produces = ["application/xml", "application/json"] ) fun getPetById( - @PathVariable("petId") petId: kotlin.Long + @PathVariable("petId") petId: kotlin.Long ): Pet { return getDelegate().getPetById(petId) } @@ -101,7 +101,7 @@ interface PetApi { consumes = ["application/json", "application/xml"] ) fun updatePet( - @Valid @RequestBody body: Pet + @Valid @RequestBody body: Pet ): Unit { return getDelegate().updatePet(body) } @@ -113,9 +113,9 @@ interface PetApi { consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( - @PathVariable("petId") petId: kotlin.Long, - @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit { return getDelegate().updatePetWithForm(petId, name, status) } @@ -128,9 +128,9 @@ interface PetApi { consumes = ["multipart/form-data"] ) fun uploadFile( - @PathVariable("petId") petId: kotlin.Long, - @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , - @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ModelApiResponse { return getDelegate().uploadFile(petId, additionalMetadata, file) } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index f850fb62cd04..9eb09e196d3b 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -39,7 +39,7 @@ interface StoreApi { value = ["/store/order/{orderId}"] ) fun deleteOrder( - @PathVariable("orderId") orderId: kotlin.String + @PathVariable("orderId") orderId: kotlin.String ): Unit { return getDelegate().deleteOrder(orderId) } @@ -61,7 +61,7 @@ interface StoreApi { produces = ["application/xml", "application/json"] ) fun getOrderById( - @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long ): Order { return getDelegate().getOrderById(orderId) } @@ -73,7 +73,7 @@ interface StoreApi { produces = ["application/xml", "application/json"] ) fun placeOrder( - @Valid @RequestBody body: Order + @Valid @RequestBody body: Order ): Order { return getDelegate().placeOrder(body) } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 3c6863e8ae82..4b9fd9689380 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -39,7 +39,7 @@ interface UserApi { value = ["/user"] ) fun createUser( - @Valid @RequestBody body: User + @Valid @RequestBody body: User ): Unit { return getDelegate().createUser(body) } @@ -50,7 +50,7 @@ interface UserApi { value = ["/user/createWithArray"] ) fun createUsersWithArrayInput( - @Valid @RequestBody body: kotlin.collections.List + @Valid @RequestBody body: kotlin.collections.List ): Unit { return getDelegate().createUsersWithArrayInput(body) } @@ -61,7 +61,7 @@ interface UserApi { value = ["/user/createWithList"] ) fun createUsersWithListInput( - @Valid @RequestBody body: kotlin.collections.List + @Valid @RequestBody body: kotlin.collections.List ): Unit { return getDelegate().createUsersWithListInput(body) } @@ -72,7 +72,7 @@ interface UserApi { value = ["/user/{username}"] ) fun deleteUser( - @PathVariable("username") username: kotlin.String + @PathVariable("username") username: kotlin.String ): Unit { return getDelegate().deleteUser(username) } @@ -84,7 +84,7 @@ interface UserApi { produces = ["application/xml", "application/json"] ) fun getUserByName( - @PathVariable("username") username: kotlin.String + @PathVariable("username") username: kotlin.String ): User { return getDelegate().getUserByName(username) } @@ -96,8 +96,8 @@ interface UserApi { produces = ["application/xml", "application/json"] ) fun loginUser( - @NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String, - @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + @NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String ): kotlin.String { return getDelegate().loginUser(username, password) } @@ -117,8 +117,8 @@ interface UserApi { value = ["/user/{username}"] ) fun updateUser( - @PathVariable("username") username: kotlin.String, - @Valid @RequestBody body: User + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody body: User ): Unit { return getDelegate().updateUser(username, body) } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index 3c6cc88d61fb..04449f648821 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -34,7 +34,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody body: Pet): Unit { + fun addPet( + @Valid @RequestBody body: Pet + ): Unit { return service.addPet(body) } @@ -43,7 +45,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): Unit { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): Unit { return service.deletePet(petId, apiKey) } @@ -53,7 +58,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): List { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): List { return service.findPetsByStatus(status) } @@ -63,7 +70,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): List { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): List { return service.findPetsByTags(tags) } @@ -73,7 +82,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): Pet { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): Pet { return service.getPetById(petId) } @@ -83,7 +94,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody body: Pet): Unit { + fun updatePet( + @Valid @RequestBody body: Pet + ): Unit { return service.updatePet(body) } @@ -93,7 +106,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): Unit { return service.updatePetWithForm(petId, name, status) } @@ -104,7 +121,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ModelApiResponse { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ModelApiResponse { return service.uploadFile(petId, additionalMetadata, file) } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 14fb48e01908..ba7b256d126a 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -32,7 +32,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): Unit { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): Unit { return service.deleteOrder(orderId) } @@ -52,7 +54,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): Order { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): Order { return service.getOrderById(orderId) } @@ -62,7 +66,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order"], produces = ["application/xml", "application/json"] ) - fun placeOrder( @Valid @RequestBody body: Order): Order { + fun placeOrder( + @Valid @RequestBody body: Order + ): Order { return service.placeOrder(body) } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index 4e9c15cd927f..ec55c2e7c42c 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -32,7 +32,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user"] ) - fun createUser( @Valid @RequestBody body: User): Unit { + fun createUser( + @Valid @RequestBody body: User + ): Unit { return service.createUser(body) } @@ -41,7 +43,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + fun createUsersWithArrayInput( + @Valid @RequestBody body: kotlin.collections.List + ): Unit { return service.createUsersWithArrayInput(body) } @@ -50,7 +54,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithList"] ) - fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): Unit { + fun createUsersWithListInput( + @Valid @RequestBody body: kotlin.collections.List + ): Unit { return service.createUsersWithListInput(body) } @@ -59,7 +65,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): Unit { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): Unit { return service.deleteUser(username) } @@ -69,7 +77,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): User { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): User { return service.getUserByName(username) } @@ -79,7 +89,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): kotlin.String { + fun loginUser( + @NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): kotlin.String { return service.loginUser(username, password) } @@ -97,7 +110,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.PUT], value = ["/user/{username}"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): Unit { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody body: User + ): Unit { return service.updateUser(username, body) } } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt index 26f2ad661da4..8c66a2b20655 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -50,7 +50,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - suspend fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + suspend fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200)) } @@ -66,7 +68,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - suspend fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + suspend fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -84,7 +89,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - suspend fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + suspend fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -102,7 +109,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - suspend fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + suspend fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -121,7 +130,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - suspend fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + suspend fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -142,7 +153,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - suspend fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + suspend fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200)) } @@ -159,7 +172,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - suspend fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + suspend fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -177,7 +194,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - suspend fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + suspend fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt index db2e659b5edd..608f90559e86 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -46,7 +46,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - suspend fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + suspend fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -81,7 +83,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - suspend fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + suspend fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -99,7 +103,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic produces = ["application/xml", "application/json"], consumes = ["application/json"] ) - suspend fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity { + suspend fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8884b2a1a70f..e8fba1354785 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -47,7 +47,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user"], consumes = ["application/json"] ) - suspend fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + suspend fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) } @@ -64,7 +66,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithArray"], consumes = ["application/json"] ) - suspend fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow): ResponseEntity { + suspend fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) } @@ -81,7 +85,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithList"], consumes = ["application/json"] ) - suspend fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow): ResponseEntity { + suspend fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) } @@ -98,7 +104,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - suspend fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + suspend fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -116,7 +124,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - suspend fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + suspend fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -133,7 +143,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - suspend fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + suspend fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -167,7 +180,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], consumes = ["application/json"] ) - suspend fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + suspend fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt index fff401053667..fbf1d86c071b 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -50,7 +50,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - suspend fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + suspend fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(200)) } @@ -66,7 +68,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - suspend fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + suspend fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -84,7 +89,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -102,7 +109,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -121,7 +130,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - suspend fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + suspend fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -142,7 +153,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) - suspend fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet): ResponseEntity { + suspend fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(200)) } @@ -159,7 +172,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - suspend fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + suspend fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -177,7 +194,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - suspend fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + suspend fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt index db2e659b5edd..608f90559e86 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -46,7 +46,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - suspend fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + suspend fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -81,7 +83,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - suspend fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + suspend fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -99,7 +103,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic produces = ["application/xml", "application/json"], consumes = ["application/json"] ) - suspend fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order): ResponseEntity { + suspend fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody order: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8884b2a1a70f..e8fba1354785 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -47,7 +47,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user"], consumes = ["application/json"] ) - suspend fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + suspend fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) } @@ -64,7 +66,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithArray"], consumes = ["application/json"] ) - suspend fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow): ResponseEntity { + suspend fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) } @@ -81,7 +85,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/createWithList"], consumes = ["application/json"] ) - suspend fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow): ResponseEntity { + suspend fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: Flow + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) } @@ -98,7 +104,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - suspend fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + suspend fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -116,7 +124,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - suspend fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + suspend fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -133,7 +143,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - suspend fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + suspend fun loginUser( + @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -167,7 +180,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], consumes = ["application/json"] ) - suspend fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User): ResponseEntity { + suspend fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody user: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt index 5936f25bf28f..fd5a68456010 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -191,8 +191,8 @@ interface PetApi { ) fun updatePetWithForm( @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -215,7 +215,7 @@ interface PetApi { ) fun uploadFile( @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt index 9f46d6767fea..40ab7505d8ec 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -50,7 +50,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun addPet( + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) } @@ -66,7 +68,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -85,7 +90,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -104,7 +111,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -122,7 +131,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -139,7 +150,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun updatePet( + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) } @@ -156,7 +169,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -175,7 +192,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 9990c01e2d2a..d69e81e1ff25 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -47,7 +47,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -83,7 +85,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -100,7 +104,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order"], produces = ["application/xml", "application/json"] ) - fun placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity { + fun placeOrder( + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt index 5e7076f405c7..df7e33710a77 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -47,7 +47,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user"] ) - fun createUser(@ApiParam(value = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun createUser( + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) } @@ -62,7 +64,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) } @@ -77,7 +81,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithList"] ) - fun createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) } @@ -92,7 +98,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -109,7 +117,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -126,7 +136,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -156,7 +169,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.PUT], value = ["/user/{username}"] ) - fun updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@ApiParam(value = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun updateUser( + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt index d227b75281a7..a7fdbceafbd3 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -47,7 +47,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun addPet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) } @@ -63,7 +65,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -81,7 +86,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -99,7 +106,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -118,7 +127,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -137,7 +148,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun updatePet( + @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) } @@ -154,7 +167,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -172,7 +189,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt index a74a81d00667..589e49ffdb3f 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -45,7 +45,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -80,7 +82,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -97,7 +101,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order"], produces = ["application/xml", "application/json"] ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity { + fun placeOrder( + @Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt index 08160bfaf0fc..adbdd091f0bb 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -44,7 +44,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user"] ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun createUser( + @Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) } @@ -59,7 +61,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) } @@ -74,7 +78,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithList"] ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) } @@ -90,7 +96,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -108,7 +116,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -125,7 +135,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -156,7 +169,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.PUT], value = ["/user/{username}"] ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun updateUser( + @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt index 9f46d6767fea..40ab7505d8ec 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -50,7 +50,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun addPet( + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) } @@ -66,7 +68,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -85,7 +90,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -104,7 +111,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -122,7 +131,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -139,7 +150,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + fun updatePet( + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) } @@ -156,7 +169,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -175,7 +192,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, + @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 9990c01e2d2a..d69e81e1ff25 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -47,7 +47,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -83,7 +85,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -100,7 +104,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order"], produces = ["application/xml", "application/json"] ) - fun placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity { + fun placeOrder( + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt index 5e7076f405c7..df7e33710a77 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -47,7 +47,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user"] ) - fun createUser(@ApiParam(value = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun createUser( + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) } @@ -62,7 +64,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) } @@ -77,7 +81,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithList"] ) - fun createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) } @@ -92,7 +98,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -109,7 +117,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -126,7 +136,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -156,7 +169,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.PUT], value = ["/user/{username}"] ) - fun updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@ApiParam(value = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + fun updateUser( + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt index 7d802e200297..40a9873493d4 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -183,8 +183,8 @@ interface PetApi { ) fun updatePetWithForm( @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long, - @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , - @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , + @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String?, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest ): ResponseEntity @@ -207,7 +207,7 @@ interface PetApi { ) fun uploadFile( @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long, - @ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , + @ApiParam(value = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest ): ResponseEntity diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt index e704691f8020..0e9e2798f000 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -35,7 +35,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun addPet( @Valid @RequestBody body: Pet): ResponseEntity { + fun addPet( + @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) } @@ -44,7 +46,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + fun deletePet( + @PathVariable("petId") petId: kotlin.Long, + @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) } @@ -54,7 +59,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( + @NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -64,7 +71,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( + @NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List + ): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } @@ -74,7 +83,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], produces = ["application/xml", "application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + fun getPetById( + @PathVariable("petId") petId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) } @@ -84,7 +95,9 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet"], consumes = ["application/json", "application/xml"] ) - fun updatePet( @Valid @RequestBody body: Pet): ResponseEntity { + fun updatePet( + @Valid @RequestBody body: Pet + ): ResponseEntity { return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) } @@ -94,7 +107,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/{petId}"], consumes = ["application/x-www-form-urlencoded"] ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + fun updatePetWithForm( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "name", required = false) name: kotlin.String?, + @Valid @RequestParam(value = "status", required = false) status: kotlin.String? + ): ResponseEntity { return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) } @@ -105,7 +122,11 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { produces = ["application/json"], consumes = ["multipart/form-data"] ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile): ResponseEntity { + fun uploadFile( + @PathVariable("petId") petId: kotlin.Long, + @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String?, + @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile + ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 61477d325bfb..861c3b2f92fc 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -33,7 +33,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + fun deleteOrder( + @PathVariable("orderId") orderId: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) } @@ -53,7 +55,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order/{orderId}"], produces = ["application/xml", "application/json"] ) - fun getOrderById(@Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById( + @Min(value=1L) @Max(value=5L) @PathVariable("orderId") orderId: kotlin.Long + ): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -63,7 +67,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = ["/store/order"], produces = ["application/xml", "application/json"] ) - fun placeOrder( @Valid @RequestBody body: Order): ResponseEntity { + fun placeOrder( + @Valid @RequestBody body: Order + ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt index daf5c943c2ec..65bda763c196 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -33,7 +33,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user"] ) - fun createUser( @Valid @RequestBody body: User): ResponseEntity { + fun createUser( + @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) } @@ -42,7 +44,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithArray"] ) - fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithArrayInput( + @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) } @@ -51,7 +55,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.POST], value = ["/user/createWithList"] ) - fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + fun createUsersWithListInput( + @Valid @RequestBody body: kotlin.collections.List + ): ResponseEntity { return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) } @@ -60,7 +66,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun deleteUser( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) } @@ -70,7 +78,9 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/{username}"], produces = ["application/xml", "application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + fun getUserByName( + @PathVariable("username") username: kotlin.String + ): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) } @@ -80,7 +90,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( + @NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String, + @NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String + ): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } @@ -98,7 +111,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) method = [RequestMethod.PUT], value = ["/user/{username}"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): ResponseEntity { + fun updateUser( + @PathVariable("username") username: kotlin.String, + @Valid @RequestBody body: User + ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } } From 875b0644bb06864ed0eec4e03605773599b96770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 20 Nov 2025 10:48:27 +0100 Subject: [PATCH 15/19] fix test --- .../openapitools/codegen/kotlin/KotlinReservedWordsTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinReservedWordsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinReservedWordsTest.java index 7e41bae21523..f8e65fae5bbe 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinReservedWordsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinReservedWordsTest.java @@ -191,7 +191,8 @@ public void reservedWordsInGeneratedServerCode() throws Exception { File resultSourcePath = new File(output, "src/main/kotlin"); assertFileContains(Paths.get(resultSourcePath.getAbsolutePath() + baseApiPackage + "AnnotationsApiController.kt"), - "fun annotationsPost(@Parameter(description = \"\", required = true) @Valid @RequestBody `annotation`: Annotation", + "fun annotationsPost(" + + " @Parameter(description = \"\", required = true) @Valid @RequestBody `annotation`: Annotation", "return ResponseEntity(service.annotationsPost(`annotation`), HttpStatus.valueOf(200))" ); From 8d51f71bcf62ec459c04b6c48ae20225b3ace596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 20 Nov 2025 17:08:30 +0100 Subject: [PATCH 16/19] store PATHs as accesible strings in companion objects. --- .../main/resources/kotlin-spring/api.mustache | 19 +++++++++-- .../kotlin-spring/apiInterface.mustache | 19 +++++++++-- .../apiInterface.mustache | 11 ++++--- .../spring/KotlinSpringServerCodegenTest.java | 6 ++-- .../kotlin/org/openapitools/api/PetApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/StoreApi.kt | 16 +++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 28 +++++++++++----- .../org/openapitools/api/PetApiClient.kt | 24 +++++++++----- .../org/openapitools/api/StoreApiClient.kt | 12 ++++--- .../org/openapitools/api/UserApiClient.kt | 24 +++++++++----- .../org/openapitools/api/PetApiClient.kt | 16 +++++----- .../org/openapitools/api/StoreApiClient.kt | 8 ++--- .../org/openapitools/api/UserApiClient.kt | 16 +++++----- .../org/openapitools/api/PetApiClient.kt | 16 +++++----- .../org/openapitools/api/StoreApiClient.kt | 8 ++--- .../org/openapitools/api/UserApiClient.kt | 16 +++++----- .../org/openapitools/api/PetApiClient.kt | 16 +++++----- .../org/openapitools/api/StoreApiClient.kt | 8 ++--- .../org/openapitools/api/UserApiClient.kt | 16 +++++----- .../org/openapitools/api/FakeApiController.kt | 14 ++++++-- .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../org/openapitools/api/PetApiController.kt | 28 +++++++++++----- .../openapitools/api/StoreApiController.kt | 16 +++++++--- .../org/openapitools/api/UserApiController.kt | 28 +++++++++++----- .../org/openapitools/api/PetApiController.kt | 28 +++++++++++----- .../openapitools/api/StoreApiController.kt | 16 +++++++--- .../org/openapitools/api/UserApiController.kt | 28 +++++++++++----- .../org/openapitools/api/PetApiController.kt | 28 +++++++++++----- .../openapitools/api/StoreApiController.kt | 16 +++++++--- .../org/openapitools/api/UserApiController.kt | 28 +++++++++++----- .../org/openapitools/api/TestApiController.kt | 11 +++++-- .../kotlin/org/openapitools/api/PetApi.kt | 32 +++++++++++++------ .../kotlin/org/openapitools/api/StoreApi.kt | 20 +++++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 32 +++++++++++++------ .../kotlin/org/openapitools/api/PetApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/StoreApi.kt | 16 +++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/PetApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/StoreApi.kt | 16 +++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/DefaultApi.kt | 7 +++- .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../api/MultipartMixedApiController.kt | 11 +++++-- .../kotlin/org/openapitools/api/PetApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/StoreApi.kt | 16 +++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 28 +++++++++++----- .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../kotlin/org/openapitools/api/FakeApi.kt | 7 +++- .../openapitools/api/FakeClassnameTestApi.kt | 7 +++- .../kotlin/org/openapitools/api/FooApi.kt | 7 +++- .../kotlin/org/openapitools/api/PetApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/StoreApi.kt | 16 +++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 28 +++++++++++----- .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ .../kotlin/org/openapitools/api/PetApi.kt | 28 +++++++++++----- .../kotlin/org/openapitools/api/StoreApi.kt | 16 +++++++--- .../kotlin/org/openapitools/api/UserApi.kt | 28 +++++++++++----- .../org/openapitools/api/PetApiController.kt | 32 +++++++++++++------ .../openapitools/api/StoreApiController.kt | 20 +++++++++--- .../org/openapitools/api/UserApiController.kt | 32 +++++++++++++------ 80 files changed, 1272 insertions(+), 515 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 9ac784471687..2e5adf9c101d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -30,6 +30,9 @@ import org.springframework.validation.annotation.Validated {{/useBeanValidation}} import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +{{#useRequestMappingOnController}} +import {{#apiPackage}}{{.}}.{{/apiPackage}}{{classname}}.Companion.BASE_PATH +{{/useRequestMappingOnController}} {{#useBeanValidation}} import {{javaxPackage}}.validation.Valid @@ -58,13 +61,13 @@ import kotlin.collections.Map {{/swagger1AnnotationLibrary}} {{#useRequestMappingOnController}} {{=<% %>=}} -@RequestMapping("\${api.base-path:<%contextPath%>}") +@RequestMapping("\${api.<%title%>.base-path:api.base-path:$BASE_PATH}") <%={{ }}=%> {{/useRequestMappingOnController}} {{#operations}} class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { -{{#operation}} +{{#operation}} {{^useResponseEntity}} @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}){{! }}{{/useResponseEntity}}{{! @@ -88,7 +91,7 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} @RequestMapping( method = [RequestMethod.{{httpMethod}}], - value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"]{{#singleContentTypes}}{{#hasProduces}}, + value = [PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}} /* "{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}" */]{{#singleContentTypes}}{{#hasProduces}}, produces = [{{#vendorExtensions.x-accepts}}"{{{.}}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-accepts}}]{{/hasProduces}}{{#hasConsumes}}, consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, @@ -100,6 +103,16 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v {{/hasParams}}): {{#useResponseEntity}}ResponseEntity<{{/useResponseEntity}}{{>returnTypes}}{{#useResponseEntity}}>{{/useResponseEntity}} { return {{>returnValue}} } + {{/operation}} + companion object { + //for your own safety never directly reuse these path definitions in tests + {{#useRequestMappingOnController}} + const val BASE_PATH: String = "{{=<% %>=}}<%contextPath%><%={{ }}=%>" + {{/useRequestMappingOnController}} + {{#operation}} + const val PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}}: String = "{{{path}}}" + {{/operation}} + } } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index c3d3f50b234e..6c60640cfa2d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -35,6 +35,9 @@ import org.springframework.validation.annotation.Validated {{/useBeanValidation}} import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +{{#useRequestMappingOnInterface}} +import {{#apiPackage}}{{.}}.{{/apiPackage}}{{classname}}.Companion.BASE_PATH +{{/useRequestMappingOnInterface}} {{#useBeanValidation}} import {{javaxPackage}}.validation.constraints.DecimalMax @@ -65,7 +68,7 @@ import kotlin.collections.Map {{/swagger1AnnotationLibrary}} {{#useRequestMappingOnInterface}} {{=<% %>=}} -@RequestMapping("\${api.base-path:<%contextPath%>}") +@RequestMapping("\${api.<%title%>.base-path:api.base-path:$BASE_PATH}") <%={{ }}=%> {{/useRequestMappingOnInterface}} {{#operations}} @@ -74,8 +77,8 @@ interface {{classname}} { fun getDelegate(): {{classname}}Delegate{{^skipDefaultDelegateInterface}} = object: {{classname}}Delegate {}{{/skipDefaultDelegateInterface}} {{/isDelegate}} -{{#operation}} +{{#operation}} {{^useResponseEntity}} @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}){{! }}{{/useResponseEntity}}{{! @@ -103,7 +106,7 @@ interface {{classname}} { ){{/swagger1AnnotationLibrary}} @RequestMapping( method = [RequestMethod.{{httpMethod}}], - value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"]{{#singleContentTypes}}{{#hasProduces}}, + value = [PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}} /* "{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}" */]{{#singleContentTypes}}{{#hasProduces}}, produces = [{{#vendorExtensions.x-accepts}}"{{{.}}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-accepts}}]{{/hasProduces}}{{#hasConsumes}}, consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, @@ -120,6 +123,16 @@ interface {{classname}} { return getDelegate().{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#reactive}}exchange{{/reactive}}{{^reactive}}request{{/reactive}}{{/includeHttpRequestContext}}) {{/isDelegate}} }{{/skipDefaultApiInterface}} + {{/operation}} + companion object { + //for your own safety never directly reuse these path definitions in tests + {{#useRequestMappingOnInterface}} + const val BASE_PATH: String = "{{=<% %>=}}<%contextPath%><%={{ }}=%>" + {{/useRequestMappingOnInterface}} + {{#operation}} + const val PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}}: String = "{{{path}}}" + {{/operation}} + } } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache index f2a784ddba05..1162877a9c06 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache @@ -48,7 +48,7 @@ import kotlin.collections.List import kotlin.collections.Map {{#useRequestMappingOnInterface}}@HttpExchange( -"{{=<% %>=}}\${api.base-path:$BASE_PATH}<%={{ }}=%>" +"{{=<% %>=}}\${api.<%title%>.base-path:api.base-path:$BASE_PATH}<%={{ }}=%>" ){{/useRequestMappingOnInterface}} {{#useBeanValidation}} @Validated @@ -56,10 +56,11 @@ import kotlin.collections.Map {{#operations}} interface {{classname}} { -{{#operation}} - {{#httpMethod}} - @HttpExchange( - url = PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}}, +{{#operation}}{{! +}}{{^useResponseEntity}} @ResponseStatus({{#springHttpStatus}}{{#responses.0}}{{{code}}}{{/responses.0}}{{/springHttpStatus}}) +{{/useResponseEntity}}{{! +}}{{#httpMethod}} @HttpExchange( + url = PATH_{{#lambda.uppercase}}{{#lambda.snakecase}}{{{operationId}}}{{/lambda.snakecase}}{{/lambda.uppercase}} /* "{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}" */, method = "{{httpMethod}}" ) {{/httpMethod}}{{! diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 8bcb0cdb3993..43c330044b8f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -1065,20 +1065,20 @@ public void generateHttpInterfaceReactiveWithReactorResponseEntity() throws Exce "import reactor.core.publisher.Flux\n" + "import reactor.core.publisher.Mono", " @HttpExchange(\n" - + " url = PATH_GET_INVENTORY,\n" + + " url = PATH_GET_INVENTORY /* \"/store/inventory\" */,\n" + " method = \"GET\"\n" + " )\n" + " fun getInventory(\n" + " ): Mono>>", " @HttpExchange(\n" - + " url = PATH_DELETE_ORDER,\n" + + " url = PATH_DELETE_ORDER /* \"/store/order/{orderId}\" */,\n" + " method = \"DELETE\"\n" + " )\n" + " fun deleteOrder(\n" + " @Parameter(description = \"ID of the order that needs to be deleted\", required = true) @PathVariable(\"orderId\") orderId: kotlin.String\n" + " ): Mono>", " @HttpExchange(\n" - + " url = PATH_PLACE_ORDER,\n" + + " url = PATH_PLACE_ORDER /* \"/store/order\" */,\n" + " method = \"POST\"\n" + " )\n" + " fun placeOrder(\n" diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt index e8c4ff3af791..36c1821868b9 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -35,7 +35,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -48,7 +48,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -60,7 +60,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -72,7 +72,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -84,7 +84,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -96,7 +96,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -109,7 +109,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -123,7 +123,7 @@ interface PetApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -134,4 +134,16 @@ interface PetApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt index a38cbf14d6bb..6542dbc72f7a 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -34,7 +34,7 @@ interface StoreApi { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -45,7 +45,7 @@ interface StoreApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -55,7 +55,7 @@ interface StoreApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -67,7 +67,7 @@ interface StoreApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -76,4 +76,12 @@ interface StoreApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt index 4816ec88d580..fe632bdab180 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -34,7 +34,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -46,7 +46,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -58,7 +58,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -70,7 +70,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -81,7 +81,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -93,7 +93,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -106,7 +106,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -115,7 +115,7 @@ interface UserApi { @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -124,4 +124,16 @@ interface UserApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 1ce7e1657ab1..61c9f980e066 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -28,16 +28,18 @@ import kotlin.collections.Map @Validated interface PetApi { + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_ADD_PET, + url = PATH_ADD_PET /* "/pet" */, method = "POST" ) suspend fun addPet( @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet ): Pet + @ResponseStatus(HttpStatus.BAD_REQUEST) @HttpExchange( - url = PATH_DELETE_PET, + url = PATH_DELETE_PET /* "/pet/{petId}" */, method = "DELETE" ) suspend fun deletePet( @@ -45,8 +47,9 @@ interface PetApi { @Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String? ): Unit + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_FIND_PETS_BY_STATUS, + url = PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */, method = "GET" ) suspend fun findPetsByStatus( @@ -54,8 +57,9 @@ interface PetApi { ): List + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_FIND_PETS_BY_TAGS, + url = PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */, method = "GET" ) suspend fun findPetsByTags( @@ -63,24 +67,27 @@ interface PetApi { ): List + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_GET_PET_BY_ID, + url = PATH_GET_PET_BY_ID /* "/pet/{petId}" */, method = "GET" ) suspend fun getPetById( @Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long ): Pet + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_UPDATE_PET, + url = PATH_UPDATE_PET /* "/pet" */, method = "PUT" ) suspend fun updatePet( @Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody pet: Pet ): Pet + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @HttpExchange( - url = PATH_UPDATE_PET_WITH_FORM, + url = PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */, method = "POST" ) suspend fun updatePetWithForm( @@ -89,8 +96,9 @@ interface PetApi { @Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): Unit + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_UPLOAD_FILE, + url = PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */, method = "POST" ) suspend fun uploadFile( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index b5e2ac2f18e1..01fc56c0cb33 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt @@ -27,32 +27,36 @@ import kotlin.collections.Map @Validated interface StoreApi { + @ResponseStatus(HttpStatus.BAD_REQUEST) @HttpExchange( - url = PATH_DELETE_ORDER, + url = PATH_DELETE_ORDER /* "/store/order/{orderId}" */, method = "DELETE" ) suspend fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String ): Unit + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_GET_INVENTORY, + url = PATH_GET_INVENTORY /* "/store/inventory" */, method = "GET" ) suspend fun getInventory( ): Map + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_GET_ORDER_BY_ID, + url = PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */, method = "GET" ) suspend fun getOrderById( @Min(value=1L) @Max(value=5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long ): Order + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_PLACE_ORDER, + url = PATH_PLACE_ORDER /* "/store/order" */, method = "POST" ) suspend fun placeOrder( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 714efdfebc62..635bfbe51a1d 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt @@ -27,48 +27,54 @@ import kotlin.collections.Map @Validated interface UserApi { + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_CREATE_USER, + url = PATH_CREATE_USER /* "/user" */, method = "POST" ) suspend fun createUser( @Parameter(description = "Created user object", required = true) @Valid @RequestBody user: User ): Unit + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_CREATE_USERS_WITH_ARRAY_INPUT, + url = PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */, method = "POST" ) suspend fun createUsersWithArrayInput( @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List ): Unit + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_CREATE_USERS_WITH_LIST_INPUT, + url = PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */, method = "POST" ) suspend fun createUsersWithListInput( @Parameter(description = "List of user object", required = true) @Valid @RequestBody user: kotlin.collections.List ): Unit + @ResponseStatus(HttpStatus.BAD_REQUEST) @HttpExchange( - url = PATH_DELETE_USER, + url = PATH_DELETE_USER /* "/user/{username}" */, method = "DELETE" ) suspend fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String ): Unit + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_GET_USER_BY_NAME, + url = PATH_GET_USER_BY_NAME /* "/user/{username}" */, method = "GET" ) suspend fun getUserByName( @Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String ): User + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_LOGIN_USER, + url = PATH_LOGIN_USER /* "/user/login" */, method = "GET" ) suspend fun loginUser( @@ -76,15 +82,17 @@ interface UserApi { @NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String ): kotlin.String + @ResponseStatus(HttpStatus.OK) @HttpExchange( - url = PATH_LOGOUT_USER, + url = PATH_LOGOUT_USER /* "/user/logout" */, method = "GET" ) suspend fun logoutUser( ): Unit + @ResponseStatus(HttpStatus.BAD_REQUEST) @HttpExchange( - url = PATH_UPDATE_USER, + url = PATH_UPDATE_USER /* "/user/{username}" */, method = "PUT" ) suspend fun updateUser( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt index b754ba1276eb..c65fb3ba8785 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -32,7 +32,7 @@ import kotlin.collections.Map interface PetApi { @HttpExchange( - url = PATH_ADD_PET, + url = PATH_ADD_PET /* "/pet" */, method = "POST" ) fun addPet( @@ -41,7 +41,7 @@ interface PetApi { @HttpExchange( - url = PATH_DELETE_PET, + url = PATH_DELETE_PET /* "/pet/{petId}" */, method = "DELETE" ) fun deletePet( @@ -51,7 +51,7 @@ interface PetApi { @HttpExchange( - url = PATH_FIND_PETS_BY_STATUS, + url = PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */, method = "GET" ) fun findPetsByStatus( @@ -60,7 +60,7 @@ interface PetApi { @HttpExchange( - url = PATH_FIND_PETS_BY_TAGS, + url = PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */, method = "GET" ) fun findPetsByTags( @@ -69,7 +69,7 @@ interface PetApi { @HttpExchange( - url = PATH_GET_PET_BY_ID, + url = PATH_GET_PET_BY_ID /* "/pet/{petId}" */, method = "GET" ) fun getPetById( @@ -78,7 +78,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPDATE_PET, + url = PATH_UPDATE_PET /* "/pet" */, method = "PUT" ) fun updatePet( @@ -87,7 +87,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPDATE_PET_WITH_FORM, + url = PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */, method = "POST" ) fun updatePetWithForm( @@ -98,7 +98,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPLOAD_FILE, + url = PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */, method = "POST" ) fun uploadFile( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 85f3bf03df56..6e79de6f9975 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt @@ -31,7 +31,7 @@ import kotlin.collections.Map interface StoreApi { @HttpExchange( - url = PATH_DELETE_ORDER, + url = PATH_DELETE_ORDER /* "/store/order/{orderId}" */, method = "DELETE" ) fun deleteOrder( @@ -40,7 +40,7 @@ interface StoreApi { @HttpExchange( - url = PATH_GET_INVENTORY, + url = PATH_GET_INVENTORY /* "/store/inventory" */, method = "GET" ) fun getInventory( @@ -48,7 +48,7 @@ interface StoreApi { @HttpExchange( - url = PATH_GET_ORDER_BY_ID, + url = PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */, method = "GET" ) fun getOrderById( @@ -57,7 +57,7 @@ interface StoreApi { @HttpExchange( - url = PATH_PLACE_ORDER, + url = PATH_PLACE_ORDER /* "/store/order" */, method = "POST" ) fun placeOrder( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt index a7fc04c93b6d..9caf73a05169 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt @@ -31,7 +31,7 @@ import kotlin.collections.Map interface UserApi { @HttpExchange( - url = PATH_CREATE_USER, + url = PATH_CREATE_USER /* "/user" */, method = "POST" ) fun createUser( @@ -40,7 +40,7 @@ interface UserApi { @HttpExchange( - url = PATH_CREATE_USERS_WITH_ARRAY_INPUT, + url = PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */, method = "POST" ) fun createUsersWithArrayInput( @@ -49,7 +49,7 @@ interface UserApi { @HttpExchange( - url = PATH_CREATE_USERS_WITH_LIST_INPUT, + url = PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */, method = "POST" ) fun createUsersWithListInput( @@ -58,7 +58,7 @@ interface UserApi { @HttpExchange( - url = PATH_DELETE_USER, + url = PATH_DELETE_USER /* "/user/{username}" */, method = "DELETE" ) fun deleteUser( @@ -67,7 +67,7 @@ interface UserApi { @HttpExchange( - url = PATH_GET_USER_BY_NAME, + url = PATH_GET_USER_BY_NAME /* "/user/{username}" */, method = "GET" ) fun getUserByName( @@ -76,7 +76,7 @@ interface UserApi { @HttpExchange( - url = PATH_LOGIN_USER, + url = PATH_LOGIN_USER /* "/user/login" */, method = "GET" ) fun loginUser( @@ -86,7 +86,7 @@ interface UserApi { @HttpExchange( - url = PATH_LOGOUT_USER, + url = PATH_LOGOUT_USER /* "/user/logout" */, method = "GET" ) fun logoutUser( @@ -94,7 +94,7 @@ interface UserApi { @HttpExchange( - url = PATH_UPDATE_USER, + url = PATH_UPDATE_USER /* "/user/{username}" */, method = "PUT" ) fun updateUser( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 829cc97fd017..d463afa6aa24 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -30,7 +30,7 @@ import kotlin.collections.Map interface PetApi { @HttpExchange( - url = PATH_ADD_PET, + url = PATH_ADD_PET /* "/pet" */, method = "POST" ) fun addPet( @@ -39,7 +39,7 @@ interface PetApi { @HttpExchange( - url = PATH_DELETE_PET, + url = PATH_DELETE_PET /* "/pet/{petId}" */, method = "DELETE" ) fun deletePet( @@ -49,7 +49,7 @@ interface PetApi { @HttpExchange( - url = PATH_FIND_PETS_BY_STATUS, + url = PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */, method = "GET" ) fun findPetsByStatus( @@ -58,7 +58,7 @@ interface PetApi { @HttpExchange( - url = PATH_FIND_PETS_BY_TAGS, + url = PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */, method = "GET" ) fun findPetsByTags( @@ -67,7 +67,7 @@ interface PetApi { @HttpExchange( - url = PATH_GET_PET_BY_ID, + url = PATH_GET_PET_BY_ID /* "/pet/{petId}" */, method = "GET" ) fun getPetById( @@ -76,7 +76,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPDATE_PET, + url = PATH_UPDATE_PET /* "/pet" */, method = "PUT" ) fun updatePet( @@ -85,7 +85,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPDATE_PET_WITH_FORM, + url = PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */, method = "POST" ) fun updatePetWithForm( @@ -96,7 +96,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPLOAD_FILE, + url = PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */, method = "POST" ) fun uploadFile( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 95d07e02abf7..318a73809f5c 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt @@ -29,7 +29,7 @@ import kotlin.collections.Map interface StoreApi { @HttpExchange( - url = PATH_DELETE_ORDER, + url = PATH_DELETE_ORDER /* "/store/order/{orderId}" */, method = "DELETE" ) fun deleteOrder( @@ -38,7 +38,7 @@ interface StoreApi { @HttpExchange( - url = PATH_GET_INVENTORY, + url = PATH_GET_INVENTORY /* "/store/inventory" */, method = "GET" ) fun getInventory( @@ -46,7 +46,7 @@ interface StoreApi { @HttpExchange( - url = PATH_GET_ORDER_BY_ID, + url = PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */, method = "GET" ) fun getOrderById( @@ -55,7 +55,7 @@ interface StoreApi { @HttpExchange( - url = PATH_PLACE_ORDER, + url = PATH_PLACE_ORDER /* "/store/order" */, method = "POST" ) fun placeOrder( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 1f9fcebe6d43..70f54f1bc572 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt @@ -29,7 +29,7 @@ import kotlin.collections.Map interface UserApi { @HttpExchange( - url = PATH_CREATE_USER, + url = PATH_CREATE_USER /* "/user" */, method = "POST" ) fun createUser( @@ -38,7 +38,7 @@ interface UserApi { @HttpExchange( - url = PATH_CREATE_USERS_WITH_ARRAY_INPUT, + url = PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */, method = "POST" ) fun createUsersWithArrayInput( @@ -47,7 +47,7 @@ interface UserApi { @HttpExchange( - url = PATH_CREATE_USERS_WITH_LIST_INPUT, + url = PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */, method = "POST" ) fun createUsersWithListInput( @@ -56,7 +56,7 @@ interface UserApi { @HttpExchange( - url = PATH_DELETE_USER, + url = PATH_DELETE_USER /* "/user/{username}" */, method = "DELETE" ) fun deleteUser( @@ -65,7 +65,7 @@ interface UserApi { @HttpExchange( - url = PATH_GET_USER_BY_NAME, + url = PATH_GET_USER_BY_NAME /* "/user/{username}" */, method = "GET" ) fun getUserByName( @@ -74,7 +74,7 @@ interface UserApi { @HttpExchange( - url = PATH_LOGIN_USER, + url = PATH_LOGIN_USER /* "/user/login" */, method = "GET" ) fun loginUser( @@ -84,7 +84,7 @@ interface UserApi { @HttpExchange( - url = PATH_LOGOUT_USER, + url = PATH_LOGOUT_USER /* "/user/logout" */, method = "GET" ) fun logoutUser( @@ -92,7 +92,7 @@ interface UserApi { @HttpExchange( - url = PATH_UPDATE_USER, + url = PATH_UPDATE_USER /* "/user/{username}" */, method = "PUT" ) fun updateUser( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 829cc97fd017..d463afa6aa24 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -30,7 +30,7 @@ import kotlin.collections.Map interface PetApi { @HttpExchange( - url = PATH_ADD_PET, + url = PATH_ADD_PET /* "/pet" */, method = "POST" ) fun addPet( @@ -39,7 +39,7 @@ interface PetApi { @HttpExchange( - url = PATH_DELETE_PET, + url = PATH_DELETE_PET /* "/pet/{petId}" */, method = "DELETE" ) fun deletePet( @@ -49,7 +49,7 @@ interface PetApi { @HttpExchange( - url = PATH_FIND_PETS_BY_STATUS, + url = PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */, method = "GET" ) fun findPetsByStatus( @@ -58,7 +58,7 @@ interface PetApi { @HttpExchange( - url = PATH_FIND_PETS_BY_TAGS, + url = PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */, method = "GET" ) fun findPetsByTags( @@ -67,7 +67,7 @@ interface PetApi { @HttpExchange( - url = PATH_GET_PET_BY_ID, + url = PATH_GET_PET_BY_ID /* "/pet/{petId}" */, method = "GET" ) fun getPetById( @@ -76,7 +76,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPDATE_PET, + url = PATH_UPDATE_PET /* "/pet" */, method = "PUT" ) fun updatePet( @@ -85,7 +85,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPDATE_PET_WITH_FORM, + url = PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */, method = "POST" ) fun updatePetWithForm( @@ -96,7 +96,7 @@ interface PetApi { @HttpExchange( - url = PATH_UPLOAD_FILE, + url = PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */, method = "POST" ) fun uploadFile( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 95d07e02abf7..318a73809f5c 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt @@ -29,7 +29,7 @@ import kotlin.collections.Map interface StoreApi { @HttpExchange( - url = PATH_DELETE_ORDER, + url = PATH_DELETE_ORDER /* "/store/order/{orderId}" */, method = "DELETE" ) fun deleteOrder( @@ -38,7 +38,7 @@ interface StoreApi { @HttpExchange( - url = PATH_GET_INVENTORY, + url = PATH_GET_INVENTORY /* "/store/inventory" */, method = "GET" ) fun getInventory( @@ -46,7 +46,7 @@ interface StoreApi { @HttpExchange( - url = PATH_GET_ORDER_BY_ID, + url = PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */, method = "GET" ) fun getOrderById( @@ -55,7 +55,7 @@ interface StoreApi { @HttpExchange( - url = PATH_PLACE_ORDER, + url = PATH_PLACE_ORDER /* "/store/order" */, method = "POST" ) fun placeOrder( diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 1f9fcebe6d43..70f54f1bc572 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt @@ -29,7 +29,7 @@ import kotlin.collections.Map interface UserApi { @HttpExchange( - url = PATH_CREATE_USER, + url = PATH_CREATE_USER /* "/user" */, method = "POST" ) fun createUser( @@ -38,7 +38,7 @@ interface UserApi { @HttpExchange( - url = PATH_CREATE_USERS_WITH_ARRAY_INPUT, + url = PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */, method = "POST" ) fun createUsersWithArrayInput( @@ -47,7 +47,7 @@ interface UserApi { @HttpExchange( - url = PATH_CREATE_USERS_WITH_LIST_INPUT, + url = PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */, method = "POST" ) fun createUsersWithListInput( @@ -56,7 +56,7 @@ interface UserApi { @HttpExchange( - url = PATH_DELETE_USER, + url = PATH_DELETE_USER /* "/user/{username}" */, method = "DELETE" ) fun deleteUser( @@ -65,7 +65,7 @@ interface UserApi { @HttpExchange( - url = PATH_GET_USER_BY_NAME, + url = PATH_GET_USER_BY_NAME /* "/user/{username}" */, method = "GET" ) fun getUserByName( @@ -74,7 +74,7 @@ interface UserApi { @HttpExchange( - url = PATH_LOGIN_USER, + url = PATH_LOGIN_USER /* "/user/login" */, method = "GET" ) fun loginUser( @@ -84,7 +84,7 @@ interface UserApi { @HttpExchange( - url = PATH_LOGOUT_USER, + url = PATH_LOGOUT_USER /* "/user/logout" */, method = "GET" ) fun logoutUser( @@ -92,7 +92,7 @@ interface UserApi { @HttpExchange( - url = PATH_UPDATE_USER, + url = PATH_UPDATE_USER /* "/user/{username}" */, method = "PUT" ) fun updateUser( diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt index 7b16016be8ae..61dd3a75c160 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.FakeApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class FakeApiController() { @Operation( @@ -42,7 +43,7 @@ class FakeApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/fake/annotations"], + value = [PATH_ANNOTATIONS /* "/fake/annotations" */], consumes = ["application/json"] ) fun annotations( @@ -61,7 +62,7 @@ class FakeApiController() { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/fake/annotations"], + value = [PATH_UPDATE_PET_WITH_FORM_NUMBER /* "/fake/annotations" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithFormNumber( @@ -72,4 +73,11 @@ class FakeApiController() { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ANNOTATIONS: String = "/fake/annotations" + const val PATH_UPDATE_PET_WITH_FORM_NUMBER: String = "/fake/annotations" + } } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt index e8849bcb03f2..621d125c59c5 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController() { @Operation( @@ -45,7 +46,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -65,7 +66,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -85,7 +86,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -105,7 +106,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -126,7 +127,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -148,7 +149,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -168,7 +169,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -189,7 +190,7 @@ class PetApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -200,4 +201,17 @@ class PetApiController() { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt index b59669664289..9b3e74ad4ddc 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController() { @Operation( @@ -43,7 +44,7 @@ class StoreApiController() { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -61,7 +62,7 @@ class StoreApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -79,7 +80,7 @@ class StoreApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -98,7 +99,7 @@ class StoreApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -107,4 +108,13 @@ class StoreApiController() { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt index 397f15598b74..8c19a899fbbe 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController() { @Operation( @@ -43,7 +44,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -62,7 +63,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -81,7 +82,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -101,7 +102,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -120,7 +121,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -139,7 +140,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -159,7 +160,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -176,7 +177,7 @@ class UserApiController() { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -185,4 +186,17 @@ class UserApiController() { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index 3c6fe48891a6..0cffbb9f76e6 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -31,7 +31,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -44,7 +44,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -56,7 +56,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -68,7 +68,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -80,7 +80,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -92,7 +92,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -105,7 +105,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -119,7 +119,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -130,4 +130,16 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 4d8ada5958b5..457638d16963 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -30,7 +30,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -41,7 +41,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -51,7 +51,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -63,7 +63,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -72,4 +72,12 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index 581d2015d7cf..fa8508cf219f 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -30,7 +30,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -42,7 +42,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -54,7 +54,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -66,7 +66,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -77,7 +77,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -89,7 +89,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -102,7 +102,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -111,7 +111,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -120,4 +120,16 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt index 3c6fe48891a6..0cffbb9f76e6 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -31,7 +31,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -44,7 +44,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -56,7 +56,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -68,7 +68,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -80,7 +80,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -92,7 +92,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -105,7 +105,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -119,7 +119,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -130,4 +130,16 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 4d8ada5958b5..457638d16963 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -30,7 +30,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -41,7 +41,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -51,7 +51,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -63,7 +63,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -72,4 +72,12 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt index 581d2015d7cf..fa8508cf219f 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -30,7 +30,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -42,7 +42,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -54,7 +54,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -66,7 +66,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -77,7 +77,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -89,7 +89,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -102,7 +102,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -111,7 +111,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -120,4 +120,16 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt index 3c6fe48891a6..0cffbb9f76e6 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -31,7 +31,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -44,7 +44,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -56,7 +56,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -68,7 +68,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -80,7 +80,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -92,7 +92,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -105,7 +105,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -119,7 +119,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -130,4 +130,16 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 4d8ada5958b5..457638d16963 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -30,7 +30,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -41,7 +41,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -51,7 +51,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -63,7 +63,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -72,4 +72,12 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt index 581d2015d7cf..fa8508cf219f 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -30,7 +30,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -42,7 +42,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -54,7 +54,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -66,7 +66,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -77,7 +77,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -89,7 +89,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -102,7 +102,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -111,7 +111,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -120,4 +120,16 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt index c4f90b0b6a7f..b2d9ec723cbf 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.TestApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:}") +@RequestMapping("\${api.demo.base-path:api.base-path:$BASE_PATH}") class TestApiController() { @Operation( @@ -42,7 +43,7 @@ class TestApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/test"], + value = [PATH_TEST_POST /* "/test" */], consumes = ["application/json"] ) fun testPost( @@ -50,4 +51,10 @@ class TestApiController() { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "" + const val PATH_TEST_POST: String = "/test" + } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt index b74c7f8c8402..f73b78ead9f5 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -36,7 +37,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") interface PetApi { fun getDelegate(): PetApiDelegate @@ -54,7 +55,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -76,7 +77,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -98,7 +99,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -120,7 +121,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -143,7 +144,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -167,7 +168,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -189,7 +190,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -212,7 +213,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -223,4 +224,17 @@ interface PetApi { ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt index 65a28693e5e0..0f641951b643 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -35,7 +36,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") interface StoreApi { fun getDelegate(): StoreApiDelegate @@ -52,7 +53,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -72,7 +73,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -92,7 +93,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -113,7 +114,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -122,4 +123,13 @@ interface StoreApi { ): ResponseEntity { return getDelegate().placeOrder(order) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt index fc1dd03f04d2..33e2afdd2903 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -35,7 +36,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") interface UserApi { fun getDelegate(): UserApiDelegate @@ -52,7 +53,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -73,7 +74,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -94,7 +95,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -116,7 +117,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -137,7 +138,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -158,7 +159,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -180,7 +181,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return getDelegate().logoutUser() @@ -199,7 +200,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -208,4 +209,17 @@ interface UserApi { ): ResponseEntity { return getDelegate().updateUser(username, user) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index c9d23cb9066c..5c4a858ad524 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -53,7 +53,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -75,7 +75,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -97,7 +97,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -119,7 +119,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -142,7 +142,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -166,7 +166,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -188,7 +188,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -211,7 +211,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -222,4 +222,16 @@ interface PetApi { ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 844fc64b818b..6affe35e7bf6 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -51,7 +51,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -71,7 +71,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -91,7 +91,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -112,7 +112,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -121,4 +121,12 @@ interface StoreApi { ): ResponseEntity { return getDelegate().placeOrder(order) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index e972e0b8d13b..55d7c2558785 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -51,7 +51,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -72,7 +72,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -93,7 +93,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -115,7 +115,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -136,7 +136,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -157,7 +157,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -179,7 +179,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return getDelegate().logoutUser() @@ -198,7 +198,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -207,4 +207,16 @@ interface UserApi { ): ResponseEntity { return getDelegate().updateUser(username, user) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 91276e20f698..04baf319ae2d 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -56,7 +56,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json"] ) suspend fun addPet( @@ -78,7 +78,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) suspend fun deletePet( @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -102,7 +102,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/json"] ) fun findPetsByStatus( @@ -126,7 +126,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/json"] ) fun findPetsByTags( @@ -149,7 +149,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/json"] ) suspend fun getPetById( @@ -171,7 +171,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json"] ) suspend fun updatePet( @@ -193,7 +193,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) suspend fun updatePetWithForm( @@ -218,7 +218,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -230,4 +230,16 @@ interface PetApi { ): ResponseEntity { return getDelegate().uploadFile(petId, additionalMetadata, file, exchange) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index ee5e5a1b8cc8..8557e4fc88ca 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -54,7 +54,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) suspend fun deleteOrder( @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.String, @@ -77,7 +77,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) suspend fun getInventory(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> { @@ -96,7 +96,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/json"] ) suspend fun getOrderById( @@ -118,7 +118,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/json"], consumes = ["application/json"] ) @@ -128,4 +128,12 @@ interface StoreApi { ): ResponseEntity { return getDelegate().placeOrder(order, exchange) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 9674c8131936..30c0c32f527d 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -54,7 +54,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) suspend fun createUser( @@ -75,7 +75,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) suspend fun createUsersWithArrayInput( @@ -96,7 +96,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) suspend fun createUsersWithListInput( @@ -117,7 +117,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) suspend fun deleteUser( @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, @@ -138,7 +138,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/json"] ) suspend fun getUserByName( @@ -160,7 +160,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/json"] ) suspend fun loginUser( @@ -182,7 +182,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) suspend fun logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { return getDelegate().logoutUser(exchange) @@ -199,7 +199,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) suspend fun updateUser( @@ -209,4 +209,16 @@ interface UserApi { ): ResponseEntity { return getDelegate().updateUser(username, user, exchange) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt index 1d59076211bc..3aa911897301 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/api/DefaultApi.kt @@ -35,8 +35,13 @@ interface DefaultApi { @RequestMapping( method = [RequestMethod.GET], - value = ["/healthcheck"], + value = [PATH_HEALTHCHECK /* "/healthcheck" */], produces = ["application/json"] ) fun healthcheck(): ResponseEntity + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_HEALTHCHECK: String = "/healthcheck" + } } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt index a7fdbceafbd3..8711f20cc8cf 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @Operation( @@ -44,7 +45,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -63,7 +64,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -83,7 +84,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -103,7 +104,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -124,7 +125,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -145,7 +146,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -164,7 +165,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -185,7 +186,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -196,4 +197,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 589e49ffdb3f..bc4eab7baef7 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @Operation( @@ -43,7 +44,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -61,7 +62,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -79,7 +80,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -98,7 +99,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -106,4 +107,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt index adbdd091f0bb..502e6619783b 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @Operation( @@ -42,7 +43,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User @@ -59,7 +60,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -76,7 +77,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -94,7 +95,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -113,7 +114,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -132,7 +133,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -151,7 +152,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -167,7 +168,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, @@ -175,4 +176,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt index 62b0cc6909a8..c1b47a8cd29a 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.MultipartMixedApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:}") +@RequestMapping("\${api.multipartFileTest.base-path:api.base-path:$BASE_PATH}") class MultipartMixedApiController() { @Operation( @@ -43,7 +44,7 @@ class MultipartMixedApiController() { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/multipart-mixed"], + value = [PATH_MULTIPART_MIXED /* "/multipart-mixed" */], consumes = ["multipart/form-data"] ) fun multipartMixed( @@ -53,4 +54,10 @@ class MultipartMixedApiController() { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "" + const val PATH_MULTIPART_MIXED: String = "/multipart-mixed" + } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 70a85b1f8852..bed8de60b2a8 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -37,7 +37,7 @@ interface PetApi { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -49,7 +49,7 @@ interface PetApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -61,7 +61,7 @@ interface PetApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -73,7 +73,7 @@ interface PetApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -85,7 +85,7 @@ interface PetApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -97,7 +97,7 @@ interface PetApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -109,7 +109,7 @@ interface PetApi { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -123,7 +123,7 @@ interface PetApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -134,4 +134,16 @@ interface PetApi { ): ModelApiResponse { return getDelegate().uploadFile(petId, additionalMetadata, file) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 9eb09e196d3b..832fecd5a166 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -36,7 +36,7 @@ interface StoreApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -47,7 +47,7 @@ interface StoreApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): Map { @@ -57,7 +57,7 @@ interface StoreApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -69,7 +69,7 @@ interface StoreApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -77,4 +77,12 @@ interface StoreApi { ): Order { return getDelegate().placeOrder(body) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 4b9fd9689380..1ed657d7663c 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -36,7 +36,7 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @Valid @RequestBody body: User @@ -47,7 +47,7 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List @@ -58,7 +58,7 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List @@ -69,7 +69,7 @@ interface UserApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -80,7 +80,7 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -92,7 +92,7 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -105,7 +105,7 @@ interface UserApi { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): Unit { return getDelegate().logoutUser() @@ -114,7 +114,7 @@ interface UserApi { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @PathVariable("username") username: kotlin.String, @@ -122,4 +122,16 @@ interface UserApi { ): Unit { return getDelegate().updateUser(username, body) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index 04449f648821..8f93c3424b42 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -25,13 +26,13 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -43,7 +44,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -55,7 +56,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -67,7 +68,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -79,7 +80,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -91,7 +92,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -103,7 +104,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -117,7 +118,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -128,4 +129,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ModelApiResponse { return service.uploadFile(petId, additionalMetadata, file) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index ba7b256d126a..3b530ea4d18d 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -24,13 +25,13 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -41,7 +42,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): Map { @@ -51,7 +52,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -63,7 +64,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -71,4 +72,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): Order { return service.placeOrder(body) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index ec55c2e7c42c..ed9382786fc1 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -24,13 +25,13 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @Valid @RequestBody body: User @@ -41,7 +42,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List @@ -52,7 +53,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List @@ -63,7 +64,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -74,7 +75,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -86,7 +87,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -99,7 +100,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.OK) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): Unit { return service.logoutUser() @@ -108,7 +109,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @ResponseStatus(HttpStatus.BAD_REQUEST) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @PathVariable("username") username: kotlin.String, @@ -116,4 +117,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): Unit { return service.updateUser(username, body) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt index 8c66a2b20655..135958374915 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -32,7 +33,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @Operation( @@ -46,7 +47,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -66,7 +67,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) suspend fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -86,7 +87,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) suspend fun findPetsByStatus( @@ -106,7 +107,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) suspend fun findPetsByTags( @@ -127,7 +128,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) suspend fun getPetById( @@ -149,7 +150,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -169,7 +170,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) suspend fun updatePetWithForm( @@ -190,7 +191,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -201,4 +202,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 608f90559e86..298c72da9319 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @Operation( @@ -44,7 +45,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) suspend fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -62,7 +63,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) suspend fun getInventory(): ResponseEntity> { @@ -80,7 +81,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) suspend fun getOrderById( @@ -99,7 +100,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -108,4 +109,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt index e8fba1354785..42b9fe6db280 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @Operation( @@ -44,7 +45,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) suspend fun createUser( @@ -63,7 +64,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) suspend fun createUsersWithArrayInput( @@ -82,7 +83,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) suspend fun createUsersWithListInput( @@ -102,7 +103,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) suspend fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -121,7 +122,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) suspend fun getUserByName( @@ -140,7 +141,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) suspend fun loginUser( @@ -160,7 +161,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) suspend fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -177,7 +178,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) suspend fun updateUser( @@ -186,4 +187,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt index fbf1d86c071b..8882eaf60ba7 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -32,7 +33,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @Operation( @@ -46,7 +47,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -66,7 +67,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) suspend fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -86,7 +87,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -106,7 +107,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -127,7 +128,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) suspend fun getPetById( @@ -149,7 +150,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], produces = ["application/xml", "application/json"], consumes = ["application/json", "application/xml"] ) @@ -169,7 +170,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) suspend fun updatePetWithForm( @@ -190,7 +191,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -201,4 +202,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 608f90559e86..298c72da9319 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @Operation( @@ -44,7 +45,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) suspend fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -62,7 +63,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) suspend fun getInventory(): ResponseEntity> { @@ -80,7 +81,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) suspend fun getOrderById( @@ -99,7 +100,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -108,4 +109,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt index e8fba1354785..42b9fe6db280 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @Operation( @@ -44,7 +45,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) suspend fun createUser( @@ -63,7 +64,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) suspend fun createUsersWithArrayInput( @@ -82,7 +83,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) suspend fun createUsersWithListInput( @@ -102,7 +103,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) suspend fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -121,7 +122,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) suspend fun getUserByName( @@ -140,7 +141,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) suspend fun loginUser( @@ -160,7 +161,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) suspend fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -177,7 +178,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) suspend fun updateUser( @@ -186,4 +187,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt index 6b9197d4819e..941858965272 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeApi.kt @@ -48,7 +48,7 @@ interface FakeApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/fake/cookie-suggestion"], + value = [PATH_FAKE_COOKIE_SUGGESTION /* "/fake/cookie-suggestion" */], produces = ["application/json"] ) fun fakeCookieSuggestion( @@ -56,4 +56,9 @@ interface FakeApi { ): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_FAKE_COOKIE_SUGGESTION: String = "/fake/cookie-suggestion" + } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt index ce97fc564acb..4140a5b2bc8e 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FakeClassnameTestApi.kt @@ -49,7 +49,7 @@ interface FakeClassnameTestApi { ) @RequestMapping( method = [RequestMethod.PATCH], - value = ["/fake_classname_test"], + value = [PATH_TEST_CLASSNAME /* "/fake_classname_test" */], produces = ["application/json"], consumes = ["application/json"] ) @@ -58,4 +58,9 @@ interface FakeClassnameTestApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_TEST_CLASSNAME: String = "/fake_classname_test" + } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt index 41f896d9abf3..14c9e4a6e035 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/FooApi.kt @@ -48,10 +48,15 @@ interface FooApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/foo"], + value = [PATH_FOO_GET /* "/foo" */], produces = ["application/json"] ) fun fooGet(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_FOO_GET: String = "/foo" + } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt index fd5a68456010..c13edd06a380 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -51,7 +51,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -73,7 +73,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -95,7 +95,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -117,7 +117,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -140,7 +140,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -164,7 +164,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -186,7 +186,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -209,7 +209,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -220,4 +220,16 @@ interface PetApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt index 56c8aebfb053..f84338ca20ee 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -49,7 +49,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{order_id}"] + value = [PATH_DELETE_ORDER /* "/store/order/{order_id}" */] ) fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") orderId: kotlin.String @@ -69,7 +69,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -89,7 +89,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{order_id}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{order_id}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -110,7 +110,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"], consumes = ["application/json"] ) @@ -119,4 +119,12 @@ interface StoreApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{order_id}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{order_id}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt index 328ce0c16597..7496c3fa4362 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -48,7 +48,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -68,7 +68,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -88,7 +88,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -109,7 +109,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -130,7 +130,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -151,7 +151,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -172,7 +172,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) @@ -190,7 +190,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -199,4 +199,16 @@ interface UserApi { ): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt index 40ab7505d8ec..d5fa639d6262 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -34,7 +35,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "pet", description = "The pet API") -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @@ -47,7 +48,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 405, message = "Invalid input")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -66,7 +67,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 400, message = "Invalid pet value")]) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -87,7 +88,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -108,7 +109,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -128,7 +129,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -147,7 +148,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")]) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -166,7 +167,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 405, message = "Invalid input")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -188,7 +189,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -199,4 +200,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt index d69e81e1ff25..035751541419 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -33,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "store", description = "The store API") -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @@ -45,7 +46,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -65,7 +66,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -82,7 +83,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -101,7 +102,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -109,4 +110,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt index df7e33710a77..cfc4a5b56e20 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -33,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "user", description = "The user API") -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @@ -45,7 +46,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody body: User @@ -62,7 +63,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -79,7 +80,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -96,7 +97,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -114,7 +115,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -133,7 +134,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -152,7 +153,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -167,7 +168,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, @@ -175,4 +176,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt index a7fdbceafbd3..8711f20cc8cf 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -31,7 +32,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @Operation( @@ -44,7 +45,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -63,7 +64,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -83,7 +84,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -103,7 +104,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -124,7 +125,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -145,7 +146,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -164,7 +165,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -185,7 +186,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -196,4 +197,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 589e49ffdb3f..bc4eab7baef7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @Operation( @@ -43,7 +44,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -61,7 +62,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -79,7 +80,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -98,7 +99,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -106,4 +107,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt index adbdd091f0bb..502e6619783b 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -30,7 +31,7 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @Operation( @@ -42,7 +43,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User @@ -59,7 +60,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -76,7 +77,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -94,7 +95,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -113,7 +114,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -132,7 +133,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -151,7 +152,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -167,7 +168,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, @@ -175,4 +176,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt index 40ab7505d8ec..d5fa639d6262 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -34,7 +35,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "pet", description = "The pet API") -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @@ -47,7 +48,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 405, message = "Invalid input")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -66,7 +67,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 400, message = "Invalid pet value")]) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -87,7 +88,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid status value")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -108,7 +109,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class, responseContainer = "List"),ApiResponse(code = 400, message = "Invalid tag value")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -128,7 +129,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = Pet::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -147,7 +148,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Pet not found"),ApiResponse(code = 405, message = "Validation exception")]) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -166,7 +167,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 405, message = "Invalid input")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -188,7 +189,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = [ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse::class)]) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -199,4 +200,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt index d69e81e1ff25..035751541419 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -33,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "store", description = "The store API") -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @@ -45,7 +46,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String @@ -65,7 +66,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -82,7 +83,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid ID supplied"),ApiResponse(code = 404, message = "Order not found")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -101,7 +102,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic value = [ApiResponse(code = 200, message = "successful operation", response = Order::class),ApiResponse(code = 400, message = "Invalid Order")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -109,4 +110,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt index df7e33710a77..cfc4a5b56e20 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -33,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "user", description = "The user API") -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @@ -45,7 +46,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody body: User @@ -62,7 +63,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -79,7 +80,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List @@ -96,7 +97,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String @@ -114,7 +115,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation", response = User::class),ApiResponse(code = 400, message = "Invalid username supplied"),ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -133,7 +134,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.String::class),ApiResponse(code = 400, message = "Invalid username/password supplied")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -152,7 +153,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -167,7 +168,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = [ApiResponse(code = 400, message = "Invalid user supplied"),ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String, @@ -175,4 +176,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt index 40a9873493d4..74927d98aeb4 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -53,7 +53,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json"] ) fun addPet( @@ -73,7 +73,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long, @@ -95,7 +95,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/json"] ) fun findPetsByStatus( @@ -117,7 +117,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/json"] ) fun findPetsByTags( @@ -138,7 +138,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/json"] ) fun getPetById( @@ -158,7 +158,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json"] ) fun updatePet( @@ -178,7 +178,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -201,7 +201,7 @@ interface PetApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -211,4 +211,16 @@ interface PetApi { @ApiParam(value = "file detail") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest ): ResponseEntity + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt index 556701580be4..40c176b58ce1 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -51,7 +51,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @ApiParam(value = "", required = true) @PathVariable("orderId") orderId: kotlin.String, @@ -72,7 +72,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> @@ -89,7 +89,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/json"] ) fun getOrderById( @@ -109,7 +109,7 @@ interface StoreApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/json"], consumes = ["application/json"] ) @@ -117,4 +117,12 @@ interface StoreApi { @ApiParam(value = "", required = true) @Valid @RequestBody order: Order, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest ): ResponseEntity + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt index 7b89885d6038..db017f3558b1 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -51,7 +51,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"], + value = [PATH_CREATE_USER /* "/user" */], consumes = ["application/json"] ) fun createUser( @@ -70,7 +70,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"], + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */], consumes = ["application/json"] ) fun createUsersWithArrayInput( @@ -89,7 +89,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"], + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */], consumes = ["application/json"] ) fun createUsersWithListInput( @@ -108,7 +108,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @ApiParam(value = "", required = true) @PathVariable("username") username: kotlin.String, @@ -127,7 +127,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/json"] ) fun getUserByName( @@ -147,7 +147,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/json"] ) fun loginUser( @@ -167,7 +167,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity @@ -182,7 +182,7 @@ interface UserApi { ) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"], + value = [PATH_UPDATE_USER /* "/user/{username}" */], consumes = ["application/json"] ) fun updateUser( @@ -190,4 +190,16 @@ interface UserApi { @ApiParam(value = "", required = true) @Valid @RequestBody user: User, @ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest ): ResponseEntity + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt index 0e9e2798f000..a3cc43b5886c 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.PetApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -26,13 +27,13 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet"], + value = [PATH_ADD_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun addPet( @@ -44,7 +45,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] + value = [PATH_DELETE_PET /* "/pet/{petId}" */] ) fun deletePet( @PathVariable("petId") petId: kotlin.Long, @@ -56,7 +57,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByStatus"], + value = [PATH_FIND_PETS_BY_STATUS /* "/pet/findByStatus" */], produces = ["application/xml", "application/json"] ) fun findPetsByStatus( @@ -68,7 +69,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/findByTags"], + value = [PATH_FIND_PETS_BY_TAGS /* "/pet/findByTags" */], produces = ["application/xml", "application/json"] ) fun findPetsByTags( @@ -80,7 +81,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], - value = ["/pet/{petId}"], + value = [PATH_GET_PET_BY_ID /* "/pet/{petId}" */], produces = ["application/xml", "application/json"] ) fun getPetById( @@ -92,7 +93,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.PUT], - value = ["/pet"], + value = [PATH_UPDATE_PET /* "/pet" */], consumes = ["application/json", "application/xml"] ) fun updatePet( @@ -104,7 +105,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}"], + value = [PATH_UPDATE_PET_WITH_FORM /* "/pet/{petId}" */], consumes = ["application/x-www-form-urlencoded"] ) fun updatePetWithForm( @@ -118,7 +119,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], + value = [PATH_UPLOAD_FILE /* "/pet/{petId}/uploadImage" */], produces = ["application/json"], consumes = ["multipart/form-data"] ) @@ -129,4 +130,17 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { ): ResponseEntity { return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_ADD_PET: String = "/pet" + const val PATH_DELETE_PET: String = "/pet/{petId}" + const val PATH_FIND_PETS_BY_STATUS: String = "/pet/findByStatus" + const val PATH_FIND_PETS_BY_TAGS: String = "/pet/findByTags" + const val PATH_GET_PET_BY_ID: String = "/pet/{petId}" + const val PATH_UPDATE_PET: String = "/pet" + const val PATH_UPDATE_PET_WITH_FORM: String = "/pet/{petId}" + const val PATH_UPLOAD_FILE: String = "/pet/{petId}/uploadImage" + } } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 861c3b2f92fc..a45cd616d4a9 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.StoreApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -25,13 +26,13 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class StoreApiController(@Autowired(required = true) val service: StoreApiService) { @RequestMapping( method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] + value = [PATH_DELETE_ORDER /* "/store/order/{orderId}" */] ) fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String @@ -42,7 +43,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/inventory"], + value = [PATH_GET_INVENTORY /* "/store/inventory" */], produces = ["application/json"] ) fun getInventory(): ResponseEntity> { @@ -52,7 +53,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], + value = [PATH_GET_ORDER_BY_ID /* "/store/order/{orderId}" */], produces = ["application/xml", "application/json"] ) fun getOrderById( @@ -64,7 +65,7 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.POST], - value = ["/store/order"], + value = [PATH_PLACE_ORDER /* "/store/order" */], produces = ["application/xml", "application/json"] ) fun placeOrder( @@ -72,4 +73,13 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic ): ResponseEntity { return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_DELETE_ORDER: String = "/store/order/{orderId}" + const val PATH_GET_INVENTORY: String = "/store/inventory" + const val PATH_GET_ORDER_BY_ID: String = "/store/order/{orderId}" + const val PATH_PLACE_ORDER: String = "/store/order" + } } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt index 65bda763c196..ca2f22e67a52 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired +import org.openapitools.api.UserApi.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax @@ -25,13 +26,13 @@ import kotlin.collections.Map @RestController @Validated -@RequestMapping("\${api.base-path:/v2}") +@RequestMapping("\${api.openAPIPetstore.base-path:api.base-path:$BASE_PATH}") class UserApiController(@Autowired(required = true) val service: UserApiService) { @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = [PATH_CREATE_USER /* "/user" */] ) fun createUser( @Valid @RequestBody body: User @@ -42,7 +43,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = [PATH_CREATE_USERS_WITH_ARRAY_INPUT /* "/user/createWithArray" */] ) fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List @@ -53,7 +54,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = [PATH_CREATE_USERS_WITH_LIST_INPUT /* "/user/createWithList" */] ) fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List @@ -64,7 +65,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.DELETE], - value = ["/user/{username}"] + value = [PATH_DELETE_USER /* "/user/{username}" */] ) fun deleteUser( @PathVariable("username") username: kotlin.String @@ -75,7 +76,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/{username}"], + value = [PATH_GET_USER_BY_NAME /* "/user/{username}" */], produces = ["application/xml", "application/json"] ) fun getUserByName( @@ -87,7 +88,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/login"], + value = [PATH_LOGIN_USER /* "/user/login" */], produces = ["application/xml", "application/json"] ) fun loginUser( @@ -100,7 +101,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], - value = ["/user/logout"] + value = [PATH_LOGOUT_USER /* "/user/logout" */] ) fun logoutUser(): ResponseEntity { return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) @@ -109,7 +110,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = [PATH_UPDATE_USER /* "/user/{username}" */] ) fun updateUser( @PathVariable("username") username: kotlin.String, @@ -117,4 +118,17 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) ): ResponseEntity { return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) } + + companion object { + //for your own safety never directly reuse these path definitions in tests + const val BASE_PATH: String = "/v2" + const val PATH_CREATE_USER: String = "/user" + const val PATH_CREATE_USERS_WITH_ARRAY_INPUT: String = "/user/createWithArray" + const val PATH_CREATE_USERS_WITH_LIST_INPUT: String = "/user/createWithList" + const val PATH_DELETE_USER: String = "/user/{username}" + const val PATH_GET_USER_BY_NAME: String = "/user/{username}" + const val PATH_LOGIN_USER: String = "/user/login" + const val PATH_LOGOUT_USER: String = "/user/logout" + const val PATH_UPDATE_USER: String = "/user/{username}" + } } From 9a31c1d2d96cf9a3e8641e1840785ed14d80ca10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 21 Nov 2025 10:30:42 +0100 Subject: [PATCH 17/19] fix missing import --- .../spring-declarative-http-interface/apiInterface.mustache | 3 +++ .../src/main/kotlin/org/openapitools/api/PetApiClient.kt | 1 + .../src/main/kotlin/org/openapitools/api/StoreApiClient.kt | 1 + .../src/main/kotlin/org/openapitools/api/UserApiClient.kt | 1 + 4 files changed, 6 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache index 1162877a9c06..9e554bb4c54a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache @@ -29,6 +29,9 @@ import io.swagger.annotations.AuthorizationScope import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* +{{^useResponseEntity}} +import org.springframework.http.HttpStatus +{{/useResponseEntity}} {{#useResponseEntity}} import org.springframework.http.ResponseEntity {{/useResponseEntity}} diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt index 61c9f980e066..bdab1c810b35 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt @@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.security.* import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* +import org.springframework.http.HttpStatus import org.springframework.validation.annotation.Validated import jakarta.validation.Valid diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 01fc56c0cb33..4ff6c3f3c758 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt @@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.security.* import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* +import org.springframework.http.HttpStatus import org.springframework.validation.annotation.Validated import jakarta.validation.Valid diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 635bfbe51a1d..722c7060a304 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt @@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.security.* import org.springframework.web.service.annotation.* import org.springframework.web.bind.annotation.* +import org.springframework.http.HttpStatus import org.springframework.validation.annotation.Validated import jakarta.validation.Valid From a211f1d75889719dc61cce63f6fc9f4a809438b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 21 Nov 2025 10:51:09 +0100 Subject: [PATCH 18/19] fix incorrect import --- .../src/main/resources/kotlin-spring/api.mustache | 2 +- .../src/main/kotlin/org/openapitools/api/FakeApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/TestApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../kotlin/org/openapitools/api/MultipartMixedApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/PetApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/StoreApiController.kt | 2 +- .../src/main/kotlin/org/openapitools/api/UserApiController.kt | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 2e5adf9c101d..a6ba00354e39 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -31,7 +31,7 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired {{#useRequestMappingOnController}} -import {{#apiPackage}}{{.}}.{{/apiPackage}}{{classname}}.Companion.BASE_PATH +import {{#apiPackage}}{{.}}.{{/apiPackage}}{{classname}}Controller.Companion.BASE_PATH {{/useRequestMappingOnController}} {{#useBeanValidation}} diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt index 61dd3a75c160..8c82e0cc9056 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.FakeApi.Companion.BASE_PATH +import org.openapitools.api.FakeApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt index 621d125c59c5..39eb46fad334 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 9b3e74ad4ddc..02170fa68d63 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8c19a899fbbe..dc009fc57bcf 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt index b2d9ec723cbf..22bd57fee318 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.TestApi.Companion.BASE_PATH +import org.openapitools.api.TestApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt index 8711f20cc8cf..f13355fca1df 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt index bc4eab7baef7..d2afc77e43ae 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt index 502e6619783b..9ed8632dd6a3 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt index c1b47a8cd29a..3f72f772f189 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.MultipartMixedApi.Companion.BASE_PATH +import org.openapitools.api.MultipartMixedApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index 8f93c3424b42..cb60d0e0d1d4 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 3b530ea4d18d..dce3fcd2c62e 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index ed9382786fc1..76afc5032efb 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt index 135958374915..a10f86c342b4 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 298c72da9319..8967e0d637fd 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt index 42b9fe6db280..6a15aea0c755 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt index 8882eaf60ba7..85560fcc7096 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 298c72da9319..8967e0d637fd 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt index 42b9fe6db280..6a15aea0c755 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt index d5fa639d6262..c232a8585631 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 035751541419..1e58b22e2ca1 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt index cfc4a5b56e20..8043c5448ef0 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt index 8711f20cc8cf..f13355fca1df 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt index bc4eab7baef7..d2afc77e43ae 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt index 502e6619783b..9ed8632dd6a3 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt index d5fa639d6262..c232a8585631 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 035751541419..1e58b22e2ca1 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt index cfc4a5b56e20..8043c5448ef0 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt index a3cc43b5886c..10f3825dec2b 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.PetApi.Companion.BASE_PATH +import org.openapitools.api.PetApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt index a45cd616d4a9..535986139adf 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.StoreApi.Companion.BASE_PATH +import org.openapitools.api.StoreApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt index ca2f22e67a52..a0e2d0504b67 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.* import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import org.openapitools.api.UserApi.Companion.BASE_PATH +import org.openapitools.api.UserApiController.Companion.BASE_PATH import javax.validation.Valid import javax.validation.constraints.DecimalMax From a2c24267eaf1c971f67c11c96a25ae8c392969be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Tue, 25 Nov 2025 11:35:09 +0100 Subject: [PATCH 19/19] fix fallback to nested placeholders. --- .../main/resources/kotlin-spring/api.mustache | 2 +- .../kotlin-spring/apiController.mustache | 13 ++++++++++++- .../kotlin-spring/apiInterface.mustache | 2 +- .../apiInterface.mustache | 8 +++++--- .../springfoxDocumentationConfig.mustache | 2 +- .../spring/KotlinSpringServerCodegenTest.java | 16 +++++++++++++--- .../kotlin/org/openapitools/api/PetApiClient.kt | 1 - .../org/openapitools/api/StoreApiClient.kt | 1 - .../kotlin/org/openapitools/api/UserApiClient.kt | 1 - .../kotlin/org/openapitools/api/PetApiClient.kt | 1 - .../org/openapitools/api/StoreApiClient.kt | 1 - .../kotlin/org/openapitools/api/UserApiClient.kt | 1 - .../kotlin/org/openapitools/api/PetApiClient.kt | 1 - .../org/openapitools/api/StoreApiClient.kt | 1 - .../kotlin/org/openapitools/api/UserApiClient.kt | 1 - .../kotlin/org/openapitools/api/PetApiClient.kt | 1 - .../org/openapitools/api/StoreApiClient.kt | 1 - .../kotlin/org/openapitools/api/UserApiClient.kt | 1 - .../org/openapitools/api/FakeApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/TestApiController.kt | 2 +- .../main/kotlin/org/openapitools/api/PetApi.kt | 2 +- .../main/kotlin/org/openapitools/api/StoreApi.kt | 2 +- .../main/kotlin/org/openapitools/api/UserApi.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 9 ++++++++- .../org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../org/openapitools/api/UserApiController.kt | 9 ++++++++- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../api/MultipartMixedApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 9 ++++++++- .../org/openapitools/api/StoreApiController.kt | 9 ++++++++- .../org/openapitools/api/UserApiController.kt | 9 ++++++++- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/SpringFoxConfiguration.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 2 +- .../org/openapitools/api/StoreApiController.kt | 2 +- .../org/openapitools/api/UserApiController.kt | 2 +- 58 files changed, 115 insertions(+), 62 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index a6ba00354e39..e73afb7f3630 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/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}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache index e95db2d2c3d9..7a74f8a27083 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiController.mustache +++ b/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}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index 6c60640cfa2d..0f1dcbd41551 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/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}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache index 9e554bb4c54a..876a558db0b9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/apiInterface.mustache +++ b/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}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache index 04a8fc236449..5e667f2ac80e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/springfoxDocumentationConfig.mustache +++ b/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() diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 43c330044b8f..c9843b2a0169 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/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", " fun deleteOrder(\n" diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt index bdab1c810b35..bb67e7577c35 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 4ff6c3f3c758..516617731e88 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 722c7060a304..962d34f1c374 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt index c65fb3ba8785..1dd8a8639fe2 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 6e79de6f9975..53e0b8cf5a33 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 9caf73a05169..72d2e777c642 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt index d463afa6aa24..1b5c65ba3208 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 318a73809f5c..5b8dc52f8eb7 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 70f54f1bc572..70d4e2ca5361 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt index d463afa6aa24..1b5c65ba3208 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/PetApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt index 318a73809f5c..5b8dc52f8eb7 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/StoreApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt index 70f54f1bc572..70d4e2ca5361 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/api/UserApiClient.kt +++ b/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 { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt index 8c82e0cc9056..fd53aef0fb32 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/FakeApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt index 39eb46fad334..8929c5fdb2e4 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 02170fa68d63..2d49e91cdd61 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt index dc009fc57bcf..357b5de5802f 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt index 22bd57fee318..6e5094763081 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/api/TestApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt index f73b78ead9f5..543d4062b2be 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/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 diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt index 0f641951b643..b780a53c7c34 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/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 diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt index 33e2afdd2903..32a0ea9500de 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/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 diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt index c4f47748e1c3..ebb5f4703d64 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/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" + } + } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 316f31b0355f..43c10cacd1c1 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/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" + } + } diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt index 39b95316c830..ebe368f23cfa 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/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" + } + } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt index f13355fca1df..874a6bc303d1 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt index d2afc77e43ae..fca955f2fd05 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt index 9ed8632dd6a3..869873f9562b 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt index 3f72f772f189..1e2535655b85 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/api/MultipartMixedApiController.kt +++ b/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( diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt index bda17886a9fb..7e02a833cd42 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -3,10 +3,11 @@ 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( delegate: PetApiDelegate? ) : PetApi { @@ -17,4 +18,10 @@ class PetApiController( } 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" + } + } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt index d716a4f9b76b..4641938c315a 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -3,10 +3,11 @@ 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( delegate: StoreApiDelegate? ) : StoreApi { @@ -17,4 +18,10 @@ class StoreApiController( } 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" + } + } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt index d298504ed57a..d20572f82fa5 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -3,10 +3,11 @@ 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( delegate: UserApiDelegate? ) : UserApi { @@ -17,4 +18,10 @@ class UserApiController( } 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" + } + } diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt index cb60d0e0d1d4..ef916fdebbc8 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -26,7 +26,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) { @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt index dce3fcd2c62e..b29a1b7af3c3 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -25,7 +25,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) { @ResponseStatus(HttpStatus.BAD_REQUEST) diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt index 76afc5032efb..44632400f82d 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -25,7 +25,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) { @ResponseStatus(HttpStatus.OK) diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt index a10f86c342b4..223d388acf0b 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -33,7 +33,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( diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 8967e0d637fd..fe53c809ca15 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/StoreApiController.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 StoreApiController(@Autowired(required = true) val service: StoreApiService) { @Operation( diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt index 6a15aea0c755..29102c08ed35 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.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 UserApiController(@Autowired(required = true) val service: UserApiService) { @Operation( diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt index 85560fcc7096..630c4e2fd0c7 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -33,7 +33,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( diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 8967e0d637fd..fe53c809ca15 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/StoreApiController.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 StoreApiController(@Autowired(required = true) val service: StoreApiService) { @Operation( diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt index 6a15aea0c755..29102c08ed35 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.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 UserApiController(@Autowired(required = true) val service: UserApiService) { @Operation( diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt index c232a8585631..f99b4146027c 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -35,7 +35,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "pet", description = "The pet API") -@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) { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 1e58b22e2ca1..fa400197c7ca 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -34,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "store", description = "The store API") -@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) { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8043c5448ef0..cbaedc3d378b 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -34,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "user", description = "The user API") -@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) { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt index f13355fca1df..874a6bc303d1 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/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( diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt index d2afc77e43ae..fca955f2fd05 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/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( diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt index 9ed8632dd6a3..869873f9562b 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/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( diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt index c5a328c0d2b7..10af15bfd72f 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/SpringFoxConfiguration.kt @@ -34,7 +34,7 @@ class SpringFoxConfiguration { } @Bean - fun customImplementation(servletContext: ServletContext, @Value("\${openapi.openAPIPetstore.base-path:/v2}") basePath: String): Docket { + fun customImplementation(servletContext: ServletContext, @Value("\${openapi.openAPIPetstore.base-path:\${api.base-path:/v2}}") basePath: String): Docket { return Docket(DocumentationType.SWAGGER_2) .select() .apis(RequestHandlerSelectors.basePackage("org.openapitools.api")) diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt index c232a8585631..f99b4146027c 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -35,7 +35,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "pet", description = "The pet API") -@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) { diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 1e58b22e2ca1..fa400197c7ca 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -34,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "store", description = "The store API") -@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) { diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8043c5448ef0..cbaedc3d378b 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -34,7 +34,7 @@ import kotlin.collections.Map @RestController @Validated @Api(value = "user", description = "The user API") -@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) { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt index 10f3825dec2b..cab508170bc0 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -27,7 +27,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) { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 535986139adf..f67688fd7976 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -26,7 +26,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) { diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt index a0e2d0504b67..c20a32b010c8 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -26,7 +26,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) {