From f08b021303283a081a8a712c210fee0d8400e8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 31 Oct 2025 16:08:22 +0100 Subject: [PATCH 01/23] modify templates to enable possibility to add reactive or blocking request context --- .../src/main/resources/kotlin-spring/api.mustache | 2 +- .../src/main/resources/kotlin-spring/apiDelegate.mustache | 2 +- .../src/main/resources/kotlin-spring/apiInterface.mustache | 2 +- 3 files changed, 3 insertions(+), 3 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 22ca85de6f94..5a371f6309c6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -89,7 +89,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}}): 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}}): ResponseEntity<{{>returnTypes}}> { 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 cb76cbcc7dda..5b45242c922b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache @@ -34,7 +34,7 @@ interface {{classname}}Delegate { * @see {{classname}}#{{operationId}} */ {{#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}}): {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}}{{^skipDefaultDelegateInterface}} { + {{/-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}}): {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}}{{^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 c41d8c4b9a05..4febff7a32d3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -102,7 +102,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}}): 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}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultApiInterface}} { {{^isDelegate}} return {{>returnValue}} {{/isDelegate}} From b4bf1570a02de9f0ac1e1dfbea10ae7d039fb304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 31 Oct 2025 16:09:43 +0100 Subject: [PATCH 02/23] add logic to enable additional property --- .../codegen/CodegenConstants.java | 3 + .../languages/KotlinSpringServerCodegen.java | 110 +++++++++++------- 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 022089190ee4..aa0ac4dc6aab 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -156,6 +156,9 @@ public class CodegenConstants { public static final String USE_DATETIME_OFFSET = "useDateTimeOffset"; public static final String USE_DATETIME_OFFSET_DESC = "Use DateTimeOffset to model date-time properties"; +// public static final String INCLUDE_HTTP_REQUEST_CONTEXT = "includeHttpRequestContext"; +// public static final String INCLUDE_HTTP_REQUEST_CONTEXT_DESC = "Include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods"; + public static final String USE_DATETIME_FOR_DATE = "useDateTimeForDate"; public static final String USE_DATETIME_FOR_DATE_DESC = "Use DateTime to model date properties even if DateOnly supported. (.net 6.0+ only)"; 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 821726610733..29c7c4d91a80 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 @@ -86,6 +86,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String BEAN_QUALIFIERS = "beanQualifiers"; public static final String USE_SPRING_BOOT3 = "useSpringBoot3"; + public static final String INCLUDE_HTTP_REQUEST_CONTEXT = "includeHttpRequestContext"; public static final String USE_FLOW_FOR_ARRAY_RETURN_TYPE = "useFlowForArrayReturnType"; public static final String REQUEST_MAPPING_OPTION = "requestMappingMode"; public static final String USE_REQUEST_MAPPING_ON_CONTROLLER = "useRequestMappingOnController"; @@ -107,36 +108,58 @@ public String getDescription() { } } - @Getter @Setter + @Getter + @Setter private String basePackage; - @Getter @Setter + @Getter + @Setter protected String configPackage; - @Getter @Setter + @Getter + @Setter private String invokerPackage; - @Getter @Setter + @Getter + @Setter private String serverPort = "8080"; private String title = "OpenAPI Kotlin Spring"; private boolean useBeanValidation = true; - @Setter private boolean skipDefaultInterface = false; - @Setter private boolean skipDefaultApiInterface = false; - @Setter private boolean skipDefaultDelegateInterface = false; - @Setter private boolean exceptionHandler = true; - @Setter private boolean gradleBuildFile = true; + @Setter + private boolean skipDefaultInterface = false; + @Setter + private boolean skipDefaultApiInterface = false; + @Setter + private boolean includeHttpRequestContext = false; + @Setter + private boolean skipDefaultDelegateInterface = false; + @Setter + private boolean exceptionHandler = true; + @Setter + private boolean gradleBuildFile = true; private boolean useSwaggerUI = true; - @Setter private boolean serviceInterface = false; - @Setter private boolean serviceImplementation = false; - @Getter @Setter + @Setter + private boolean serviceInterface = false; + @Setter + private boolean serviceImplementation = false; + @Getter + @Setter private boolean reactive = false; - @Getter @Setter + @Getter + @Setter private boolean useFlowForArrayReturnType = true; - @Setter private boolean interfaceOnly = false; - @Setter protected boolean useFeignClientUrl = true; - @Setter protected boolean useFeignClient = false; - @Setter private boolean delegatePattern = false; - @Setter protected boolean useTags = false; - @Setter private boolean beanQualifiers = false; - - @Getter @Setter + @Setter + private boolean interfaceOnly = false; + @Setter + protected boolean useFeignClientUrl = true; + @Setter + protected boolean useFeignClient = false; + @Setter + private boolean delegatePattern = false; + @Setter + protected boolean useTags = false; + @Setter + private boolean beanQualifiers = false; + + @Getter + @Setter protected boolean useSpringBoot3 = false; protected RequestMappingMode requestMappingMode = RequestMappingMode.controller; private DocumentationProvider documentationProvider; @@ -204,10 +227,10 @@ public KotlinSpringServerCodegen() { addSwitch(GRADLE_BUILD_FILE, "generate a gradle build file using the Kotlin DSL", gradleBuildFile); addSwitch(USE_SWAGGER_UI, "Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies", useSwaggerUI); addSwitch(SERVICE_INTERFACE, "generate service interfaces to go alongside controllers. In most " + - "cases this option would be used to update an existing project, so not to override implementations. " + - "Useful to help facilitate the generation gap pattern", serviceInterface); + "cases this option would be used to update an existing project, so not to override implementations. " + + "Useful to help facilitate the generation gap pattern", serviceInterface); addSwitch(SERVICE_IMPLEMENTATION, "generate stub service implementations that extends service " + - "interfaces. If this is set to true service interfaces will also be generated", serviceImplementation); + "interfaces. If this is set to true service interfaces will also be generated", serviceImplementation); addSwitch(USE_BEANVALIDATION, "Use BeanValidation API annotations to validate data types", useBeanValidation); addSwitch(SKIP_DEFAULT_INTERFACE, "Whether to skip generation of default implementations for interfaces (Api interfaces or Delegate interfaces depending on the delegatePattern option)", skipDefaultInterface); addSwitch(REACTIVE, "use coroutines for reactive behavior", reactive); @@ -220,6 +243,7 @@ public KotlinSpringServerCodegen() { " (contexts) added to single project.", beanQualifiers); 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); supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application."); supportedLibraries.put(SPRING_CLOUD_LIBRARY, "Spring-Cloud-Feign client with Spring-Boot auto-configured settings."); @@ -307,7 +331,7 @@ public List supportedAnnotationLibraries() { */ private boolean selectedDocumentationProviderRequiresSwaggerUiBootstrap() { return getDocumentationProvider().equals(DocumentationProvider.SPRINGFOX) || - getDocumentationProvider().equals(DocumentationProvider.SOURCE); + getDocumentationProvider().equals(DocumentationProvider.SOURCE); } public boolean getExceptionHandler() { @@ -435,7 +459,7 @@ public void processOpts() { // Set basePackage from invokerPackage if (!additionalProperties.containsKey(BASE_PACKAGE) - && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { + && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { this.setBasePackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); additionalProperties.put(BASE_PACKAGE, basePackage); @@ -564,6 +588,9 @@ public void processOpts() { if (additionalProperties.containsKey(USE_SPRING_BOOT3)) { this.setUseSpringBoot3(convertPropertyToBoolean(USE_SPRING_BOOT3)); } + if (additionalProperties.containsKey(INCLUDE_HTTP_REQUEST_CONTEXT)) { + this.setIncludeHttpRequestContext(convertPropertyToBoolean(INCLUDE_HTTP_REQUEST_CONTEXT)); + } if (isUseSpringBoot3()) { if (DocumentationProvider.SPRINGFOX.equals(getDocumentationProvider())) { throw new IllegalArgumentException(DocumentationProvider.SPRINGFOX.getPropertyName() + " is not supported with Spring Boot > 3.x"); @@ -605,7 +632,6 @@ public void processOpts() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - if (this.exceptionHandler && !library.equals(SPRING_CLOUD_LIBRARY)) { supportingFiles.add(new SupportingFile("exceptions.mustache", sanitizeDirectory(sourceFolder + File.separator + apiPackage), "Exceptions.kt")); @@ -713,16 +739,16 @@ public void processOpts() { } switch (getRequestMappingMode()) { - case api_interface: - additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, true); - break; - case controller: - additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, true); - break; - case none: - additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, false); - additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, false); - break; + case api_interface: + additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, true); + break; + case controller: + additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, true); + break; + case none: + additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, false); + additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, false); + break; } // spring uses the jackson lib, and we disallow configuration. @@ -772,7 +798,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { if (SPRING_BOOT.equals(library) && ModelUtils.containsEnums(this.openAPI)) { supportingFiles.add(new SupportingFile("converter.mustache", - (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "EnumConverterConfiguration.kt")); + (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "EnumConverterConfiguration.kt")); } if (!additionalProperties.containsKey(TITLE)) { @@ -924,9 +950,9 @@ public void setReturnContainer(final String returnContainer) { operation.returnContainer = returnContainer; } }); -// if(implicitHeaders){ -// removeHeadersFromAllParams(operation.allParams); -// } + // if(implicitHeaders){ + // removeHeadersFromAllParams(operation.allParams); + // } }); } @@ -939,7 +965,6 @@ public Map postProcessSupportingFileData(Map obj return objs; } - private String getNonMutableContainerTypeIfNeeded(String type) { if (type != null && type.contains("kotlin.collections.Mutable")) { return type.replaceAll("kotlin\\.collections\\.Mutable", "kotlin.collections."); @@ -953,6 +978,7 @@ private static String sanitizeDirectory(String in) { // TODO could probably be made more generic, and moved to the `mustache` package if required by other components. private static class EscapeLambda implements Mustache.Lambda { + private final String from; private final String to; From cb9bc1e28747007dcefdd86e391a01116ed10ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 31 Oct 2025 16:32:47 +0100 Subject: [PATCH 03/23] regenerate files --- .../kotlin-spring-boot-x-kotlin-implements.yaml | 13 +++++++------ .../main/kotlin/org/openapitools/api/PetApi.kt | 16 ++++++++-------- .../main/kotlin/org/openapitools/api/StoreApi.kt | 8 ++++---- .../main/kotlin/org/openapitools/api/UserApi.kt | 16 ++++++++-------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml index c4068770d55d..4ef449d5e667 100644 --- a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -6,9 +6,10 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: documentationProvider: none annotationLibrary: none - useSwaggerUI: "false" - serviceImplementation: "false" - skipDefaultInterface: "true" - interfaceOnly: "true" - serializableModel: "true" - beanValidations: "true" + useSwaggerUI: false + serviceImplementation: false + skipDefaultInterface: true + interfaceOnly: true + serializableModel: true + beanValidations: true + includeHttpRequestContext: true 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 e83175693b7c..ae87b0da2e0f 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 @@ -39,14 +39,14 @@ interface PetApi { value = ["/pet"], consumes = ["application/json"] ) - fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity + fun addPet( @Valid @RequestBody pet: Pet, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( 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?, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -54,7 +54,7 @@ interface PetApi { value = ["/pet/findByStatus"], produces = ["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, request: javax.servlet.http.HttpServletRequest): ResponseEntity> @RequestMapping( @@ -62,7 +62,7 @@ interface PetApi { value = ["/pet/findByTags"], produces = ["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, request: javax.servlet.http.HttpServletRequest): ResponseEntity> @RequestMapping( @@ -70,7 +70,7 @@ interface PetApi { value = ["/pet/{petId}"], produces = ["application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity + fun getPetById( @PathVariable("petId") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -78,7 +78,7 @@ interface PetApi { value = ["/pet"], consumes = ["application/json"] ) - fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity + fun updatePet( @Valid @RequestBody pet: Pet, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -86,7 +86,7 @@ interface PetApi { 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? , request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -95,5 +95,5 @@ interface PetApi { 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, 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 a0c2538d1ae9..5c00536ff4fa 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 @@ -37,7 +37,7 @@ interface StoreApi { method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity + fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -45,7 +45,7 @@ interface StoreApi { value = ["/store/inventory"], produces = ["application/json"] ) - fun getInventory(): ResponseEntity> + fun getInventory(request: javax.servlet.http.HttpServletRequest): ResponseEntity> @RequestMapping( @@ -53,7 +53,7 @@ interface StoreApi { value = ["/store/order/{orderId}"], produces = ["application/json"] ) - fun getOrderById(@Min(value=1) @Max(value=5) @PathVariable("orderId") orderId: kotlin.Int): ResponseEntity + fun getOrderById(@Min(value=1) @Max(value=5) @PathVariable("orderId") orderId: kotlin.Int, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -62,5 +62,5 @@ interface StoreApi { produces = ["application/json"], consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity + fun placeOrder( @Valid @RequestBody order: Order, 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 89daa4814147..c1b618ac9d37 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 @@ -38,7 +38,7 @@ interface UserApi { value = ["/user"], consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody user: User): ResponseEntity + fun createUser( @Valid @RequestBody user: User, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -46,7 +46,7 @@ interface UserApi { value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity + fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -54,14 +54,14 @@ interface UserApi { value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity + fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity + fun deleteUser( @PathVariable("username") username: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -69,7 +69,7 @@ interface UserApi { value = ["/user/{username}"], produces = ["application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity + fun getUserByName( @PathVariable("username") username: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -77,14 +77,14 @@ interface UserApi { value = ["/user/login"], produces = ["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, request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( method = [RequestMethod.GET], value = ["/user/logout"] ) - fun logoutUser(): ResponseEntity + fun logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity @RequestMapping( @@ -92,5 +92,5 @@ interface UserApi { 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, request: javax.servlet.http.HttpServletRequest): ResponseEntity } From ea6a7ffff67d8f916e2c962e885b5dfaf1cc0d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 31 Oct 2025 16:36:38 +0100 Subject: [PATCH 04/23] regenerate documentation --- docs/generators/kotlin-spring.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index e79fdd782b70..3bf00ed266e8 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -33,6 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true| |gradleBuildFile|generate a gradle build file using the Kotlin DSL| |true| |groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools| +|includeHttpRequestContext|Whether to include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods.| |false| |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false| |library|library template (sub-template)|
**spring-boot**
Spring-boot Server application.
**spring-cloud**
Spring-Cloud-Feign client with Spring-Boot auto-configured settings.
|spring-boot| |modelMutable|Create mutable models| |false| From bddfc01e629030d696305247b36e8de9ec6edf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 31 Oct 2025 16:42:50 +0100 Subject: [PATCH 05/23] revert unrelated formatting changes --- .../languages/KotlinSpringServerCodegen.java | 106 +++++++----------- 1 file changed, 43 insertions(+), 63 deletions(-) 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 29c7c4d91a80..8a4752f8d1ed 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 @@ -108,58 +108,37 @@ public String getDescription() { } } - @Getter - @Setter + @Getter @Setter private String basePackage; - @Getter - @Setter + @Getter @Setter protected String configPackage; - @Getter - @Setter + @Getter @Setter private String invokerPackage; - @Getter - @Setter + @Getter @Setter private String serverPort = "8080"; private String title = "OpenAPI Kotlin Spring"; private boolean useBeanValidation = true; - @Setter - private boolean skipDefaultInterface = false; - @Setter - private boolean skipDefaultApiInterface = false; - @Setter - private boolean includeHttpRequestContext = false; - @Setter - private boolean skipDefaultDelegateInterface = false; - @Setter - private boolean exceptionHandler = true; - @Setter - private boolean gradleBuildFile = true; + @Setter private boolean skipDefaultInterface = false; + @Setter private boolean skipDefaultApiInterface = false; + @Setter private boolean skipDefaultDelegateInterface = false; + @Setter private boolean exceptionHandler = true; + @Setter private boolean gradleBuildFile = true; private boolean useSwaggerUI = true; - @Setter - private boolean serviceInterface = false; - @Setter - private boolean serviceImplementation = false; - @Getter - @Setter + @Setter private boolean serviceInterface = false; + @Setter private boolean serviceImplementation = false; + @Getter @Setter private boolean reactive = false; - @Getter - @Setter + @Setter private boolean includeHttpRequestContext = false; + @Getter @Setter private boolean useFlowForArrayReturnType = true; - @Setter - private boolean interfaceOnly = false; - @Setter - protected boolean useFeignClientUrl = true; - @Setter - protected boolean useFeignClient = false; - @Setter - private boolean delegatePattern = false; - @Setter - protected boolean useTags = false; - @Setter - private boolean beanQualifiers = false; - - @Getter - @Setter + @Setter private boolean interfaceOnly = false; + @Setter protected boolean useFeignClientUrl = true; + @Setter protected boolean useFeignClient = false; + @Setter private boolean delegatePattern = false; + @Setter protected boolean useTags = false; + @Setter private boolean beanQualifiers = false; + + @Getter @Setter protected boolean useSpringBoot3 = false; protected RequestMappingMode requestMappingMode = RequestMappingMode.controller; private DocumentationProvider documentationProvider; @@ -227,10 +206,10 @@ public KotlinSpringServerCodegen() { addSwitch(GRADLE_BUILD_FILE, "generate a gradle build file using the Kotlin DSL", gradleBuildFile); addSwitch(USE_SWAGGER_UI, "Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies", useSwaggerUI); addSwitch(SERVICE_INTERFACE, "generate service interfaces to go alongside controllers. In most " + - "cases this option would be used to update an existing project, so not to override implementations. " + - "Useful to help facilitate the generation gap pattern", serviceInterface); + "cases this option would be used to update an existing project, so not to override implementations. " + + "Useful to help facilitate the generation gap pattern", serviceInterface); addSwitch(SERVICE_IMPLEMENTATION, "generate stub service implementations that extends service " + - "interfaces. If this is set to true service interfaces will also be generated", serviceImplementation); + "interfaces. If this is set to true service interfaces will also be generated", serviceImplementation); addSwitch(USE_BEANVALIDATION, "Use BeanValidation API annotations to validate data types", useBeanValidation); addSwitch(SKIP_DEFAULT_INTERFACE, "Whether to skip generation of default implementations for interfaces (Api interfaces or Delegate interfaces depending on the delegatePattern option)", skipDefaultInterface); addSwitch(REACTIVE, "use coroutines for reactive behavior", reactive); @@ -331,7 +310,7 @@ public List supportedAnnotationLibraries() { */ private boolean selectedDocumentationProviderRequiresSwaggerUiBootstrap() { return getDocumentationProvider().equals(DocumentationProvider.SPRINGFOX) || - getDocumentationProvider().equals(DocumentationProvider.SOURCE); + getDocumentationProvider().equals(DocumentationProvider.SOURCE); } public boolean getExceptionHandler() { @@ -459,7 +438,7 @@ public void processOpts() { // Set basePackage from invokerPackage if (!additionalProperties.containsKey(BASE_PACKAGE) - && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { + && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { this.setBasePackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); additionalProperties.put(BASE_PACKAGE, basePackage); @@ -632,6 +611,7 @@ public void processOpts() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + if (this.exceptionHandler && !library.equals(SPRING_CLOUD_LIBRARY)) { supportingFiles.add(new SupportingFile("exceptions.mustache", sanitizeDirectory(sourceFolder + File.separator + apiPackage), "Exceptions.kt")); @@ -739,16 +719,16 @@ public void processOpts() { } switch (getRequestMappingMode()) { - case api_interface: - additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, true); - break; - case controller: - additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, true); - break; - case none: - additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, false); - additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, false); - break; + case api_interface: + additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, true); + break; + case controller: + additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, true); + break; + case none: + additionalProperties.put(USE_REQUEST_MAPPING_ON_INTERFACE, false); + additionalProperties.put(USE_REQUEST_MAPPING_ON_CONTROLLER, false); + break; } // spring uses the jackson lib, and we disallow configuration. @@ -798,7 +778,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) { if (SPRING_BOOT.equals(library) && ModelUtils.containsEnums(this.openAPI)) { supportingFiles.add(new SupportingFile("converter.mustache", - (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "EnumConverterConfiguration.kt")); + (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "EnumConverterConfiguration.kt")); } if (!additionalProperties.containsKey(TITLE)) { @@ -950,9 +930,9 @@ public void setReturnContainer(final String returnContainer) { operation.returnContainer = returnContainer; } }); - // if(implicitHeaders){ - // removeHeadersFromAllParams(operation.allParams); - // } +// if(implicitHeaders){ +// removeHeadersFromAllParams(operation.allParams); +// } }); } @@ -965,6 +945,7 @@ public Map postProcessSupportingFileData(Map obj return objs; } + private String getNonMutableContainerTypeIfNeeded(String type) { if (type != null && type.contains("kotlin.collections.Mutable")) { return type.replaceAll("kotlin\\.collections\\.Mutable", "kotlin.collections."); @@ -978,7 +959,6 @@ private static String sanitizeDirectory(String in) { // TODO could probably be made more generic, and moved to the `mustache` package if required by other components. private static class EscapeLambda implements Mustache.Lambda { - private final String from; private final String to; From 6dbaaaa085fc2cc3ebb422b25a8ce0f26c4220bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 31 Oct 2025 16:43:40 +0100 Subject: [PATCH 06/23] revert commented out code --- .../main/java/org/openapitools/codegen/CodegenConstants.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index aa0ac4dc6aab..022089190ee4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -156,9 +156,6 @@ public class CodegenConstants { public static final String USE_DATETIME_OFFSET = "useDateTimeOffset"; public static final String USE_DATETIME_OFFSET_DESC = "Use DateTimeOffset to model date-time properties"; -// public static final String INCLUDE_HTTP_REQUEST_CONTEXT = "includeHttpRequestContext"; -// public static final String INCLUDE_HTTP_REQUEST_CONTEXT_DESC = "Include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods"; - public static final String USE_DATETIME_FOR_DATE = "useDateTimeForDate"; public static final String USE_DATETIME_FOR_DATE_DESC = "Use DateTime to model date properties even if DateOnly supported. (.net 6.0+ only)"; From 58ae50473e0b02e6b9dcfb2f9bdb0bf892eca333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sat, 1 Nov 2025 21:30:48 +0100 Subject: [PATCH 07/23] add tests --- .../spring/KotlinSpringServerCodegenTest.java | 320 ++++++++++++++++++ 1 file changed, 320 insertions(+) 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 4835aa65e8ec..c48fb50f1b06 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 @@ -1027,6 +1027,326 @@ public void generateSerializableModelWithXimplements() throws Exception { ); } + @Test + public void generateApiWithHttpRequestContextReactiveAnnotationSwagger2() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "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" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" + ); + } + + @Test + public void generateApiWithHttpRequestContextReactiveAnnotationSwagger1() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "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" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" + ); + } + + @Test + public void generateApiWithHttpRequestContextReactiveAnnotationNone() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "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" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" + ); + } + + @Test + public void generateApiWithoutHttpRequestContextReactiveAnnotationNone() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", + "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(): ResponseEntity" + ); + } + + @Test + public void generateApiWithHttpRequestContextNonReactiveAnnotationSwagger2() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "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" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity" + ); + } + + @Test + public void generateApiWithHttpRequestContextNonReactiveAnnotationSwagger1() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "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" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity" + ); + } + + @Test + public void generateApiWithHttpRequestContextNonReactiveAnnotationNone() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "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" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity" + ); + } + + @Test + public void generateApiWithoutHttpRequestContextNonReactiveAnnotationNone() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); + codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains( + petControllerPath, + "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", + "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" + ); + + Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains( + userControllerPath, + "logoutUser(): ResponseEntity" + ); + } + @Test public void generateNonSerializableModelWithXimplements() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); From b9336785058350e10c107c62a3b8338bb3812ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sat, 1 Nov 2025 21:44:23 +0100 Subject: [PATCH 08/23] refactor test to DRY them a bit --- .../spring/KotlinSpringServerCodegenTest.java | 389 ++++++------------ 1 file changed, 117 insertions(+), 272 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 c48fb50f1b06..a582cdd10075 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 @@ -1027,24 +1027,28 @@ public void generateSerializableModelWithXimplements() throws Exception { ); } - @Test - public void generateApiWithHttpRequestContextReactiveAnnotationSwagger2() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); + + private Path generateApiSources( + boolean includeHttpRequestContext, + boolean reactive, + String annotationLibrary + ) throws Exception { + File outputDir = Files.createTempDirectory("test").toFile().getCanonicalFile(); + outputDir.deleteOnExit(); + String outputPath = outputDir.getAbsolutePath().replace('\\', '/'); KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2"); + codegen.setOutputDir(outputDir.getAbsolutePath()); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, includeHttpRequestContext); + codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, reactive); + codegen.additionalProperties().put("documentationProvider", "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, annotationLibrary); ClientOptInput input = new ClientOptInput() .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); + DefaultGenerator generator = new DefaultGenerator(); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -1053,297 +1057,138 @@ public void generateApiWithHttpRequestContextReactiveAnnotationSwagger2() throws generator.opts(input).generate(); - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "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" - ); - - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" - ); + return Paths.get(outputPath); } - @Test - public void generateApiWithHttpRequestContextReactiveAnnotationSwagger1() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "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" - ); + private void verifyGeneratedControllersContain( + Path projectRoot, + String[] expectedPetControllerSnippets, + String[] expectedUserControllerSnippets + ) { + Path petController = projectRoot.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"); + assertFileContains(petController, expectedPetControllerSnippets); - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" - ); + Path userController = projectRoot.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"); + assertFileContains(userController, expectedUserControllerSnippets); } @Test - public void generateApiWithHttpRequestContextReactiveAnnotationNone() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "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" - ); - - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" + public void reactiveWithHttpRequestContextSwagger2() throws Exception { + Path root = generateApiSources(true, true, "swagger2"); + verifyGeneratedControllersContain( + root, + new String[]{ + "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", + "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + }, + new String[]{ + "logoutUser(@Parameter(hidden = true)" + } ); } @Test - public void generateApiWithoutHttpRequestContextReactiveAnnotationNone() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, true); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" - ); - - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(): ResponseEntity" + public void reactiveWithHttpRequestContextSwagger1() throws Exception { + Path root = generateApiSources(true, true, "swagger1"); + verifyGeneratedControllersContain( + root, + new String[]{ + "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", + "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + }, + new String[]{ + "logoutUser(@ApiParam(hidden = true)" + } ); } @Test - public void generateApiWithHttpRequestContextNonReactiveAnnotationSwagger2() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "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" - ); - - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity" + public void reactiveWithHttpRequestContextNone() throws Exception { + Path root = generateApiSources(true, true, "none"); + verifyGeneratedControllersContain( + root, + new String[]{ + "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" + }, + new String[]{ + "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" + } ); } @Test - public void generateApiWithHttpRequestContextNonReactiveAnnotationSwagger1() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "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" - ); - - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity" + public void reactiveWithoutHttpRequestContextNone() throws Exception { + Path root = generateApiSources(false, true, "none"); + verifyGeneratedControllersContain( + root, + new String[]{ + "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", + "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" + }, + new String[]{ + "logoutUser(): ResponseEntity" + } ); } @Test - public void generateApiWithHttpRequestContextNonReactiveAnnotationNone() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "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" + public void nonReactiveWithHttpRequestContextSwagger2() throws Exception { + Path root = generateApiSources(true, false, "swagger2"); + verifyGeneratedControllersContain( + root, + new String[]{ + "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", + "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + }, + new String[]{ + "logoutUser(@Parameter(hidden = true)" + } ); + } - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity" + @Test + public void nonReactiveWithHttpRequestContextSwagger1() throws Exception { + Path root = generateApiSources(true, false, "swagger1"); + verifyGeneratedControllersContain( + root, + new String[]{ + "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", + "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," + }, + new String[]{ + "logoutUser(@ApiParam(hidden = true)" + } ); } @Test - public void generateApiWithoutHttpRequestContextNonReactiveAnnotationNone() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, false); - codegen.additionalProperties().put(DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none"); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path petControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains( - petControllerPath, - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" + public void nonReactiveWithHttpRequestContextNone() throws Exception { + Path root = generateApiSources(true, false, "none"); + verifyGeneratedControllersContain( + root, + new String[]{ + "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" + }, + new String[]{ + "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity" + } ); + } - Path userControllerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains( - userControllerPath, - "logoutUser(): ResponseEntity" + @Test + public void nonReactiveWithoutHttpRequestContextNone() throws Exception { + Path root = generateApiSources(false, false, "none"); + verifyGeneratedControllersContain( + root, + new String[]{ + "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", + "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" + }, + new String[]{ + "logoutUser(): ResponseEntity" + } ); } From 83460cfeccae19bb5f25d1159183525542290422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sat, 1 Nov 2025 21:45:29 +0100 Subject: [PATCH 09/23] move tests around --- .../spring/KotlinSpringServerCodegenTest.java | 73 +++++++++---------- 1 file changed, 36 insertions(+), 37 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 a582cdd10075..3648a5afcb03 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 @@ -1027,6 +1027,42 @@ public void generateSerializableModelWithXimplements() throws Exception { ); } + @Test + public void generateNonSerializableModelWithXimplements() throws Exception { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml")) + .config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + generator.opts(input).generate(); + + Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Dog.kt"); + assertFileContains( + path, + "@get:JsonProperty(\"likesFetch\", required = true) override val likesFetch: kotlin.Boolean,", + ") : Pet, com.some.pack.Fetchable {" + ); + assertFileNotContains( + path, + "import java.io.Serializable", + ") : Pet, Serializable, com.some.pack.Fetchable {", + ") : Pet, Serializable {", + "private const val serialVersionUID: kotlin.Long = 1" + ); + } private Path generateApiSources( boolean includeHttpRequestContext, @@ -1192,43 +1228,6 @@ public void nonReactiveWithoutHttpRequestContextNone() throws Exception { ); } - @Test - public void generateNonSerializableModelWithXimplements() throws Exception { - File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); - output.deleteOnExit(); - String outputPath = output.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(output.getAbsolutePath()); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml")) - .config(codegen); - DefaultGenerator generator = new DefaultGenerator(); - - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Dog.kt"); - assertFileContains( - path, - "@get:JsonProperty(\"likesFetch\", required = true) override val likesFetch: kotlin.Boolean,", - ") : Pet, com.some.pack.Fetchable {" - ); - assertFileNotContains( - path, - "import java.io.Serializable", - ") : Pet, Serializable, com.some.pack.Fetchable {", - ") : Pet, Serializable {", - "private const val serialVersionUID: kotlin.Long = 1" - ); - } - @Test public void reactiveWithoutFlow() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); From d9e655b6568707708cde600fa101c514ebd1e504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 16:52:49 +0100 Subject: [PATCH 10/23] increase tests coverage --- .../org/openapitools/codegen/TestUtils.java | 2 +- .../spring/KotlinSpringServerCodegenTest.java | 297 ++++++++++++------ 2 files changed, 200 insertions(+), 99 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java index 9f11b2fce037..b0b0396a2ab9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java @@ -173,7 +173,7 @@ public static void assertFileContains(Path path, String... lines) { String file = linearize(generatedFile); assertNotNull(file); for (String line : lines) - assertTrue(file.contains(linearize(line)), "File does not contain line [" + line + "]"); + assertTrue(file.contains(linearize(line)), "File '" + path + "' does not contain line [" + line + "]"); } catch (IOException e) { fail("Unable to evaluate file " + path); } 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 3648a5afcb03..93450dc68ad9 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 @@ -1067,6 +1067,7 @@ public void generateNonSerializableModelWithXimplements() throws Exception { private Path generateApiSources( boolean includeHttpRequestContext, boolean reactive, + boolean interfaceOnly, String annotationLibrary ) throws Exception { File outputDir = Files.createTempDirectory("test").toFile().getCanonicalFile(); @@ -1077,8 +1078,9 @@ private Path generateApiSources( codegen.setOutputDir(outputDir.getAbsolutePath()); codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, includeHttpRequestContext); codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, reactive); - codegen.additionalProperties().put("documentationProvider", "none"); + codegen.additionalProperties().put(KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none"); codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, annotationLibrary); + codegen.additionalProperties().put(KotlinSpringServerCodegen.INTERFACE_ONLY, interfaceOnly); ClientOptInput input = new ClientOptInput() .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) @@ -1096,135 +1098,234 @@ private Path generateApiSources( return Paths.get(outputPath); } - private void verifyGeneratedControllersContain( - Path projectRoot, - String[] expectedPetControllerSnippets, - String[] expectedUserControllerSnippets - ) { - Path petController = projectRoot.resolve("src/main/kotlin/org/openapitools/api/PetApiController.kt"); - assertFileContains(petController, expectedPetControllerSnippets); + private void verifyGeneratedFilesContain(Map> expectedSnippetsByPathsToFiles) { + for (var expectedSnippetsByPathToFile : expectedSnippetsByPathsToFiles.entrySet()) { + assertFileContains(expectedSnippetsByPathToFile.getKey(), expectedSnippetsByPathToFile.getValue().toArray(new String[0])); + } - Path userController = projectRoot.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"); - assertFileContains(userController, expectedUserControllerSnippets); } @Test - public void reactiveWithHttpRequestContextSwagger2() throws Exception { - Path root = generateApiSources(true, true, "swagger2"); - verifyGeneratedControllersContain( - root, - new String[]{ - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," - }, - new String[]{ - "logoutUser(@Parameter(hidden = true)" - } + public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception { + Path root = generateApiSources(true, true, false, "swagger2"); + 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,", + "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(@Parameter(hidden = true)") + ) ); } @Test - public void reactiveWithHttpRequestContextSwagger1() throws Exception { - Path root = generateApiSources(true, true, "swagger1"); - verifyGeneratedControllersContain( - root, - new String[]{ - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," - }, - new String[]{ - "logoutUser(@ApiParam(hidden = true)" - } + public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception { + Path root = generateApiSources(true, true, false, "swagger1"); + 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,", + "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(@ApiParam(hidden = true)") + ) ); } @Test - public void reactiveWithHttpRequestContextNone() throws Exception { - Path root = generateApiSources(true, true, "none"); - verifyGeneratedControllersContain( - root, - new String[]{ - "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" - }, - new String[]{ - "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity" - } + public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception { + Path root = generateApiSources(true, true, false, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") + ) ); } @Test - public void reactiveWithoutHttpRequestContextNone() throws Exception { - Path root = generateApiSources(false, true, "none"); - verifyGeneratedControllersContain( - root, - new String[]{ - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" - }, - new String[]{ - "logoutUser(): ResponseEntity" - } + public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception { + Path root = generateApiSources(false, true, false, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(): ResponseEntity") + ) ); } @Test - public void nonReactiveWithHttpRequestContextSwagger2() throws Exception { - Path root = generateApiSources(true, false, "swagger2"); - verifyGeneratedControllersContain( - root, - new String[]{ - "deletePet(@Parameter(description = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," - }, - new String[]{ - "logoutUser(@Parameter(hidden = true)" - } + public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception { + Path root = generateApiSources(true, false, false, "swagger2"); + 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,", + "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(@Parameter(hidden = true)") + ) ); } @Test - public void nonReactiveWithHttpRequestContextSwagger1() throws Exception { - Path root = generateApiSources(true, false, "swagger1"); - verifyGeneratedControllersContain( - root, - new String[]{ - "deletePet(@ApiParam(value = \"Pet id to delete\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long," - }, - new String[]{ - "logoutUser(@ApiParam(hidden = true)" - } + public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception { + Path root = generateApiSources(true, false, false, "swagger1"); + 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,", + "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(@ApiParam(hidden = true)") + ) ); } @Test - public void nonReactiveWithHttpRequestContextNone() throws Exception { - Path root = generateApiSources(true, false, "none"); - verifyGeneratedControllersContain( - root, - new String[]{ - "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" - }, - new String[]{ - "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity" - } + public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception { + Path root = generateApiSources(true, false, false, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity") + ) + ); + } + + @Test + public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception { + Path root = generateApiSources(false, false, false, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiController.kt"), List.of( + "logoutUser(): ResponseEntity") + ) ); } @Test - public void nonReactiveWithoutHttpRequestContextNone() throws Exception { - Path root = generateApiSources(false, false, "none"); - verifyGeneratedControllersContain( - root, - new String[]{ - "deletePet( @PathVariable(\"petId\") petId: kotlin.Long, @RequestHeader(value = \"api_key\", required = false) apiKey: kotlin.String?): ResponseEntity", - "getPetById( @PathVariable(\"petId\") petId: kotlin.Long): ResponseEntity" - }, - new String[]{ - "logoutUser(): ResponseEntity" - } + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception { + Path root = generateApiSources(true, true, true, "swagger2"); + 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,", + "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(@Parameter(hidden = true)") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception { + Path root = generateApiSources(true, true, true, "swagger1"); + 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,", + "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(@ApiParam(hidden = true)") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + Path root = generateApiSources(true, true, true, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") + ) + ); + } + + @Test + public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + Path root = generateApiSources(false, true, true, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(): ResponseEntity") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception { + Path root = generateApiSources(true, false, true, "swagger2"); + 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,", + "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(@Parameter(hidden = true)") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception { + Path root = generateApiSources(true, false, true, "swagger1"); + 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,", + "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(@ApiParam(hidden = true)") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + Path root = generateApiSources(true, false, true, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity") + ) + ); + } + + @Test + public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + Path root = generateApiSources(false, false, true, "none"); + 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"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApi.kt"), List.of( + "logoutUser(): ResponseEntity") + ) ); } From e2675bcb03b336a0ed83b5968f4c9bb3a83dd724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 20:15:35 +0100 Subject: [PATCH 11/23] fix for delegate --- .../src/main/resources/kotlin-spring/apiInterface.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4febff7a32d3..386a41479b5b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -107,7 +107,7 @@ interface {{classname}} { return {{>returnValue}} {{/isDelegate}} {{#isDelegate}} - return getDelegate().{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) + return getDelegate().{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}{{#includeHttpRequestContext}}{{#hasParams}}, {{/hasParams}}{{#reactive}}exchange{{/reactive}}{{^reactive}}request{{/reactive}}{{/includeHttpRequestContext}}) {{/isDelegate}} }{{/skipDefaultApiInterface}} {{/operation}} From e6d81a3ea5b341c6445c67b0c03b03dc6511df0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 21:41:41 +0100 Subject: [PATCH 12/23] fix for delegate - and refactor tests --- .../spring/KotlinSpringServerCodegenTest.java | 418 ++++++++++++++---- 1 file changed, 325 insertions(+), 93 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 93450dc68ad9..3b44a53bc88b 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 @@ -6,9 +6,6 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.core.models.ParseOptions; -import java.util.HashMap; -import java.util.function.Consumer; -import java.util.stream.Stream; import org.apache.commons.io.FileUtils; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; @@ -34,10 +31,13 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; import static org.openapitools.codegen.TestUtils.assertFileContains; @@ -372,7 +372,6 @@ public void delegateReactiveWithTags() throws Exception { "ApiUtil"); } - @Test public void testNullableMultipartFile() throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); @@ -440,7 +439,6 @@ public void arrayItemsCanBeNullable() throws IOException { assertFileContains(Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/ArrayWithNullableItemsModel.kt"), "List"); } - @Test public void doNotGenerateRequestParamForObjectQueryParam() throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); @@ -693,12 +691,12 @@ private static void testMultiLineOperationDescription(final boolean isInterfaceO Paths.get( outputPath + "/src/main/kotlin/org/openapitools/api/" + pingApiFileName), "description = \"\"\"# Multi-line descriptions\n" - + "\n" - + "This is an example of a multi-line description.\n" - + "\n" - + "It:\n" - + "- has multiple lines\n" - + "- uses Markdown (CommonMark) for rich text representation\"\"\"" + + "\n" + + "This is an example of a multi-line description.\n" + + "\n" + + "It:\n" + + "- has multiple lines\n" + + "- uses Markdown (CommonMark) for rich text representation\"\"\"" ); } @@ -817,10 +815,10 @@ public void contractWithEnumContainsEnumConverter() throws IOException { @Test public void contractWithResolvedInnerEnumContainsEnumConverter() throws IOException { Map files = generateFromContract( - "src/test/resources/3_0/inner_enum.yaml", - new HashMap<>(), - new HashMap<>(), - configurator -> configurator.addInlineSchemaOption("RESOLVE_INLINE_ENUMS", "true") + "src/test/resources/3_0/inner_enum.yaml", + new HashMap<>(), + new HashMap<>(), + configurator -> configurator.addInlineSchemaOption("RESOLVE_INLINE_ENUMS", "true") ); File enumConverterFile = files.get("EnumConverterConfiguration.kt"); @@ -864,7 +862,6 @@ public void givenMultipartFormArray_whenGenerateDelegateAndService_thenParameter Path controllerFile = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApi.kt"); assertFileContains(controllerFile, "images: Array"); - Path serviceFile = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/api/PetApiService.kt"); assertFileContains(serviceFile, "images: Array"); } @@ -994,6 +991,7 @@ public void generateSerializableModel() throws Exception { "private const val serialVersionUID: kotlin.Long = 1" ); } + @Test public void generateSerializableModelWithXimplements() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); @@ -1081,6 +1079,7 @@ private Path generateApiSources( codegen.additionalProperties().put(KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none"); codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, annotationLibrary); codegen.additionalProperties().put(KotlinSpringServerCodegen.INTERFACE_ONLY, interfaceOnly); + codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true); ClientOptInput input = new ClientOptInput() .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) @@ -1098,6 +1097,31 @@ private Path generateApiSources( return Paths.get(outputPath); } + private Path generateApiSources2( + Map additionalProperties, + Map generatorPropertyDefaults + ) throws Exception { + File outputDir = Files.createTempDirectory("test").toFile().getCanonicalFile(); + outputDir.deleteOnExit(); + String outputPath = outputDir.getAbsolutePath().replace('\\', '/'); + + KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); + codegen.setOutputDir(outputDir.getAbsolutePath()); + codegen.additionalProperties().putAll(additionalProperties); + + ClientOptInput input = new ClientOptInput() + .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) + .config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + for (var entry : generatorPropertyDefaults.entrySet()) { + generator.setGeneratorPropertyDefault(entry.getKey(), entry.getValue()); + } + generator.opts(input).generate(); + + return Paths.get(outputPath); + } + private void verifyGeneratedFilesContain(Map> expectedSnippetsByPathsToFiles) { for (var expectedSnippetsByPathToFile : expectedSnippetsByPathsToFiles.entrySet()) { assertFileContains(expectedSnippetsByPathToFile.getKey(), expectedSnippetsByPathToFile.getValue().toArray(new String[0])); @@ -1107,7 +1131,20 @@ private void verifyGeneratedFilesContain(Map> expectedSnippet @Test public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception { - Path root = generateApiSources(true, true, false, "swagger2"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1121,7 +1158,20 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() thro @Test public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception { - Path root = generateApiSources(true, true, false, "swagger1"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1135,7 +1185,20 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() thr @Test public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception { - Path root = generateApiSources(true, true, false, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1149,7 +1212,20 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws @Test public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception { - Path root = generateApiSources(false, true, false, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1163,7 +1239,20 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() thro @Test public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception { - Path root = generateApiSources(true, false, false, "swagger2"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1177,7 +1266,20 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() t @Test public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception { - Path root = generateApiSources(true, false, false, "swagger1"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1191,7 +1293,20 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1() @Test public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception { - Path root = generateApiSources(true, false, false, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1205,7 +1320,20 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() thro @Test public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception { - Path root = generateApiSources(false, false, false, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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/PetApiController.kt"), List.of( @@ -1219,7 +1347,20 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() t @Test public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception { - Path root = generateApiSources(true, true, true, "swagger2"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1233,7 +1374,20 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throw @Test public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception { - Path root = generateApiSources(true, true, true, "swagger1"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1247,7 +1401,20 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() thro @Test public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { - Path root = generateApiSources(true, true, true, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1261,7 +1428,20 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws E @Test public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { - Path root = generateApiSources(false, true, true, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1275,7 +1455,20 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throw @Test public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception { - Path root = generateApiSources(true, false, true, "swagger2"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1289,7 +1482,20 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() th @Test public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception { - Path root = generateApiSources(true, false, true, "swagger1"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1303,7 +1509,20 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() t @Test public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { - Path root = generateApiSources(true, false, true, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1317,7 +1536,20 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throw @Test public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { - Path root = generateApiSources(false, false, true, "none"); + Path root = generateApiSources2(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( @@ -1611,43 +1843,43 @@ public void testValidationsInQueryParams_issue21238_Api_Delegate() throws IOExce @DataProvider public Object[][] issue17997DocumentationProviders() { - return new Object[][]{ - {DocumentationProviderFeatures.DocumentationProvider.SPRINGDOC.name(), - (Consumer) outputPath -> - assertFileContains( - outputPath, - "allowableValues = [\"0\", \"1\"], defaultValue = \"0\"", - "@PathVariable" - ), - (Consumer) outputPath -> - assertFileContains( - outputPath, - "allowableValues = [\"sleeping\", \"awake\"]", "@PathVariable", - "@PathVariable" - ) - }, - {DocumentationProviderFeatures.DocumentationProvider.SPRINGFOX.name(), - (Consumer) outputPath -> - assertFileContains( - outputPath, - "allowableValues = \"0, 1\", defaultValue = \"0\"", - "@PathVariable" - ), - (Consumer) outputPath -> - assertFileContains( - outputPath, - "allowableValues = \"sleeping, awake\"", "@PathVariable", - "@PathVariable" - ) - } + return new Object[][] { + { DocumentationProviderFeatures.DocumentationProvider.SPRINGDOC.name(), + (Consumer) outputPath -> + assertFileContains( + outputPath, + "allowableValues = [\"0\", \"1\"], defaultValue = \"0\"", + "@PathVariable" + ), + (Consumer) outputPath -> + assertFileContains( + outputPath, + "allowableValues = [\"sleeping\", \"awake\"]", "@PathVariable", + "@PathVariable" + ) + }, + { DocumentationProviderFeatures.DocumentationProvider.SPRINGFOX.name(), + (Consumer) outputPath -> + assertFileContains( + outputPath, + "allowableValues = \"0, 1\", defaultValue = \"0\"", + "@PathVariable" + ), + (Consumer) outputPath -> + assertFileContains( + outputPath, + "allowableValues = \"sleeping, awake\"", "@PathVariable", + "@PathVariable" + ) + } }; } @Test(dataProvider = "issue17997DocumentationProviders") public void testDocumentationAnnotationInPathParams_Issue17997( - String documentProvider, - Consumer intEnumAssertFunction, - Consumer stringEnumAssertFunction + String documentProvider, + Consumer intEnumAssertFunction, + Consumer stringEnumAssertFunction ) throws IOException { Map additionalProperties = new HashMap<>(); additionalProperties.put(DOCUMENTATION_PROVIDER, documentProvider); @@ -1658,14 +1890,14 @@ public void testDocumentationAnnotationInPathParams_Issue17997( generatorPropertyDefaults.put(CodegenConstants.APIS, "true"); Map files = generateFromContract( - "src/test/resources/3_0/issue_6762.yaml", - additionalProperties, - generatorPropertyDefaults + "src/test/resources/3_0/issue_6762.yaml", + additionalProperties, + generatorPropertyDefaults ); Stream.of( - "ZebrasApiController.kt", - "GiraffesApiController.kt" + "ZebrasApiController.kt", + "GiraffesApiController.kt" ).forEach(filename -> { File file = files.get(filename); assertThat(file).isNotNull(); @@ -1673,8 +1905,8 @@ public void testDocumentationAnnotationInPathParams_Issue17997( }); Stream.of( - "BearsApiController.kt", - "CamelsApiController.kt" + "BearsApiController.kt", + "CamelsApiController.kt" ).forEach(filename -> { File file = files.get(filename); assertThat(file).isNotNull(); @@ -1973,13 +2205,13 @@ public void testXMinimumMessageAndXMaximumMessage_long() throws IOException { .assertParameter("number") .assertParameterAnnotation("Min") .hasAttributes(ImmutableMap.of( - "value", "1L", + "value", "1L", "message", "\"Must be positive\"" )) .toParameter() .assertParameterAnnotation("Max") .hasAttributes(ImmutableMap.of( - "value", "99L", + "value", "99L", "message", "\"Must be less than 100\"" )) .toParameter() @@ -1987,13 +2219,13 @@ public void testXMinimumMessageAndXMaximumMessage_long() throws IOException { .assertParameter("token") .assertParameterAnnotation("Min") .hasAttributes(ImmutableMap.of( - "value", "1L", + "value", "1L", "message", "\"Must be positive\"" )) .toParameter() .assertParameterAnnotation("Max") .hasAttributes(ImmutableMap.of( - "value", "99L", + "value", "99L", "message", "\"Must be less than 100\"" )) .toParameter() @@ -2001,13 +2233,13 @@ public void testXMinimumMessageAndXMaximumMessage_long() throws IOException { .assertParameter("clientNumber") .assertParameterAnnotation("Min") .hasAttributes(ImmutableMap.of( - "value", "1L", + "value", "1L", "message", "\"Must be positive\"" )) .toParameter() .assertParameterAnnotation("Max") .hasAttributes(ImmutableMap.of( - "value", "99L", + "value", "99L", "message", "\"Must be less than 100\"" )); KotlinFileAssert.assertThat(files.get("LongTest.kt")) @@ -2015,13 +2247,13 @@ public void testXMinimumMessageAndXMaximumMessage_long() throws IOException { .assertPrimaryConstructorParameter("field1") .assertParameterAnnotation("Min", "get") .hasAttributes(ImmutableMap.of( - "value", "1L", + "value", "1L", "message", "\"Must be positive\"" )) .toPrimaryConstructorParameter() .assertParameterAnnotation("Max", "get") .hasAttributes(ImmutableMap.of( - "value", "99L", + "value", "99L", "message", "\"Must be less than 100\"" )) .toPrimaryConstructorParameter() @@ -2043,9 +2275,9 @@ private Map generateFromContract(String url, Map a } private Map generateFromContract( - String url, - Map additionalProperties, - Map generatorPropertyDefaults + String url, + Map additionalProperties, + Map generatorPropertyDefaults ) throws IOException { return generateFromContract(url, additionalProperties, generatorPropertyDefaults, codegen -> { }); @@ -2057,22 +2289,22 @@ private Map generateFromContract( * use CodegenConfigurator instead of CodegenConfig for easier configuration like in JavaClientCodeGenTest */ private Map generateFromContract( - String url, - Map additionalProperties, - Map generatorPropertyDefaults, - Consumer consumer + String url, + Map additionalProperties, + Map generatorPropertyDefaults, + Consumer consumer ) throws IOException { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); output.deleteOnExit(); final CodegenConfigurator configurator = new CodegenConfigurator() - .setGeneratorName("kotlin-spring") - .setAdditionalProperties(additionalProperties) - .setValidateSpec(false) - .setInputSpec(url) - .setLibrary(SPRING_BOOT) - .setOutputDir(output.getAbsolutePath()); + .setGeneratorName("kotlin-spring") + .setAdditionalProperties(additionalProperties) + .setValidateSpec(false) + .setInputSpec(url) + .setLibrary(SPRING_BOOT) + .setOutputDir(output.getAbsolutePath()); consumer.accept(configurator); @@ -2082,6 +2314,6 @@ private Map generateFromContract( generatorPropertyDefaults.forEach(generator::setGeneratorPropertyDefault); return generator.opts(input).generate().stream() - .collect(Collectors.toMap(File::getName, Function.identity())); + .collect(Collectors.toMap(File::getName, Function.identity())); } } From 9dbd6ac3eac2725341ee9b719713e1038076dbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 22:34:39 +0100 Subject: [PATCH 13/23] fix tests --- .../spring/KotlinSpringServerCodegenTest.java | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 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 3b44a53bc88b..377bcee185eb 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 @@ -1130,7 +1130,7 @@ private void verifyGeneratedFilesContain(Map> expectedSnippet } @Test - public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception { + public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, @@ -1148,16 +1148,16 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger() thro 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,", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange)") ) ); } @Test - public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception { + public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, @@ -1175,16 +1175,16 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1() thr 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,", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange") ) ); } @Test - public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception { + public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, @@ -1211,7 +1211,7 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNone() throws } @Test - public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception { + public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, true, @@ -1238,7 +1238,7 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNone() thro } @Test - public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() throws Exception { + public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, @@ -1256,16 +1256,16 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger() t 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,", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @Test - public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1() throws Exception { + public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, @@ -1283,16 +1283,16 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1() 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,", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @Test - public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() throws Exception { + public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, @@ -1319,7 +1319,7 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNone() thro } @Test - public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() throws Exception { + public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, false, @@ -1346,7 +1346,7 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNone() t } @Test - public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception { + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, @@ -1364,16 +1364,16 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throw 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,", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @Test - public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception { + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, @@ -1391,16 +1391,16 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() thro 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,", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @Test - public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, @@ -1427,7 +1427,7 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws E } @Test - public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, true, @@ -1454,7 +1454,7 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throw } @Test - public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() throws Exception { + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, @@ -1472,16 +1472,16 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger() th 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,", - "getPetById(@Parameter(description = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @Test - public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() throws Exception { + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, @@ -1499,16 +1499,16 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1() t 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,", - "getPetById(@ApiParam(value = \"ID of pet to return\", required = true) @PathVariable(\"petId\") petId: kotlin.Long,"), + "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)") + "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @Test - public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, @@ -1535,7 +1535,7 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNone() throw } @Test - public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNone() throws Exception { + public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources2(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, false, From 01f65874e5206610b865cbc87aee98f910c58128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 22:39:02 +0100 Subject: [PATCH 14/23] refactor tests --- .../spring/KotlinSpringServerCodegenTest.java | 499 ++++++++++++++++-- 1 file changed, 448 insertions(+), 51 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 377bcee185eb..c567fe425041 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 @@ -1063,41 +1063,6 @@ public void generateNonSerializableModelWithXimplements() throws Exception { } private Path generateApiSources( - boolean includeHttpRequestContext, - boolean reactive, - boolean interfaceOnly, - String annotationLibrary - ) throws Exception { - File outputDir = Files.createTempDirectory("test").toFile().getCanonicalFile(); - outputDir.deleteOnExit(); - String outputPath = outputDir.getAbsolutePath().replace('\\', '/'); - - KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen(); - codegen.setOutputDir(outputDir.getAbsolutePath()); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, includeHttpRequestContext); - codegen.additionalProperties().put(KotlinSpringServerCodegen.REACTIVE, reactive); - codegen.additionalProperties().put(KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none"); - codegen.additionalProperties().put(KotlinSpringServerCodegen.ANNOTATION_LIBRARY, annotationLibrary); - codegen.additionalProperties().put(KotlinSpringServerCodegen.INTERFACE_ONLY, interfaceOnly); - codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true); - - ClientOptInput input = new ClientOptInput() - .openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/petstore.yaml")) - .config(codegen); - - DefaultGenerator generator = new DefaultGenerator(); - generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); - generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); - generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); - - generator.opts(input).generate(); - - return Paths.get(outputPath); - } - - private Path generateApiSources2( Map additionalProperties, Map generatorPropertyDefaults ) throws Exception { @@ -1131,7 +1096,7 @@ private void verifyGeneratedFilesContain(Map> expectedSnippet @Test public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1158,7 +1123,7 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDeleg @Test public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1185,7 +1150,7 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDele @Test public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1212,7 +1177,7 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate @Test public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1239,7 +1204,7 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDeleg @Test public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1266,7 +1231,7 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerNoDe @Test public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1293,7 +1258,7 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1NoD @Test public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1320,7 +1285,7 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDeleg @Test public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1347,7 +1312,7 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneNoDe @Test public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1374,7 +1339,7 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelega @Test public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1401,7 +1366,7 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDeleg @Test public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1428,7 +1393,7 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate( @Test public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, true, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1455,7 +1420,7 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelega @Test public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1482,7 +1447,7 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerNoDel @Test public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1509,7 +1474,7 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1NoDe @Test public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1536,7 +1501,7 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelega @Test public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { - Path root = generateApiSources2(Map.of( + Path root = generateApiSources(Map.of( KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, KotlinSpringServerCodegen.REACTIVE, false, KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", @@ -1561,6 +1526,438 @@ public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDel ); } + @Test + public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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)") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1Delegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextControllerImplAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1Delegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1Delegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger2", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1Delegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "swagger1", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + + @Test + public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDelegate() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, false, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, true, + KotlinSpringServerCodegen.DELEGATE_PATTERN, 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( + "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") + ) + ); + } + @Test public void reactiveWithoutFlow() throws Exception { File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); From 8ce6c62db87f00336acd35407b80f505847fbfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 22:52:09 +0100 Subject: [PATCH 15/23] add tests for delegate --- .../kotlin-spring/apiDelegate.mustache | 3 +- .../spring/KotlinSpringServerCodegenTest.java | 112 +++++++++++++++--- 2 files changed, 98 insertions(+), 17 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 5b45242c922b..403f55f33c67 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiDelegate.mustache @@ -34,7 +34,8 @@ interface {{classname}}Delegate { * @see {{classname}}#{{operationId}} */ {{#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}}{{#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}}): {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}}{{^skipDefaultDelegateInterface}} { + {{/-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}} { {{>methodBody}}{{! prevent indent}} }{{/skipDefaultDelegateInterface}} 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 c567fe425041..4f2ac26d55af 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 @@ -1548,7 +1548,12 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwaggerDelegat "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)") + "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @@ -1575,7 +1580,12 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationSwagger1Delega "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") + "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @@ -1602,7 +1612,12 @@ public void reactiveWithHttpRequestContextControllerImplAnnotationNoneDelegate() "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") + "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @@ -1629,7 +1644,12 @@ public void reactiveWithoutHttpRequestContextControllerImplAnnotationNoneDelegat "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") + "logoutUser(): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "apiKey: kotlin.String?): ResponseEntity", + "petId: kotlin.Long): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "(): ResponseEntity") ) ); } @@ -1656,7 +1676,12 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwaggerDele "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") + "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity", + "request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @@ -1683,7 +1708,12 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationSwagger1Del "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") + "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity", + "request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @@ -1710,7 +1740,12 @@ public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneDelegat "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") + "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity", + "request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @@ -1737,7 +1772,12 @@ public void nonReactiveWithoutHttpRequestContextControllerImplAnnotationNoneDele "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") + "logoutUser(): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "apiKey: kotlin.String?): ResponseEntity", + "petId: kotlin.Long): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "(): ResponseEntity") ) ); } @@ -1764,7 +1804,12 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerDelegate "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") + "logoutUser(@Parameter(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @@ -1791,7 +1836,12 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1Delegat "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") + "logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @@ -1818,7 +1868,12 @@ public void reactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneDelegate() "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") + "logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity", + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity") ) ); } @@ -1845,7 +1900,12 @@ public void reactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDelegate "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") + "logoutUser(): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "apiKey: kotlin.String?): ResponseEntity", + "petId: kotlin.Long): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "(): ResponseEntity") ) ); } @@ -1872,7 +1932,12 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwaggerDeleg "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") + "logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity", + "request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @@ -1899,7 +1964,12 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationSwagger1Dele "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") + "logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity", + "request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @@ -1926,7 +1996,12 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneDelegate "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") + "logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity", + "request: javax.servlet.http.HttpServletRequest): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "request: javax.servlet.http.HttpServletRequest): ResponseEntity") ) ); } @@ -1953,7 +2028,12 @@ public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneDeleg "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") + "logoutUser(): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/PetApiDelegate.kt"), List.of( + "apiKey: kotlin.String?): ResponseEntity", + "petId: kotlin.Long): ResponseEntity"), + root.resolve("src/main/kotlin/org/openapitools/api/UserApiDelegate.kt"), List.of( + "(): ResponseEntity") ) ); } From 0a134a19da0845c6b05d3a7aa7dd28beea267c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 23:05:33 +0100 Subject: [PATCH 16/23] add kotlin project compile check test for include-http-request-context --- ...include-http-request-context-delegate.yaml | 17 ++ ...otlin-spring-boot-x-kotlin-implements.yaml | 4 +- .../.openapi-generator-ignore | 23 ++ .../.openapi-generator/FILES | 30 +++ .../.openapi-generator/VERSION | 1 + .../README.md | 21 ++ .../build.gradle.kts | 53 ++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../gradlew | 249 ++++++++++++++++++ .../gradlew.bat | 92 +++++++ .../pom.xml | 148 +++++++++++ .../settings.gradle | 15 ++ .../kotlin/org/openapitools/Application.kt | 13 + .../kotlin/org/openapitools/api/ApiUtil.kt | 5 + .../kotlin/org/openapitools/api/PetApi.kt | 188 +++++++++++++ .../org/openapitools/api/PetApiController.kt | 15 ++ .../org/openapitools/api/PetApiDelegate.kt | 82 ++++++ .../kotlin/org/openapitools/api/StoreApi.kt | 114 ++++++++ .../openapitools/api/StoreApiController.kt | 15 ++ .../org/openapitools/api/StoreApiDelegate.kt | 47 ++++ .../kotlin/org/openapitools/api/UserApi.kt | 173 ++++++++++++ .../org/openapitools/api/UserApiController.kt | 15 ++ .../org/openapitools/api/UserApiDelegate.kt | 77 ++++++ .../EnumConverterConfiguration.kt | 26 ++ .../main/kotlin/org/openapitools/model/Cat.kt | 66 +++++ .../kotlin/org/openapitools/model/Category.kt | 36 +++ .../kotlin/org/openapitools/model/Color.kt | 41 +++ .../main/kotlin/org/openapitools/model/Dog.kt | 91 +++++++ .../openapitools/model/ModelApiResponse.kt | 40 +++ .../kotlin/org/openapitools/model/Order.kt | 74 ++++++ .../main/kotlin/org/openapitools/model/Pet.kt | 80 ++++++ .../main/kotlin/org/openapitools/model/Tag.kt | 36 +++ .../kotlin/org/openapitools/model/User.kt | 60 +++++ .../src/main/resources/application.yaml | 10 + .../.openapi-generator/FILES | 1 + .../build.gradle.kts | 1 + .../pom.xml | 7 +- .../openapitools/SpringDocConfiguration.kt | 42 +++ .../kotlin/org/openapitools/api/PetApi.kt | 129 +++++++-- .../kotlin/org/openapitools/api/StoreApi.kt | 58 +++- .../kotlin/org/openapitools/api/UserApi.kt | 120 +++++++-- .../main/kotlin/org/openapitools/model/Cat.kt | 10 + .../kotlin/org/openapitools/model/Category.kt | 3 + .../kotlin/org/openapitools/model/Color.kt | 1 + .../main/kotlin/org/openapitools/model/Dog.kt | 11 + .../openapitools/model/ModelApiResponse.kt | 4 + .../kotlin/org/openapitools/model/Order.kt | 7 + .../main/kotlin/org/openapitools/model/Pet.kt | 15 +- .../main/kotlin/org/openapitools/model/Tag.kt | 3 + .../kotlin/org/openapitools/model/User.kt | 9 + 51 files changed, 2321 insertions(+), 64 deletions(-) create mode 100644 bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator-ignore create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/FILES create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/VERSION create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/README.md create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/build.gradle.kts create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew.bat create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/pom.xml create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/settings.gradle create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/Application.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/ApiUtil.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Cat.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Category.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Color.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Dog.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Order.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/User.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/resources/application.yaml create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt diff --git a/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml b/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml new file mode 100644 index 000000000000..84e768d6359f --- /dev/null +++ b/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml @@ -0,0 +1,17 @@ +generatorName: kotlin-spring +outputDir: samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + documentationProvider: none + annotationLibrary: swagger1 + useSwaggerUI: false + serviceImplementation: false + skipDefaultInterface: true + interfaceOnly: false + serializableModel: true + beanValidations: true + includeHttpRequestContext: true + reactive: true + delegatePattern: true diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml index 4ef449d5e667..68f950dc629e 100644 --- a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -4,8 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: - documentationProvider: none - annotationLibrary: none + documentationProvider: springdoc + annotationLibrary: swagger2 useSwaggerUI: false serviceImplementation: false skipDefaultInterface: true diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.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-include-http-request-context-delegate.yaml/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/FILES new file mode 100644 index 000000000000..8b73d6497e4f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/FILES @@ -0,0 +1,30 @@ +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/PetApi.kt +src/main/kotlin/org/openapitools/api/PetApiController.kt +src/main/kotlin/org/openapitools/api/PetApiDelegate.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/UserApi.kt +src/main/kotlin/org/openapitools/api/UserApiController.kt +src/main/kotlin/org/openapitools/api/UserApiDelegate.kt +src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt +src/main/kotlin/org/openapitools/model/Cat.kt +src/main/kotlin/org/openapitools/model/Category.kt +src/main/kotlin/org/openapitools/model/Color.kt +src/main/kotlin/org/openapitools/model/Dog.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-include-http-request-context-delegate.yaml/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/VERSION new file mode 100644 index 000000000000..2fb556b60635 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.18.0-SNAPSHOT diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/README.md b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/README.md new file mode 100644 index 000000000000..b6865a081135 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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-include-http-request-context-delegate.yaml/build.gradle.kts b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/build.gradle.kts new file mode 100644 index 000000000000..e78a961d4091 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/build.gradle.kts @@ -0,0 +1,53 @@ +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 { + val kotlinxCoroutinesVersion = "1.6.1" + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion") + implementation("io.swagger:swagger-annotations:1.6.6") + + 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") + } + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion") +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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-include-http-request-context-delegate.yaml/gradlew.bat b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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-include-http-request-context-delegate.yaml/pom.xml b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/pom.xml new file mode 100644 index 000000000000..1e85d34a2f9e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/pom.xml @@ -0,0 +1,148 @@ + + 4.0.0 + org.openapitools + openapi-spring + jar + openapi-spring + 1.0.0 + + 1.6.1 + 1.6.6 + 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-webflux + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + ${kotlinx-coroutines.version} + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactor + ${kotlinx-coroutines.version} + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + + + 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-include-http-request-context-delegate.yaml/settings.gradle b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/settings.gradle new file mode 100644 index 000000000000..14844905cd40 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/Application.kt new file mode 100644 index 000000000000..2fe6de62479e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/ApiUtil.kt new file mode 100644 index 000000000000..7c275cbf30ed --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -0,0 +1,5 @@ +package org.openapitools.api + + +object ApiUtil { +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApi.kt new file mode 100644 index 000000000000..a5484ab149dd --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -0,0 +1,188 @@ +/** + * 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 io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam +import io.swagger.annotations.ApiResponse +import io.swagger.annotations.ApiResponses +import io.swagger.annotations.Authorization +import io.swagger.annotations.AuthorizationScope +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 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 kotlinx.coroutines.flow.Flow +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@Api(value = "pet", description = "The pet API") +interface PetApi { + + fun getDelegate(): PetApiDelegate + + + @ApiOperation( + 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")])]) + @ApiResponses( + value = [ApiResponse(code = 405, message = "Invalid input")]) + @RequestMapping( + 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 { + return getDelegate().addPet(pet, exchange) + } + + + @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")])]) + @ApiResponses( + value = [ApiResponse(code = 400, message = "Invalid pet value")]) + @RequestMapping( + 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 { + return getDelegate().deletePet(petId, apiKey, exchange) + } + + + @ApiOperation( + value = "Finds Pets by status", + nickname = "findPetsByStatus", + 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")])]) + @ApiResponses( + 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"] + ) + 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) + } + + + @ApiOperation( + value = "Finds Pets by tags", + nickname = "findPetsByTags", + 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")])]) + @ApiResponses( + 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"] + ) + 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) + } + + + @ApiOperation( + value = "Find pet by ID", + nickname = "getPetById", + notes = "Returns a single pet", + response = Pet::class, + 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")]) + @RequestMapping( + 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 { + return getDelegate().getPetById(petId, exchange) + } + + + @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")])]) + @ApiResponses( + 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"] + ) + 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) + } + + + @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")])]) + @ApiResponses( + value = [ApiResponse(code = 405, message = "Invalid input")]) + @RequestMapping( + 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 { + return getDelegate().updatePetWithForm(petId, name, status, exchange) + } + + + @ApiOperation( + value = "Uploads an image", + 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")])]) + @ApiResponses( + 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"] + ) + 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.yaml/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiController.kt new file mode 100644 index 000000000000..c4f47748e1c3 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -0,0 +1,15 @@ +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( + private val delegate: PetApiDelegate +) : PetApi { + + override fun getDelegate(): PetApiDelegate = delegate +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt new file mode 100644 index 000000000000..c9d93bde1fe8 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt @@ -0,0 +1,82 @@ +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.context.request.NativeWebRequest +import kotlinx.coroutines.flow.Flow + +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 + */ + suspend fun addPet(pet: Pet, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see PetApi#deletePet + */ + suspend fun deletePet(petId: kotlin.Long, + apiKey: kotlin.String?, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see PetApi#findPetsByStatus + */ + fun findPetsByStatus(status: kotlin.collections.List, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> + + + /** + * @see PetApi#findPetsByTags + */ + fun findPetsByTags(tags: kotlin.collections.List, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> + + + /** + * @see PetApi#getPetById + */ + suspend fun getPetById(petId: kotlin.Long, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see PetApi#updatePet + */ + suspend fun updatePet(pet: Pet, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see PetApi#updatePetWithForm + */ + suspend fun updatePetWithForm(petId: kotlin.Long, + name: kotlin.String?, + status: kotlin.String?, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see PetApi#uploadFile + */ + suspend fun uploadFile(petId: kotlin.Long, + additionalMetadata: kotlin.String?, + file: org.springframework.web.multipart.MultipartFile, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApi.kt new file mode 100644 index 000000000000..8b42f54741f0 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -0,0 +1,114 @@ +/** + * 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 io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam +import io.swagger.annotations.ApiResponse +import io.swagger.annotations.ApiResponses +import io.swagger.annotations.Authorization +import io.swagger.annotations.AuthorizationScope +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 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 kotlinx.coroutines.flow.Flow +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@Api(value = "store", description = "The store API") +interface StoreApi { + + fun getDelegate(): StoreApiDelegate + + + @ApiOperation( + value = "Delete purchase order by ID", + nickname = "deleteOrder", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")]) + @RequestMapping( + 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 { + return getDelegate().deleteOrder(orderId, exchange) + } + + + @ApiOperation( + value = "Returns pet inventories by status", + nickname = "getInventory", + notes = "", + response = kotlin.Int::class, + responseContainer = "Map", + authorizations = [Authorization(value = "api_key")]) + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) + @RequestMapping( + 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) + } + + + @ApiOperation( + value = "Find purchase order by ID", + nickname = "getOrderById", + notes = "", + 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")]) + @RequestMapping( + 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 { + return getDelegate().getOrderById(orderId, exchange) + } + + + @ApiOperation( + value = "Place an order for a pet", + nickname = "placeOrder", + notes = "", + response = Order::class) + @ApiResponses( + 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"] + ) + 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.yaml/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiController.kt new file mode 100644 index 000000000000..316f31b0355f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -0,0 +1,15 @@ +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( + private val delegate: StoreApiDelegate +) : StoreApi { + + override fun getDelegate(): StoreApiDelegate = delegate +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt new file mode 100644 index 000000000000..5064c218471f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt @@ -0,0 +1,47 @@ +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.context.request.NativeWebRequest +import kotlinx.coroutines.flow.Flow + +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 + */ + suspend fun deleteOrder(orderId: kotlin.String, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see StoreApi#getInventory + */ + suspend fun getInventory(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity> + + + /** + * @see StoreApi#getOrderById + */ + suspend fun getOrderById(orderId: kotlin.Int, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see StoreApi#placeOrder + */ + suspend fun placeOrder(order: Order, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApi.kt new file mode 100644 index 000000000000..8cddc539266b --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -0,0 +1,173 @@ +/** + * 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 io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam +import io.swagger.annotations.ApiResponse +import io.swagger.annotations.ApiResponses +import io.swagger.annotations.Authorization +import io.swagger.annotations.AuthorizationScope +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 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 kotlinx.coroutines.flow.Flow +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@Api(value = "user", description = "The user API") +interface UserApi { + + fun getDelegate(): UserApiDelegate + + + @ApiOperation( + value = "Create user", + nickname = "createUser", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) + @RequestMapping( + 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 { + return getDelegate().createUser(user, exchange) + } + + + @ApiOperation( + value = "Creates list of users with given input array", + nickname = "createUsersWithArrayInput", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) + @RequestMapping( + 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 { + return getDelegate().createUsersWithArrayInput(user, exchange) + } + + + @ApiOperation( + value = "Creates list of users with given input array", + nickname = "createUsersWithListInput", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) + @RequestMapping( + 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 { + return getDelegate().createUsersWithListInput(user, exchange) + } + + + @ApiOperation( + value = "Delete user", + nickname = "deleteUser", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")]) + @RequestMapping( + 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 { + return getDelegate().deleteUser(username, exchange) + } + + + @ApiOperation( + value = "Get user by user name", + nickname = "getUserByName", + notes = "", + 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")]) + @RequestMapping( + 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 { + return getDelegate().getUserByName(username, exchange) + } + + + @ApiOperation( + value = "Logs user into the system", + nickname = "loginUser", + notes = "", + response = kotlin.String::class) + @ApiResponses( + 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"] + ) + 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) + } + + + @ApiOperation( + value = "Logs out current logged in user session", + nickname = "logoutUser", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/logout"] + ) + suspend fun logoutUser(@ApiParam(hidden = true) exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity { + return getDelegate().logoutUser(exchange) + } + + + @ApiOperation( + value = "Updated user", + nickname = "updateUser", + notes = "") + @ApiResponses( + 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"] + ) + 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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiController.kt new file mode 100644 index 000000000000..39b95316c830 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -0,0 +1,15 @@ +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( + private val delegate: UserApiDelegate +) : UserApi { + + override fun getDelegate(): UserApiDelegate = delegate +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt new file mode 100644 index 000000000000..2a88c82d8d3c --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt @@ -0,0 +1,77 @@ +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.context.request.NativeWebRequest +import kotlinx.coroutines.flow.Flow + +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 + */ + suspend fun createUser(user: User, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#createUsersWithArrayInput + */ + suspend fun createUsersWithArrayInput(user: Flow, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#createUsersWithListInput + */ + suspend fun createUsersWithListInput(user: Flow, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#deleteUser + */ + suspend fun deleteUser(username: kotlin.String, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#getUserByName + */ + suspend fun getUserByName(username: kotlin.String, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#loginUser + */ + suspend fun loginUser(username: kotlin.String, + password: kotlin.String, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#logoutUser + */ + suspend fun logoutUser(exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + + + /** + * @see UserApi#updateUser + */ + suspend fun updateUser(username: kotlin.String, + user: User, + exchange: org.springframework.web.server.ServerWebExchange): ResponseEntity + +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt new file mode 100644 index 000000000000..20229410386f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt @@ -0,0 +1,26 @@ +package org.openapitools.configuration + +import org.openapitools.model.Color + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.core.convert.converter.Converter + +/** + * This class provides Spring Converter beans for the enum models in the OpenAPI specification. + * + * By default, Spring only converts primitive types to enums using Enum::valueOf, which can prevent + * correct conversion if the OpenAPI specification is using an `enumPropertyNaming` other than + * `original` or the specification has an integer enum. + */ +@Configuration(value = "org.openapitools.configuration.enumConverterConfiguration") +class EnumConverterConfiguration { + + @Bean(name = ["org.openapitools.configuration.EnumConverterConfiguration.colorConverter"]) + fun colorConverter(): Converter { + return object: Converter { + override fun convert(source: kotlin.String): Color = Color.forValue(source) + } + } + +} diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Cat.kt new file mode 100644 index 000000000000..ae9af1b803df --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Cat.kt @@ -0,0 +1,66 @@ +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.Color +import org.openapitools.model.Pet +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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param hunts + * @param age + */ +data class Cat( + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("age") val age: kotlin.Int? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("id") override val id: kotlin.Long? = null, + + @field:Valid + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("category") override val category: Category? = null, + + @field:Valid + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, + + @field:Valid + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("color") override val color: Color? = null +) : Pet, Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Category.kt new file mode 100644 index 000000000000..840851411bef --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Category.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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param id + * @param name + */ +data class Category( + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @ApiModelProperty(example = "null", value = "") + @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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Color.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Color.kt new file mode 100644 index 000000000000..8be96cf72e17 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Color.kt @@ -0,0 +1,41 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonValue +import com.fasterxml.jackson.annotation.JsonCreator +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 +import io.swagger.annotations.ApiModelProperty + +/** +* +* Values: black,white,brown,yellow,violet +*/ +enum class Color(@get:JsonValue val value: kotlin.String) : com.some.pack.WithDefaultMethods { + + black("black"), + white("white"), + brown("brown"), + yellow("yellow"), + violet("violet"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Color { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Color'") + } + } +} + diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Dog.kt new file mode 100644 index 000000000000..cce5e8da3c12 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Dog.kt @@ -0,0 +1,91 @@ +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.Color +import org.openapitools.model.Pet +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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param bark + * @param breed + * @param likesFetch Whether the dog enjoys fetching + */ +data class Dog( + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("breed", required = true) val breed: Dog.Breed, + + @ApiModelProperty(example = "null", required = true, value = "Whether the dog enjoys fetching") + @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + + @ApiModelProperty(example = "null", required = true, value = "") + @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("id") override val id: kotlin.Long? = null, + + @field:Valid + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("category") override val category: Category? = null, + + @field:Valid + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, + + @field:Valid + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("color") override val color: Color? = null +) : Pet, Serializable, com.some.pack.Fetchable { + + /** + * + * Values: Dingo,Husky,Retriever,Shepherd + */ + enum class Breed(@get:JsonValue val value: kotlin.String) { + + Dingo("Dingo"), + Husky("Husky"), + Retriever("Retriever"), + Shepherd("Shepherd"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Breed { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Dog'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt new file mode 100644 index 000000000000..adb4e8fb2fc1 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -0,0 +1,40 @@ +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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param code + * @param type + * @param message + */ +data class ModelApiResponse( + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("code") val code: kotlin.Int? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("type") val type: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Order.kt new file mode 100644 index 000000000000..b6ddad1d9c75 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Order.kt @@ -0,0 +1,74 @@ +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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param id + * @param petId + * @param quantity + * @param shipDate + * @param status + * @param complete + */ +data class Order( + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("petId") val petId: kotlin.Long? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("status") val status: Order.Status? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("complete") val complete: kotlin.Boolean? = false +) : Serializable { + + /** + * + * 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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Pet.kt new file mode 100644 index 000000000000..a6a17770db12 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Pet.kt @@ -0,0 +1,80 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonIgnoreProperties +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonSubTypes +import com.fasterxml.jackson.annotation.JsonTypeInfo +import com.fasterxml.jackson.annotation.JsonValue +import org.openapitools.model.Category +import org.openapitools.model.Color +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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param name + * @param photoUrls + * @param petType + * @param id + * @param category + * @param tags + * @param color + */ +@JsonIgnoreProperties( + value = ["petType"], // ignore manually set petType, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the petType to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "petType", visible = true) +@JsonSubTypes( + JsonSubTypes.Type(value = Cat::class, name = "Cat"), + JsonSubTypes.Type(value = Dog::class, name = "Dog") +) + +interface Pet : Serializable, com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { + + @get:ApiModelProperty(example = "null", required = true, value = "") + override val name: kotlin.String + + + @get:ApiModelProperty(example = "null", required = true, value = "") + val photoUrls: kotlin.collections.List + + + @get:ApiModelProperty(example = "null", required = true, value = "") + val petType: kotlin.String + + + @get:ApiModelProperty(example = "null", value = "") + val id: kotlin.Long? + + + @get:ApiModelProperty(example = "null", value = "") + override val category: Category? + + + @get:ApiModelProperty(example = "null", value = "") + val tags: kotlin.collections.List? + + + @get:ApiModelProperty(example = "null", value = "") + val color: Color? + + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Tag.kt new file mode 100644 index 000000000000..23d0f3191596 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Tag.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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param id + * @param name + */ +data class Tag( + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @ApiModelProperty(example = "null", value = "") + @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-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/User.kt new file mode 100644 index 000000000000..9399e70b2527 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/User.kt @@ -0,0 +1,60 @@ +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 +import io.swagger.annotations.ApiModelProperty + +/** + * + * @param id + * @param username + * @param firstName + * @param lastName + * @param email + * @param password + * @param phone + * @param userStatus + */ +data class User( + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("username") val username: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("email") val email: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("password") val password: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @get:JsonProperty("phone") val phone: kotlin.String? = null, + + @ApiModelProperty(example = "null", value = "") + @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-include-http-request-context-delegate.yaml/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/resources/application.yaml new file mode 100644 index 000000000000..8e2ebcde976d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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-x-kotlin-implements/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES index 59aed4399e9f..649cae2700ab 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES @@ -6,6 +6,7 @@ gradlew gradlew.bat pom.xml settings.gradle +src/main/kotlin/org/openapitools/SpringDocConfiguration.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 diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts index f0cd582d7879..8873f41c7f4a 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springdoc:springdoc-openapi-webmvc-core:1.6.8") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml index 54f4f6767beb..52857830630b 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml @@ -86,7 +86,12 @@ spring-boot-starter-web - + + + org.springdoc + springdoc-openapi-webmvc-core + ${springdoc-openapi.version} + diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt new file mode 100644 index 000000000000..bd3b91551d61 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt @@ -0,0 +1,42 @@ +package org.openapitools + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +import io.swagger.v3.oas.models.OpenAPI +import io.swagger.v3.oas.models.info.Info +import io.swagger.v3.oas.models.info.Contact +import io.swagger.v3.oas.models.info.License +import io.swagger.v3.oas.models.Components +import io.swagger.v3.oas.models.security.SecurityScheme + +@Configuration +class SpringDocConfiguration { + + @Bean + fun apiInfo(): OpenAPI { + return OpenAPI() + .info( + Info() + .title("OpenAPI Petstore") + .description("This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. ") + .license( + License() + .name("Apache-2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0.html") + ) + .version("1.0.0") + ) + .components( + Components() + .addSecuritySchemes("petstore_auth", SecurityScheme() + .type(SecurityScheme.Type.OAUTH2) + ) + .addSecuritySchemes("api_key", SecurityScheme() + .type(SecurityScheme.Type.APIKEY) + .`in`(SecurityScheme.In.HEADER) + .name("api_key") + ) + ) + } +} 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 ae87b0da2e0f..d0f991057695 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 @@ -7,6 +7,11 @@ package org.openapitools.api import org.openapitools.model.ModelApiResponse import org.openapitools.model.Pet +import io.swagger.v3.oas.annotations.* +import io.swagger.v3.oas.annotations.enums.* +import io.swagger.v3.oas.annotations.media.* +import io.swagger.v3.oas.annotations.responses.* +import io.swagger.v3.oas.annotations.security.* import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -33,67 +38,145 @@ import kotlin.collections.Map @Validated interface PetApi { - + @Operation( + tags = ["pet",], + summary = "Add a new pet to the store", + operationId = "addPet", + description = """""", + responses = [ + ApiResponse(responseCode = "405", description = "Invalid input") + ], + security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/pet"], consumes = ["application/json"] ) - fun addPet( @Valid @RequestBody pet: Pet, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun addPet(@Parameter(description = "", required = true) @Valid @RequestBody pet: Pet, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["pet",], + summary = "Deletes a pet", + operationId = "deletePet", + description = """""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid pet value") + ], + security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] + ) @RequestMapping( method = [RequestMethod.DELETE], value = ["/pet/{petId}"] ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?, request: javax.servlet.http.HttpServletRequest): 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?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["pet",], + summary = "Finds Pets by status", + operationId = "findPetsByStatus", + description = """Multiple status values can be provided with comma separated strings""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(array = ArraySchema(schema = Schema(implementation = Pet::class)))]), + ApiResponse(responseCode = "400", description = "Invalid status value") + ], + security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByStatus"], produces = ["application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List, request: javax.servlet.http.HttpServletRequest): 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, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> + + @Operation( + tags = ["pet",], + summary = "Finds Pets by tags", + operationId = "findPetsByTags", + description = """Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(array = ArraySchema(schema = Schema(implementation = Pet::class)))]), + ApiResponse(responseCode = "400", description = "Invalid tag value") + ], + security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByTags"], produces = ["application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, request: javax.servlet.http.HttpServletRequest): ResponseEntity> - - + fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> + + @Operation( + tags = ["pet",], + summary = "Find pet by ID", + operationId = "getPetById", + description = """Returns a single pet""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Pet::class))]), + ApiResponse(responseCode = "400", description = "Invalid ID supplied"), + ApiResponse(responseCode = "404", description = "Pet not found") + ], + security = [ SecurityRequirement(name = "api_key") ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/pet/{petId}"], produces = ["application/json"] ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["pet",], + summary = "Update an existing pet", + operationId = "updatePet", + description = """""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid ID supplied"), + ApiResponse(responseCode = "404", description = "Pet not found"), + ApiResponse(responseCode = "405", description = "Validation exception") + ], + security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] + ) @RequestMapping( method = [RequestMethod.PUT], value = ["/pet"], consumes = ["application/json"] ) - fun updatePet( @Valid @RequestBody pet: Pet, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun updatePet(@Parameter(description = "", required = true) @Valid @RequestBody pet: Pet, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["pet",], + summary = "Updates a pet in the store with form data", + operationId = "updatePetWithForm", + description = """""", + responses = [ + ApiResponse(responseCode = "405", description = "Invalid input") + ], + 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( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? , request: javax.servlet.http.HttpServletRequest): 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? , @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["pet",], + summary = "Uploads an image", + operationId = "uploadFile", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = ModelApiResponse::class))]) + ], + 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( @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, request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @Parameter(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 5c00536ff4fa..225c74a8e928 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 @@ -6,6 +6,11 @@ package org.openapitools.api import org.openapitools.model.Order +import io.swagger.v3.oas.annotations.* +import io.swagger.v3.oas.annotations.enums.* +import io.swagger.v3.oas.annotations.media.* +import io.swagger.v3.oas.annotations.responses.* +import io.swagger.v3.oas.annotations.security.* import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -32,35 +37,72 @@ import kotlin.collections.Map @Validated interface StoreApi { - + @Operation( + tags = ["store",], + summary = "Delete purchase order by ID", + operationId = "deleteOrder", + description = """""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid ID supplied"), + ApiResponse(responseCode = "404", description = "Order not found") + ] + ) @RequestMapping( method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity - + fun deleteOrder(@Parameter(description = "", required = true) @PathVariable("orderId") orderId: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + @Operation( + tags = ["store",], + summary = "Returns pet inventories by status", + operationId = "getInventory", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = kotlin.collections.Map::class))]) + ], + security = [ SecurityRequirement(name = "api_key") ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/store/inventory"], produces = ["application/json"] ) - fun getInventory(request: javax.servlet.http.HttpServletRequest): ResponseEntity> - + fun getInventory(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> + @Operation( + tags = ["store",], + summary = "Find purchase order by ID", + operationId = "getOrderById", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]), + ApiResponse(responseCode = "400", description = "Invalid ID supplied"), + ApiResponse(responseCode = "404", description = "Order not found") + ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/store/order/{orderId}"], produces = ["application/json"] ) - fun getOrderById(@Min(value=1) @Max(value=5) @PathVariable("orderId") orderId: kotlin.Int, request: javax.servlet.http.HttpServletRequest): ResponseEntity - + fun getOrderById(@Min(value=1) @Max(value=5) @Parameter(description = "", required = true) @PathVariable("orderId") orderId: kotlin.Int, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + @Operation( + tags = ["store",], + summary = "Place an order for a pet", + operationId = "placeOrder", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]), + ApiResponse(responseCode = "400", description = "Invalid Order") + ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/store/order"], produces = ["application/json"], consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody order: Order, request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun placeOrder(@Parameter(description = "", required = true) @Valid @RequestBody order: Order, @Parameter(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 c1b618ac9d37..46d7765f5daa 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 @@ -6,6 +6,11 @@ package org.openapitools.api import org.openapitools.model.User +import io.swagger.v3.oas.annotations.* +import io.swagger.v3.oas.annotations.enums.* +import io.swagger.v3.oas.annotations.media.* +import io.swagger.v3.oas.annotations.responses.* +import io.swagger.v3.oas.annotations.security.* import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -32,65 +37,134 @@ import kotlin.collections.Map @Validated interface UserApi { - + @Operation( + tags = ["user",], + summary = "Create user", + operationId = "createUser", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation") + ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/user"], consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody user: User, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun createUser(@Parameter(description = "", required = true) @Valid @RequestBody user: User, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Creates list of users with given input array", + operationId = "createUsersWithArrayInput", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation") + ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun createUsersWithArrayInput(@Parameter(description = "", required = true) @Valid @RequestBody user: kotlin.collections.List, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Creates list of users with given input array", + operationId = "createUsersWithListInput", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation") + ] + ) @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun createUsersWithListInput(@Parameter(description = "", required = true) @Valid @RequestBody user: kotlin.collections.List, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Delete user", + operationId = "deleteUser", + description = """""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid username supplied"), + ApiResponse(responseCode = "404", description = "User not found") + ] + ) @RequestMapping( method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser( @PathVariable("username") username: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun deleteUser(@Parameter(description = "", required = true) @PathVariable("username") username: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Get user by user name", + operationId = "getUserByName", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = User::class))]), + ApiResponse(responseCode = "400", description = "Invalid username supplied"), + ApiResponse(responseCode = "404", description = "User not found") + ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/user/{username}"], produces = ["application/json"] ) - fun getUserByName( @PathVariable("username") username: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun getUserByName(@Parameter(description = "", required = true) @PathVariable("username") username: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Logs user into the system", + operationId = "loginUser", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = kotlin.String::class))]), + ApiResponse(responseCode = "400", description = "Invalid username/password supplied") + ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/user/login"], produces = ["application/json"] ) - fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String, request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun loginUser(@NotNull @Parameter(description = "", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Logs out current logged in user session", + operationId = "logoutUser", + description = """""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation") + ] + ) @RequestMapping( method = [RequestMethod.GET], value = ["/user/logout"] ) - fun logoutUser(request: javax.servlet.http.HttpServletRequest): ResponseEntity - - + fun logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + @Operation( + tags = ["user",], + summary = "Updated user", + operationId = "updateUser", + description = """""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid user supplied"), + ApiResponse(responseCode = "404", description = "User not found") + ] + ) @RequestMapping( method = [RequestMethod.PUT], value = ["/user/{username}"], consumes = ["application/json"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User, request: javax.servlet.http.HttpServletRequest): ResponseEntity + fun updateUser(@Parameter(description = "", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "", required = true) @Valid @RequestBody user: User, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt index 147ed4ff31a4..e3b435adf73f 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt @@ -19,6 +19,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -27,25 +28,34 @@ import javax.validation.Valid */ data class Cat( + @Schema(example = "null", required = true, description = "") @get:JsonProperty("name", required = true) override val name: kotlin.String, + @Schema(example = "null", required = true, description = "") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + @Schema(example = "null", required = true, description = "") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + @Schema(example = "null", description = "") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, + @Schema(example = "null", description = "") @get:JsonProperty("age") val age: kotlin.Int? = null, + @Schema(example = "null", description = "") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid + @Schema(example = "null", description = "") @get:JsonProperty("category") override val category: Category? = null, @field:Valid + @Schema(example = "null", description = "") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid + @Schema(example = "null", description = "") @get:JsonProperty("color") override val color: Color? = null ) : Pet, Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt index f98ea616ec26..a21c40b744ae 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt @@ -13,6 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,8 +22,10 @@ import javax.validation.Valid */ data class Category( + @Schema(example = "null", description = "") @get:JsonProperty("id") val id: kotlin.Long? = null, + @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt index d46c704e991c..a6e4e8c70d4b 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt @@ -15,6 +15,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt index 789cb452e748..446bce5bed73 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt @@ -19,6 +19,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -28,27 +29,37 @@ import javax.validation.Valid */ data class Dog( + @Schema(example = "null", required = true, description = "") @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, + @Schema(example = "null", required = true, description = "") @get:JsonProperty("breed", required = true) val breed: Dog.Breed, + @Schema(example = "null", required = true, description = "Whether the dog enjoys fetching") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, + @Schema(example = "null", required = true, description = "") @get:JsonProperty("name", required = true) override val name: kotlin.String, + @Schema(example = "null", required = true, description = "") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + @Schema(example = "null", required = true, description = "") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + @Schema(example = "null", description = "") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid + @Schema(example = "null", description = "") @get:JsonProperty("category") override val category: Category? = null, @field:Valid + @Schema(example = "null", description = "") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid + @Schema(example = "null", description = "") @get:JsonProperty("color") override val color: Color? = null ) : Pet, Serializable, com.some.pack.Fetchable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index d5f1bfed6348..81a904c85123 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -13,6 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -22,10 +23,13 @@ import javax.validation.Valid */ data class ModelApiResponse( + @Schema(example = "null", description = "") @get:JsonProperty("code") val code: kotlin.Int? = null, + @Schema(example = "null", description = "") @get:JsonProperty("type") val type: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt index b9cf389785aa..0fe053faa9cf 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt @@ -15,6 +15,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -27,16 +28,22 @@ import javax.validation.Valid */ data class Order( + @Schema(example = "null", description = "") @get:JsonProperty("id") val id: kotlin.Long? = null, + @Schema(example = "null", description = "") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @Schema(example = "null", description = "") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @Schema(example = "null", description = "") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + @Schema(example = "null", description = "") @get:JsonProperty("status") val status: Order.Status? = null, + @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt index a3dbd5258a11..edfa9cee14bc 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt @@ -21,6 +21,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -43,25 +44,25 @@ import javax.validation.Valid ) interface Pet : Serializable, com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { - + @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") override val name: kotlin.String - + @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") val photoUrls: kotlin.collections.List - + @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") val petType: kotlin.String - + @get:Schema(example = "null", description = "") val id: kotlin.Long? - + @get:Schema(example = "null", description = "") override val category: Category? - + @get:Schema(example = "null", description = "") val tags: kotlin.collections.List? - + @get:Schema(example = "null", description = "") val color: Color? diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt index cce8583e6d59..2f273bfd6e7a 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt @@ -13,6 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -21,8 +22,10 @@ import javax.validation.Valid */ data class Tag( + @Schema(example = "null", description = "") @get:JsonProperty("id") val id: kotlin.Long? = null, + @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt index f24ba91ffb73..c5228476f1de 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt @@ -13,6 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid +import io.swagger.v3.oas.annotations.media.Schema /** * @@ -27,20 +28,28 @@ import javax.validation.Valid */ data class User( + @Schema(example = "null", description = "") @get:JsonProperty("id") val id: kotlin.Long? = null, + @Schema(example = "null", description = "") @get:JsonProperty("username") val username: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("email") val email: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("password") val password: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("phone") val phone: kotlin.String? = null, + @Schema(example = "null", description = "") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : Serializable { From 86257a0293ee5996d8678162b4418de13a9d92f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Sun, 2 Nov 2025 23:27:43 +0100 Subject: [PATCH 17/23] fix --- ...otlin-spring-boot-x-kotlin-implements.yaml | 4 +- .../.openapi-generator/FILES | 1 - .../build.gradle.kts | 2 +- .../pom.xml | 9 +- .../kotlin/org/openapitools/api/PetApi.kt | 199 ++++++++---------- .../kotlin/org/openapitools/api/StoreApi.kt | 95 ++++----- .../kotlin/org/openapitools/api/UserApi.kt | 178 +++++++--------- .../main/kotlin/org/openapitools/model/Cat.kt | 20 +- .../kotlin/org/openapitools/model/Category.kt | 6 +- .../kotlin/org/openapitools/model/Color.kt | 2 +- .../main/kotlin/org/openapitools/model/Dog.kt | 22 +- .../openapitools/model/ModelApiResponse.kt | 8 +- .../kotlin/org/openapitools/model/Order.kt | 14 +- .../main/kotlin/org/openapitools/model/Pet.kt | 23 +- .../main/kotlin/org/openapitools/model/Tag.kt | 6 +- .../kotlin/org/openapitools/model/User.kt | 18 +- 16 files changed, 290 insertions(+), 317 deletions(-) diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml index 68f950dc629e..1d1218b58452 100644 --- a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -4,8 +4,8 @@ library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: - documentationProvider: springdoc - annotationLibrary: swagger2 + documentationProvider: none + annotationLibrary: swagger1 useSwaggerUI: false serviceImplementation: false skipDefaultInterface: true diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES index 649cae2700ab..59aed4399e9f 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES @@ -6,7 +6,6 @@ gradlew gradlew.bat pom.xml settings.gradle -src/main/kotlin/org/openapitools/SpringDocConfiguration.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 diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts index 8873f41c7f4a..10a80f14f0ff 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springdoc:springdoc-openapi-webmvc-core:1.6.8") + implementation("io.swagger:swagger-annotations:1.6.6") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml index 52857830630b..067cb2bbd025 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml @@ -6,6 +6,7 @@ openapi-spring 1.0.0 + 1.6.6 3.0.2 1.3.2 1.6.21 @@ -86,11 +87,11 @@ spring-boot-starter-web - + - org.springdoc - springdoc-openapi-webmvc-core - ${springdoc-openapi.version} + io.swagger + swagger-annotations + ${swagger-annotations.version} 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 d0f991057695..e40570844574 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 @@ -7,11 +7,13 @@ package org.openapitools.api import org.openapitools.model.ModelApiResponse import org.openapitools.model.Pet -import io.swagger.v3.oas.annotations.* -import io.swagger.v3.oas.annotations.enums.* -import io.swagger.v3.oas.annotations.media.* -import io.swagger.v3.oas.annotations.responses.* -import io.swagger.v3.oas.annotations.security.* +import io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam +import io.swagger.annotations.ApiResponse +import io.swagger.annotations.ApiResponses +import io.swagger.annotations.Authorization +import io.swagger.annotations.AuthorizationScope import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -36,147 +38,132 @@ import kotlin.collections.Map @RestController @Validated +@Api(value = "pet", description = "The pet API") interface PetApi { - @Operation( - tags = ["pet",], - summary = "Add a new pet to the store", - operationId = "addPet", - description = """""", - responses = [ - ApiResponse(responseCode = "405", description = "Invalid input") - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + + @ApiOperation( + 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")])]) + @ApiResponses( + value = [ApiResponse(code = 405, message = "Invalid input")]) @RequestMapping( method = [RequestMethod.POST], value = ["/pet"], consumes = ["application/json"] ) - fun addPet(@Parameter(description = "", required = true) @Valid @RequestBody pet: Pet, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["pet",], - summary = "Deletes a pet", - operationId = "deletePet", - description = """""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid pet value") - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + 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")])]) + @ApiResponses( + value = [ApiResponse(code = 400, message = "Invalid pet value")]) @RequestMapping( 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?, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["pet",], - summary = "Finds Pets by status", - operationId = "findPetsByStatus", - description = """Multiple status values can be provided with comma separated strings""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(array = ArraySchema(schema = Schema(implementation = Pet::class)))]), - ApiResponse(responseCode = "400", description = "Invalid status value") - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + 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( + value = "Finds Pets by status", + nickname = "findPetsByStatus", + 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")])]) + @ApiResponses( + 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"] ) - 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, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> - - @Operation( - tags = ["pet",], - summary = "Finds Pets by tags", - operationId = "findPetsByTags", - description = """Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(array = ArraySchema(schema = Schema(implementation = Pet::class)))]), - ApiResponse(responseCode = "400", description = "Invalid tag value") - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + 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( + value = "Finds Pets by tags", + nickname = "findPetsByTags", + 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")])]) + @ApiResponses( + 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"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> - - @Operation( - tags = ["pet",], - summary = "Find pet by ID", - operationId = "getPetById", - description = """Returns a single pet""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Pet::class))]), - ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - ApiResponse(responseCode = "404", description = "Pet not found") - ], - security = [ SecurityRequirement(name = "api_key") ] - ) + 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( + value = "Find pet by ID", + nickname = "getPetById", + notes = "Returns a single pet", + response = Pet::class, + 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")]) @RequestMapping( method = [RequestMethod.GET], value = ["/pet/{petId}"], produces = ["application/json"] ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["pet",], - summary = "Update an existing pet", - operationId = "updatePet", - description = """""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - ApiResponse(responseCode = "404", description = "Pet not found"), - ApiResponse(responseCode = "405", description = "Validation exception") - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + 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")])]) + @ApiResponses( + 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"] ) - fun updatePet(@Parameter(description = "", required = true) @Valid @RequestBody pet: Pet, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["pet",], - summary = "Updates a pet in the store with form data", - operationId = "updatePetWithForm", - description = """""", - responses = [ - ApiResponse(responseCode = "405", description = "Invalid input") - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + 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")])]) + @ApiResponses( + value = [ApiResponse(code = 405, message = "Invalid input")]) @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? , @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["pet",], - summary = "Uploads an image", - operationId = "uploadFile", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = ModelApiResponse::class))]) - ], - security = [ SecurityRequirement(name = "petstore_auth", scopes = [ "write:pets", "read:pets" ]) ] - ) + 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( + value = "Uploads an image", + 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")])]) + @ApiResponses( + 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"] ) - fun uploadFile(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile, @Parameter(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 225c74a8e928..69b2aa749a65 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 @@ -6,11 +6,13 @@ package org.openapitools.api import org.openapitools.model.Order -import io.swagger.v3.oas.annotations.* -import io.swagger.v3.oas.annotations.enums.* -import io.swagger.v3.oas.annotations.media.* -import io.swagger.v3.oas.annotations.responses.* -import io.swagger.v3.oas.annotations.security.* +import io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam +import io.swagger.annotations.ApiResponse +import io.swagger.annotations.ApiResponses +import io.swagger.annotations.Authorization +import io.swagger.annotations.AuthorizationScope import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -35,74 +37,67 @@ import kotlin.collections.Map @RestController @Validated +@Api(value = "store", description = "The store API") interface StoreApi { - @Operation( - tags = ["store",], - summary = "Delete purchase order by ID", - operationId = "deleteOrder", - description = """""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - ApiResponse(responseCode = "404", description = "Order not found") - ] - ) + + @ApiOperation( + value = "Delete purchase order by ID", + nickname = "deleteOrder", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 400, message = "Invalid ID supplied"), ApiResponse(code = 404, message = "Order not found")]) @RequestMapping( method = [RequestMethod.DELETE], value = ["/store/order/{orderId}"] ) - fun deleteOrder(@Parameter(description = "", required = true) @PathVariable("orderId") orderId: kotlin.String, @Parameter(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 - @Operation( - tags = ["store",], - summary = "Returns pet inventories by status", - operationId = "getInventory", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = kotlin.collections.Map::class))]) - ], - security = [ SecurityRequirement(name = "api_key") ] - ) + + @ApiOperation( + value = "Returns pet inventories by status", + nickname = "getInventory", + notes = "", + response = kotlin.Int::class, + responseContainer = "Map", + authorizations = [Authorization(value = "api_key")]) + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation", response = kotlin.collections.Map::class, responseContainer = "Map")]) @RequestMapping( method = [RequestMethod.GET], value = ["/store/inventory"], produces = ["application/json"] ) - fun getInventory(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> + fun getInventory(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity> - @Operation( - tags = ["store",], - summary = "Find purchase order by ID", - operationId = "getOrderById", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]), - ApiResponse(responseCode = "400", description = "Invalid ID supplied"), - ApiResponse(responseCode = "404", description = "Order not found") - ] - ) + + @ApiOperation( + value = "Find purchase order by ID", + nickname = "getOrderById", + notes = "", + 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")]) @RequestMapping( method = [RequestMethod.GET], value = ["/store/order/{orderId}"], produces = ["application/json"] ) - fun getOrderById(@Min(value=1) @Max(value=5) @Parameter(description = "", required = true) @PathVariable("orderId") orderId: kotlin.Int, @Parameter(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 - @Operation( - tags = ["store",], - summary = "Place an order for a pet", - operationId = "placeOrder", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = Order::class))]), - ApiResponse(responseCode = "400", description = "Invalid Order") - ] - ) + + @ApiOperation( + value = "Place an order for a pet", + nickname = "placeOrder", + notes = "", + response = Order::class) + @ApiResponses( + 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"] ) - fun placeOrder(@Parameter(description = "", required = true) @Valid @RequestBody order: Order, @Parameter(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 46d7765f5daa..acf9134e4931 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 @@ -6,11 +6,13 @@ package org.openapitools.api import org.openapitools.model.User -import io.swagger.v3.oas.annotations.* -import io.swagger.v3.oas.annotations.enums.* -import io.swagger.v3.oas.annotations.media.* -import io.swagger.v3.oas.annotations.responses.* -import io.swagger.v3.oas.annotations.security.* +import io.swagger.annotations.Api +import io.swagger.annotations.ApiOperation +import io.swagger.annotations.ApiParam +import io.swagger.annotations.ApiResponse +import io.swagger.annotations.ApiResponses +import io.swagger.annotations.Authorization +import io.swagger.annotations.AuthorizationScope import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.http.ResponseEntity @@ -35,136 +37,118 @@ import kotlin.collections.Map @RestController @Validated +@Api(value = "user", description = "The user API") interface UserApi { - @Operation( - tags = ["user",], - summary = "Create user", - operationId = "createUser", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation") - ] - ) + + @ApiOperation( + value = "Create user", + nickname = "createUser", + notes = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], value = ["/user"], consumes = ["application/json"] ) - fun createUser(@Parameter(description = "", required = true) @Valid @RequestBody user: User, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Creates list of users with given input array", - operationId = "createUsersWithArrayInput", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation") - ] - ) + 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 = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithArray"], consumes = ["application/json"] ) - fun createUsersWithArrayInput(@Parameter(description = "", required = true) @Valid @RequestBody user: kotlin.collections.List, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Creates list of users with given input array", - operationId = "createUsersWithListInput", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation") - ] - ) + 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 = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.POST], value = ["/user/createWithList"], consumes = ["application/json"] ) - fun createUsersWithListInput(@Parameter(description = "", required = true) @Valid @RequestBody user: kotlin.collections.List, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Delete user", - operationId = "deleteUser", - description = """""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid username supplied"), - ApiResponse(responseCode = "404", description = "User not found") - ] - ) + 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 = "") + @ApiResponses( + value = [ApiResponse(code = 400, message = "Invalid username supplied"), ApiResponse(code = 404, message = "User not found")]) @RequestMapping( method = [RequestMethod.DELETE], value = ["/user/{username}"] ) - fun deleteUser(@Parameter(description = "", required = true) @PathVariable("username") username: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Get user by user name", - operationId = "getUserByName", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = User::class))]), - ApiResponse(responseCode = "400", description = "Invalid username supplied"), - ApiResponse(responseCode = "404", description = "User not found") - ] - ) + 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) + @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")]) @RequestMapping( method = [RequestMethod.GET], value = ["/user/{username}"], produces = ["application/json"] ) - fun getUserByName(@Parameter(description = "", required = true) @PathVariable("username") username: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Logs user into the system", - operationId = "loginUser", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation", content = [Content(schema = Schema(implementation = kotlin.String::class))]), - ApiResponse(responseCode = "400", description = "Invalid username/password supplied") - ] - ) + 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) + @ApiResponses( + 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"] ) - fun loginUser(@NotNull @Parameter(description = "", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String, @Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Logs out current logged in user session", - operationId = "logoutUser", - description = """""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation") - ] - ) + 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 = "") + @ApiResponses( + value = [ApiResponse(code = 200, message = "successful operation")]) @RequestMapping( method = [RequestMethod.GET], value = ["/user/logout"] ) - fun logoutUser(@Parameter(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity - - @Operation( - tags = ["user",], - summary = "Updated user", - operationId = "updateUser", - description = """""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid user supplied"), - ApiResponse(responseCode = "404", description = "User not found") - ] - ) + fun logoutUser(@ApiParam(hidden = true) request: javax.servlet.http.HttpServletRequest): ResponseEntity + + + @ApiOperation( + value = "Updated user", + nickname = "updateUser", + notes = "") + @ApiResponses( + 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"] ) - fun updateUser(@Parameter(description = "", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "", required = true) @Valid @RequestBody user: User, @Parameter(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 } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt index e3b435adf73f..ae9af1b803df 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt @@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -28,34 +28,34 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class Cat( - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("name", required = true) override val name: kotlin.String, - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("age") val age: kotlin.Int? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("category") override val category: Category? = null, @field:Valid - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("color") override val color: Color? = null ) : Pet, Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt index a21c40b744ae..840851411bef 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -22,10 +22,10 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class Category( - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("id") val id: kotlin.Long? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("name") val name: kotlin.String? = null ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt index a6e4e8c70d4b..8be96cf72e17 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt index 446bce5bed73..cce5e8da3c12 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt @@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -29,37 +29,37 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class Dog( - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("breed", required = true) val breed: Dog.Breed, - @Schema(example = "null", required = true, description = "Whether the dog enjoys fetching") + @ApiModelProperty(example = "null", required = true, value = "Whether the dog enjoys fetching") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("name", required = true) override val name: kotlin.String, - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, - @Schema(example = "null", required = true, description = "") + @ApiModelProperty(example = "null", required = true, value = "") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("category") override val category: Category? = null, @field:Valid - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("color") override val color: Color? = null ) : Pet, Serializable, com.some.pack.Fetchable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 81a904c85123..adb4e8fb2fc1 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -23,13 +23,13 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class ModelApiResponse( - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("code") val code: kotlin.Int? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("type") val type: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("message") val message: kotlin.String? = null ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt index 0fe053faa9cf..b6ddad1d9c75 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -28,22 +28,22 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class Order( - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("id") val id: kotlin.Long? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("petId") val petId: kotlin.Long? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("status") val status: Order.Status? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt index edfa9cee14bc..a6a17770db12 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt @@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -44,25 +44,32 @@ import io.swagger.v3.oas.annotations.media.Schema ) interface Pet : Serializable, com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { - @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") + + @get:ApiModelProperty(example = "null", required = true, value = "") override val name: kotlin.String - @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") + + @get:ApiModelProperty(example = "null", required = true, value = "") val photoUrls: kotlin.collections.List - @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") + + @get:ApiModelProperty(example = "null", required = true, value = "") val petType: kotlin.String - @get:Schema(example = "null", description = "") + + @get:ApiModelProperty(example = "null", value = "") val id: kotlin.Long? - @get:Schema(example = "null", description = "") + + @get:ApiModelProperty(example = "null", value = "") override val category: Category? - @get:Schema(example = "null", description = "") + + @get:ApiModelProperty(example = "null", value = "") val tags: kotlin.collections.List? - @get:Schema(example = "null", description = "") + + @get:ApiModelProperty(example = "null", value = "") val color: Color? diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt index 2f273bfd6e7a..23d0f3191596 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -22,10 +22,10 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class Tag( - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("id") val id: kotlin.Long? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("name") val name: kotlin.String? = null ) : Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt index c5228476f1de..9399e70b2527 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern import javax.validation.constraints.Size import javax.validation.Valid -import io.swagger.v3.oas.annotations.media.Schema +import io.swagger.annotations.ApiModelProperty /** * @@ -28,28 +28,28 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class User( - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("id") val id: kotlin.Long? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("username") val username: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("email") val email: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("password") val password: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("phone") val phone: kotlin.String? = null, - @Schema(example = "null", description = "") + @ApiModelProperty(example = "null", value = "") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : Serializable { From 063be844e055447e80e47bc38a37da1b20d9f1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 3 Nov 2025 07:14:20 +0100 Subject: [PATCH 18/23] fix --- .../openapitools/SpringDocConfiguration.kt | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt deleted file mode 100644 index bd3b91551d61..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt +++ /dev/null @@ -1,42 +0,0 @@ -package org.openapitools - -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration - -import io.swagger.v3.oas.models.OpenAPI -import io.swagger.v3.oas.models.info.Info -import io.swagger.v3.oas.models.info.Contact -import io.swagger.v3.oas.models.info.License -import io.swagger.v3.oas.models.Components -import io.swagger.v3.oas.models.security.SecurityScheme - -@Configuration -class SpringDocConfiguration { - - @Bean - fun apiInfo(): OpenAPI { - return OpenAPI() - .info( - Info() - .title("OpenAPI Petstore") - .description("This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. ") - .license( - License() - .name("Apache-2.0") - .url("https://www.apache.org/licenses/LICENSE-2.0.html") - ) - .version("1.0.0") - ) - .components( - Components() - .addSecuritySchemes("petstore_auth", SecurityScheme() - .type(SecurityScheme.Type.OAUTH2) - ) - .addSecuritySchemes("api_key", SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .`in`(SecurityScheme.In.HEADER) - .name("api_key") - ) - ) - } -} From f81959f23dc9281c8a7c4c8faab0c8c2f6c23a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 3 Nov 2025 08:05:37 +0100 Subject: [PATCH 19/23] fix output folder naming. Add the sample to github action config file. --- .github/workflows/samples-kotlin-server.yaml | 1 + ...-boot-include-http-request-context-delegate.yaml | 2 +- .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 0 .../README.md | 0 .../build.gradle.kts | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../pom.xml | 0 .../settings.gradle | 0 .../src/main/kotlin/org/openapitools/Application.kt | 0 .../src/main/kotlin/org/openapitools/api/ApiUtil.kt | 0 .../src/main/kotlin/org/openapitools/api/PetApi.kt | 0 .../kotlin/org/openapitools/api/PetApiController.kt | 0 .../kotlin/org/openapitools/api/PetApiDelegate.kt | 0 .../main/kotlin/org/openapitools/api/StoreApi.kt | 0 .../org/openapitools/api/StoreApiController.kt | 0 .../kotlin/org/openapitools/api/StoreApiDelegate.kt | 0 .../src/main/kotlin/org/openapitools/api/UserApi.kt | 0 .../org/openapitools/api/UserApiController.kt | 0 .../kotlin/org/openapitools/api/UserApiDelegate.kt | 0 .../configuration/EnumConverterConfiguration.kt | 0 .../src/main/kotlin/org/openapitools/model/Cat.kt | 0 .../main/kotlin/org/openapitools/model/Category.kt | 0 .../src/main/kotlin/org/openapitools/model/Color.kt | 0 .../src/main/kotlin/org/openapitools/model/Dog.kt | 0 .../org/openapitools/model/ModelApiResponse.kt | 0 .../src/main/kotlin/org/openapitools/model/Order.kt | 0 .../src/main/kotlin/org/openapitools/model/Pet.kt | 0 .../src/main/kotlin/org/openapitools/model/Tag.kt | 0 .../src/main/kotlin/org/openapitools/model/User.kt | 0 .../src/main/resources/application.yaml | 0 35 files changed, 3 insertions(+), 1 deletion(-) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/.openapi-generator-ignore (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/.openapi-generator/FILES (98%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/.openapi-generator/VERSION (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/README.md (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/build.gradle.kts (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/gradle/wrapper/gradle-wrapper.jar (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/gradle/wrapper/gradle-wrapper.properties (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/gradlew (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/gradlew.bat (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/pom.xml (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/settings.gradle (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/Application.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/ApiUtil.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/PetApi.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/PetApiController.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/StoreApi.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/StoreApiController.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/UserApi.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/UserApiController.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Cat.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Category.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Color.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Dog.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Order.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Pet.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/Tag.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/kotlin/org/openapitools/model/User.kt (100%) rename samples/server/petstore/{kotlin-springboot-include-http-request-context-delegate.yaml => kotlin-springboot-include-http-request-context-delegate}/src/main/resources/application.yaml (100%) diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml index 8550a29ac419..5b6f3f0a0884 100644 --- a/.github/workflows/samples-kotlin-server.yaml +++ b/.github/workflows/samples-kotlin-server.yaml @@ -39,6 +39,7 @@ jobs: - samples/server/petstore/kotlin-springboot-source-swagger2 - samples/server/petstore/kotlin-springboot-springfox - samples/server/petstore/kotlin-springboot-x-kotlin-implements + - samples/server/petstore/kotlin-springboot-include-http-request-context-delegate - samples/server/petstore/kotlin-server/ktor - samples/server/petstore/kotlin-server/ktor2 - samples/server/petstore/kotlin-server/jaxrs-spec diff --git a/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml b/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml index 84e768d6359f..e8b7eabf1c1c 100644 --- a/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml +++ b/bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml @@ -1,5 +1,5 @@ generatorName: kotlin-spring -outputDir: samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml +outputDir: samples/server/petstore/kotlin-springboot-include-http-request-context-delegate library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator-ignore similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator-ignore rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator-ignore diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES similarity index 98% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/FILES rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES index 8b73d6497e4f..92591fd5d8a1 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES @@ -1,3 +1,4 @@ +.openapi-generator-ignore README.md build.gradle.kts gradle/wrapper/gradle-wrapper.jar diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/VERSION similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/.openapi-generator/VERSION rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/VERSION diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/README.md b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/README.md similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/README.md rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/README.md diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/build.gradle.kts b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/build.gradle.kts similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/build.gradle.kts rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/build.gradle.kts diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.jar rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.properties b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradle/wrapper/gradle-wrapper.properties rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradlew similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradlew diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew.bat b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradlew.bat similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/gradlew.bat rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/gradlew.bat diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/pom.xml b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/pom.xml similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/pom.xml rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/pom.xml diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/settings.gradle b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/settings.gradle similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/settings.gradle rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/settings.gradle diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/Application.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/Application.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/Application.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/ApiUtil.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/ApiUtil.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/ApiUtil.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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 similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApi.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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 similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiController.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiController.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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 similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApi.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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 similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiController.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiController.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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 similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApi.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/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 similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiController.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiController.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Cat.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Category.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Color.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Color.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Color.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Color.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Dog.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Order.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Pet.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Pet.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Pet.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/Tag.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/kotlin/org/openapitools/model/User.kt rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/resources/application.yaml similarity index 100% rename from samples/server/petstore/kotlin-springboot-include-http-request-context-delegate.yaml/src/main/resources/application.yaml rename to samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/resources/application.yaml From 192ee1d597965700393f215b7498eac815ebc4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 3 Nov 2025 08:14:27 +0100 Subject: [PATCH 20/23] add missing interfaces to fix compilation --- .../src/main/kotlin/com/some/pack/Fetchable.kt | 6 ++++++ .../src/main/kotlin/com/some/pack/Named.kt | 6 ++++++ .../src/main/kotlin/com/some/pack/WithCategory.kt | 6 ++++++ .../main/kotlin/com/some/pack/WithDefaultMethods.kt | 12 ++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Fetchable.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Named.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithCategory.kt create mode 100644 samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithDefaultMethods.kt diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Fetchable.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Fetchable.kt new file mode 100644 index 000000000000..b8680298a112 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Fetchable.kt @@ -0,0 +1,6 @@ +package com.some.pack + +interface Fetchable { + + val likesFetch: Boolean +} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Named.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Named.kt new file mode 100644 index 000000000000..2107a8487406 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/Named.kt @@ -0,0 +1,6 @@ +package com.some.pack + +interface Named { + + val name: String +} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithCategory.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithCategory.kt new file mode 100644 index 000000000000..6689da898885 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithCategory.kt @@ -0,0 +1,6 @@ +package com.some.pack + +interface WithCategory { + + val category: org.openapitools.model.Category? +} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithDefaultMethods.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithDefaultMethods.kt new file mode 100644 index 000000000000..34acc9513573 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/com/some/pack/WithDefaultMethods.kt @@ -0,0 +1,12 @@ +package com.some.pack + +interface WithDefaultMethods { + + fun defaultMethodOne(): String { + return "defaultOne" + } + + fun defaultMethodTwo(): Int { + return 2 + } +} \ No newline at end of file From 2c1e84ade083a40f6a4761a17192532528ad5b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 3 Nov 2025 08:30:14 +0100 Subject: [PATCH 21/23] regenerate samples --- .../.openapi-generator/FILES | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES index 92591fd5d8a1..8b73d6497e4f 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md build.gradle.kts gradle/wrapper/gradle-wrapper.jar From 38300b2a1ca6c601c852311484326f60379226da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 3 Nov 2025 08:58:08 +0100 Subject: [PATCH 22/23] fix also api_test.mustache to enable testing --- .../src/main/resources/kotlin-spring/api_test.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 bf35157acc97..32b1134d7e46 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 @@ -29,7 +29,8 @@ class {{classname}}Test { {{#allParams}} val {{{paramName}}}: {{>optionalDataType}} = TODO() {{/allParams}} - val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/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}}) // TODO: test validations } From 64d171a74337a1b743c2fe04b9213e256b3cd529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 3 Nov 2025 09:41:54 +0100 Subject: [PATCH 23/23] add tests for generated tests --- .../spring/KotlinSpringServerCodegenTest.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) 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 4f2ac26d55af..5fc8f8800fd4 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 @@ -1499,6 +1499,75 @@ public void nonReactiveWithHttpRequestContextInterfaceOnlyAnnotationNoneNoDelega ); } + @Test + public void nonReactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegateWithApiTests() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, false, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, false + ), Map.of( + CodegenConstants.MODELS, "false", + CodegenConstants.MODEL_TESTS, "false", + CodegenConstants.MODEL_DOCS, "false", + CodegenConstants.APIS, "true", + CodegenConstants.API_TESTS, "true", + CodegenConstants.SUPPORTING_FILES, "false" + )); + 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"), + 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( + "val request: javax.servlet.http.HttpServletRequest = TODO()", + "api.deletePet(petId, apiKey, request)"), + root.resolve("src/test/kotlin/org/openapitools/api/UserApiTest.kt"), List.of( + "val request: javax.servlet.http.HttpServletRequest = TODO()", + "api.logoutUser(request)") + ) + ); + } + + + @Test + public void reactiveWithHttpRequestContextControllerImplAnnotationNoneNoDelegateWithApiTests() throws Exception { + Path root = generateApiSources(Map.of( + KotlinSpringServerCodegen.INCLUDE_HTTP_REQUEST_CONTEXT, true, + KotlinSpringServerCodegen.REACTIVE, true, + KotlinSpringServerCodegen.DOCUMENTATION_PROVIDER, "none", + KotlinSpringServerCodegen.ANNOTATION_LIBRARY, "none", + KotlinSpringServerCodegen.INTERFACE_ONLY, false, + KotlinSpringServerCodegen.DELEGATE_PATTERN, false + ), Map.of( + CodegenConstants.MODELS, "false", + CodegenConstants.MODEL_TESTS, "false", + CodegenConstants.MODEL_DOCS, "false", + CodegenConstants.APIS, "true", + CodegenConstants.API_TESTS, "true", + CodegenConstants.SUPPORTING_FILES, "false" + )); + 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"), + 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( + "val exchange: org.springframework.web.server.ServerWebExchange = TODO()", + "api.deletePet(petId, apiKey, exchange)"), + root.resolve("src/test/kotlin/org/openapitools/api/UserApiTest.kt"), List.of( + "val exchange: org.springframework.web.server.ServerWebExchange = TODO()", + "api.logoutUser(exchange)") + ) + ); + } + @Test public void nonReactiveWithoutHttpRequestContextInterfaceOnlyAnnotationNoneNoDelegate() throws Exception { Path root = generateApiSources(Map.of(