From 184b96bc8bdd05e3e314c3e5f732bcad962264a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 10 Sep 2025 17:21:18 +0200 Subject: [PATCH 01/20] add basic implementation and tests --- .../languages/AbstractKotlinCodegen.java | 8 +- .../kotlin-spring/dataClass.mustache | 29 +- .../spring/KotlinSpringServerCodegenTest.java | 73 +- .../petstore-with-x-kotlin-implements.yaml | 789 ++++++++++++++++++ 4 files changed, 895 insertions(+), 4 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 12c333ca1848..8751a4df27d7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -835,6 +835,10 @@ protected boolean needToImport(String type) { @Override public CodegenModel fromModel(String name, Schema schema) { CodegenModel m = super.fromModel(name, schema); + List implementedInterfacesClasses = (List) m.getVendorExtensions().getOrDefault("x-kotlin-implements", List.of()); + List implementedInterfacesFields = implementedInterfacesClasses.isEmpty() + ? List.of() + : (List) m.getVendorExtensions().getOrDefault("x-kotlin-implements-fields", List.of()); m.optionalVars = m.optionalVars.stream().distinct().collect(Collectors.toList()); // Update allVars/requiredVars/optionalVars with isInherited // Each of these lists contains elements that are similar, but they are all cloned @@ -850,7 +854,9 @@ public CodegenModel fromModel(String name, Schema schema) { // Update any other vars (requiredVars, optionalVars) Stream.of(m.requiredVars, m.optionalVars) .flatMap(List::stream) - .filter(p -> allVarsMap.containsKey(p.baseName)) + .filter(p -> allVarsMap.containsKey(p.baseName) + || implementedInterfacesFields.contains(p.baseName) + ) .forEach(p -> p.isInherited = true); return m; } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache index 5d066ded7598..8a4f7a4a79f2 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache @@ -17,7 +17,34 @@ {{/-last}}{{/requiredVars}}{{#hasRequired}}{{#hasOptional}}, {{/hasOptional}}{{/hasRequired}}{{#optionalVars}}{{>dataClassOptVar}}{{^-last}}, {{/-last}}{{/optionalVars}} - ) {{/discriminator}}{{#parent}}: {{{.}}}{{#serializableModel}}, Serializable{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}: Serializable{{/serializableModel}}{{/parent}}{ +){{/discriminator}}{{! no newline +}}{{#parent}} : {{{.}}}{{! no newline + }}{{#serializableModel}}{{! no newline + }}{{^vendorExtensions.x-kotlin-implements}}, Serializable{{/vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{#vendorExtensions.x-kotlin-implements}}, Serializable, {{! no newline + }}{{#-first}} {{{.}}}{{/-first}}{{! no newline + }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline + }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{/serializableModel}}{{! no newline + }}{{^serializableModel}}{{! no newline + }}{{#vendorExtensions.x-kotlin-implements}}, {{{.}}}{{/vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{/serializableModel}}{{! no newline +}}{{/parent}}{{! no newline +}}{{^parent}}{{! no newline + }}{{#serializableModel}}{{! no newline + }}{{^vendorExtensions.x-kotlin-implements}} : Serializable{{/vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{#vendorExtensions.x-kotlin-implements}} : Serializable, {{! no newline + }}{{#-first}}{{{.}}}{{/-first}}{{! no newline + }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline + }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{/serializableModel}}{{! no newline + }}{{^serializableModel}}{{! no newline + }}{{#vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{#-first}} : {{{.}}}{{/-first}}{{! no newline + }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline + }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{/serializableModel}}{{! no newline +}}{{/parent}} { {{#discriminator}} {{#requiredVars}} {{>interfaceReqVar}}{{! prevent indent}} 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 f2ce3c3adeb7..8ffe84a516ea 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 @@ -946,10 +946,79 @@ public void generateSerializableModel() throws Exception { generator.opts(input).generate(); + Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Pet.kt"); assertFileContains( - Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Pet.kt"), + path, "import java.io.Serializable", - ") : Serializable{", + ") : Serializable {", + "private const val serialVersionUID: kotlin.Long = 1" + ); + } + @Test + public void generateSerializableModelWithXimplements() 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(CodegenConstants.SERIALIZABLE_MODEL, true); + + 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/Pet.kt"); + assertFileContains( + path, + "import java.io.Serializable", + "@get:JsonProperty(\"name\", required = true) override val name: kotlin.String,", + ") : Serializable, com.some.package.Named {", + "private const val serialVersionUID: kotlin.Long = 1" + ); + } + + @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/Pet.kt"); + assertFileContains( + path, + "@get:JsonProperty(\"name\", required = true) override val name: kotlin.String,", + ") : com.some.package.Named {" + ); + assertFileNotContains( + path, + "import java.io.Serializable", + ") : Serializable, com.some.package.Named{", "private const val serialVersionUID: kotlin.Long = 1" ); } diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml new file mode 100644 index 000000000000..f5f942f27e67 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml @@ -0,0 +1,789 @@ +openapi: 3.0.0 +servers: + - url: 'http://petstore.swagger.io/v2' +info: + description: >- + This is a sample server Petstore server. For this sample, you can use the api key + `special-key` to test the authorization filters. + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +paths: + /pet: + post: + tags: + - pet + summary: Add a new pet to the store + description: '' + operationId: addPet + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + put: + tags: + - pet + summary: Update an existing pet + description: '' + operationId: updatePet + externalDocs: + url: "http://petstore.swagger.io/v2/doc/updatePet" + description: "API documentation for the updatePet operation" + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + '405': + description: Validation exception + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + deprecated: true + schema: + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid status value + security: + - petstore_auth: + - 'read:pets' + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: >- + Multiple tags can be provided with comma separated strings. Use tag1, + tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid tag value + security: + - petstore_auth: + - 'read:pets' + deprecated: true + '/pet/{petId}': + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + description: '' + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + responses: + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + application/x-www-form-urlencoded: + schema: + type: object + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + delete: + tags: + - pet + summary: Deletes a pet + description: '' + operationId: deletePet + parameters: + - name: api_key + in: header + required: false + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '400': + description: Invalid pet value + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + '/pet/{petId}/uploadImage': + post: + tags: + - pet + summary: uploads an image + description: '' + operationId: uploadFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + type: string + format: binary + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + '200': + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + description: '' + operationId: placeOrder + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid Order + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + '/store/order/{orderId}': + get: + tags: + - store + summary: Find purchase order by ID + description: >- + For valid response try integer IDs with value <= 5 or > 10. Other values + will generate exceptions + operationId: getOrderById + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + schema: + type: integer + format: int64 + minimum: 1 + maximum: 5 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid ID supplied + '404': + description: Order not found + delete: + tags: + - store + summary: Delete purchase order by ID + description: >- + For valid response try integer IDs with value < 1000. Anything above + 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid ID supplied + '404': + description: Order not found + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithArrayInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithListInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/login: + get: + tags: + - user + summary: Logs user into the system + description: '' + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + '200': + description: successful operation + headers: + Set-Cookie: + description: >- + Cookie authentication key for use with the `api_key` + apiKey authentication. + schema: + type: string + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when token expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + '400': + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: '' + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + '/user/{username}': + get: + tags: + - user + summary: Get user by user name + description: '' + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + '400': + description: Invalid username supplied + '404': + description: User not found + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid user supplied + '404': + description: User not found + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid username supplied + '404': + description: User not found + security: + - api_key: [] + /fake/annotations: + post: + tags: + - fake + summary: annotate + operationId: annotations + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Annotation' + responses: + '200': + description: OK +externalDocs: + description: Find out more about Swagger + url: 'http://swagger.io' +components: + requestBodies: + UserArray: + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + scopes: + 'write:pets': modify pets in your account + 'read:pets': read your pets + api_key: + type: apiKey + name: api_key + in: header + schemas: + Order: + title: Pet Order + description: An order for a pets from the pet store + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + xml: + name: Order + Category: + title: Pet category + description: A category for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + xml: + name: Category + User: + title: a User + description: A User who is purchasing from the pet store + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + format: int32 + description: User Status + xml: + name: User + required: + - username + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + x-kotlin-implements: [ 'com.some.package.Named' ] + x-kotlin-implements-fields: [ name ] + title: a Pet + description: A pet for sale in the pet store + type: object + required: + - name + - photoUrls + properties: + id: + type: integer + format: int64 + category: + $ref: '#/components/schemas/Category' + name: + x-implements-field: true + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/components/schemas/Tag' + status: + type: string + description: pet status in the store + deprecated: true + enum: + - available + - pending + - sold + xml: + name: Pet + ApiResponse: + title: An uploaded response + description: Describes the result of uploading an image resource + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string + Annotation: + type: object + properties: + id: + type: string + format: uuid + UserOrPet: + oneOf: + - $ref: "#/components/schemas/User" + - $ref: "#/components/schemas/Pet" + UserOrPetOrArrayString: + oneOf: + - $ref: "#/components/schemas/User" + - $ref: "#/components/schemas/Pet" + - type: array + items: + type: string + AnyOfUserOrPet: + anyOf: + - $ref: "#/components/schemas/User" + - $ref: "#/components/schemas/Pet" + AnyOfUserOrPetOrArrayString: + anyOf: + - $ref: "#/components/schemas/User" + - $ref: "#/components/schemas/Pet" + - type: array + items: + type: string From acda457ec2f13b8e3336c7b470a9d564fbd22351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 10 Sep 2025 17:24:53 +0200 Subject: [PATCH 02/20] improve test a bit --- .../codegen/kotlin/spring/KotlinSpringServerCodegenTest.java | 1 + 1 file changed, 1 insertion(+) 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 8ffe84a516ea..3626d87e32cb 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 @@ -1019,6 +1019,7 @@ public void generateNonSerializableModelWithXimplements() throws Exception { path, "import java.io.Serializable", ") : Serializable, com.some.package.Named{", + ") : Serializable {", "private const val serialVersionUID: kotlin.Long = 1" ); } From 1f89defed0f1cf2adccf04fba19ea64f3adf0bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 10 Sep 2025 17:31:44 +0200 Subject: [PATCH 03/20] modify kotlin-spring.md --- docs/generators/kotlin-spring.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 195c51460ef6..47099978d12f 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -67,6 +67,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |x-discriminator-value|Used with model inheritance to specify value for discriminator that identifies current model|MODEL| |x-field-extra-annotation|List of custom annotations to be added to property|FIELD, OPERATION_PARAMETER|null |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null +|x-kotlin-implements|Ability to specify interfaces that model must implement.|MODEL|empty array +|x-kotlin-implements-fields|Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`.|MODEL|empty array ## IMPORT MAPPING From eb4da41de6ea7592ee2673c4f7bd135b9bbc51c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Wed, 10 Sep 2025 22:09:00 +0200 Subject: [PATCH 04/20] add x-kotlin-implements also to enum --- .../src/main/resources/kotlin-spring/enumClass.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache index afdc7a8d68d6..1d13a1f8432a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache @@ -2,7 +2,7 @@ * {{{description}}} * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} */ -enum class {{classname}}(@get:JsonValue val value: {{dataType}}) { +enum class {{classname}}(@get:JsonValue val value: {{dataType}}) {{#vendorExtensions.x-kotlin-implements}}{{#-first}}: {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-kotlin-implements}}{ {{#allowableValues}}{{#enumVars}} {{&name}}({{{value}}}){{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}; From 2cfd787ef709c150a8983429552265e6ba388406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 11 Sep 2025 09:53:04 +0200 Subject: [PATCH 05/20] update samples & properly define implemented vendor extension --- .../src/main/java/org/openapitools/codegen/VendorExtension.java | 2 ++ .../codegen/languages/KotlinSpringServerCodegen.java | 2 ++ .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Annotation.kt | 2 +- .../src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt | 2 +- .../org/openapitools/model/AnyOfUserOrPetOrArrayString.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/UserOrPet.kt | 2 +- .../kotlin/org/openapitools/model/UserOrPetOrArrayString.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Apa.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ApiError.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../org/openapitools/model/MultipartMixedRequestMarker.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Animal.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Cat.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Client.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Dog.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Foo.kt | 2 +- .../main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Category.kt | 2 +- .../src/main/kotlin/org/openapitools/model/ModelApiResponse.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Order.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../src/main/kotlin/org/openapitools/model/User.kt | 2 +- 94 files changed, 96 insertions(+), 92 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java index fe97b12695fb..e957659b32e2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java @@ -10,6 +10,8 @@ public enum VendorExtension { X_IMPLEMENTS("x-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implements", "empty array"), + X_KOTLIN_IMPLEMENTS("x-kotlin-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implements", "empty array"), + X_KOTLIN_IMPLEMENTS_FIELDS("x-kotlin-implements-fields", ExtensionLevel.MODEL, "Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`", "empty array"), X_SPRING_PAGINATED("x-spring-paginated", ExtensionLevel.OPERATION, "Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.", "false"), X_SPRING_PROVIDE_ARGS("x-spring-provide-args", ExtensionLevel.OPERATION, "Allows adding additional hidden parameters in the API specification to allow access to content such as header values or properties", "empty array"), X_DISCRIMINATOR_VALUE("x-discriminator-value", ExtensionLevel.MODEL, "Used with model inheritance to specify value for discriminator that identifies current model", ""), 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 d096e90cdcb2..43b849998f25 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 @@ -1012,6 +1012,8 @@ public List getSupportedVendorExtensions() { extensions.add(VendorExtension.X_DISCRIMINATOR_VALUE); extensions.add(VendorExtension.X_FIELD_EXTRA_ANNOTATION); extensions.add(VendorExtension.X_PATTERN_MESSAGE); + extensions.add(VendorExtension.X_KOTLIN_IMPLEMENTS); + extensions.add(VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS); return extensions; } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt index 2db415c931c0..98a854a51b39 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt @@ -25,7 +25,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index bf5b0e470981..f520047d850d 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,7 +27,7 @@ data class ModelApiResponse( @get:JsonProperty("type") val type: kotlin.String? = null, @get:JsonProperty("message") val message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt index 8defd87ff6e9..4ebe51e765ed 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt @@ -38,7 +38,7 @@ data class Order( @get:JsonProperty("status") val status: Order.Status? = null, @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt index 5ee645c0706e..2f7be6be5cec 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt @@ -43,7 +43,7 @@ data class Pet( @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt index 4977cb040511..36f841600047 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,7 +24,7 @@ data class Tag( @get:JsonProperty("id") val id: kotlin.Long? = null, @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt index b6d34aa6f694..b04c9e312592 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt @@ -42,7 +42,7 @@ data class User( @get:JsonProperty("phone") val phone: kotlin.String? = null, @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt index abaf9f657c19..fbe2546e842b 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt @@ -22,7 +22,7 @@ data class Annotation( @Schema(example = "null", description = "") @get:JsonProperty("id") val id: java.util.UUID? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt index a335ebada030..2e2b228abcb3 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt @@ -79,7 +79,7 @@ data class AnyOfUserOrPet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: AnyOfUserOrPet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt index 4d5ace6c4f26..926a00f8a5e5 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt @@ -79,7 +79,7 @@ data class AnyOfUserOrPetOrArrayString( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: AnyOfUserOrPetOrArrayString.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt index f64734a0fa27..4f5e1ae1bcd4 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 130d334355ee..29636f4bad1e 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -30,7 +30,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt index e31b7557a271..5225690f54ba 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt @@ -44,7 +44,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) { +) { /** * Order Status diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt index 91067599fe25..963d5c056403 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt index b35add1c83ac..179b6d27b5c4 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,7 +26,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt index 61339293a062..afae2dbbf1fa 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt @@ -50,7 +50,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt index 1f849c4fe6dd..b4e44ad9fc3a 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPet.kt @@ -79,7 +79,7 @@ data class UserOrPet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: UserOrPet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt index e1bb175af301..929d8d32d286 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/UserOrPetOrArrayString.kt @@ -79,7 +79,7 @@ data class UserOrPetOrArrayString( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: UserOrPetOrArrayString.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt index d89e27f89546..50cfbcf80623 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt @@ -25,7 +25,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index d89135af2f8d..4d12f23ba411 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,7 +27,7 @@ data class ModelApiResponse( @get:JsonProperty("type") val type: kotlin.String? = null, @get:JsonProperty("message") val message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt index 619528dcea4a..bee507c64e65 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt @@ -38,7 +38,7 @@ data class Order( @get:JsonProperty("status") val status: Order.Status? = null, @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt index 24edd25b7180..e78365b47814 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt @@ -43,7 +43,7 @@ data class Pet( @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt index 2093a67f4b36..bee0b3c419dd 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,7 +24,7 @@ data class Tag( @get:JsonProperty("id") val id: kotlin.Long? = null, @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt index cefb33522a33..df4b7c3b5883 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt @@ -42,7 +42,7 @@ data class User( @get:JsonProperty("phone") val phone: kotlin.String? = null, @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt index c9bbcb4c0d1e..1277bb029783 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt @@ -43,7 +43,7 @@ data class Apa( @Schema(example = "null", description = "") @get:JsonProperty("gepa") val gepa: java.math.BigDecimal? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt index ad519ddd263d..fe6df76075ec 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index fddef14ee1f8..5c9e5e3de7ff 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -30,7 +30,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt index 49619dcb8544..f6fd42546c7c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt @@ -44,7 +44,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) { +) { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt index fbf16ce5bbc0..a107c48f16be 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt index 6a26ec198dd9..73b86b861f5a 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,7 +26,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt index 1bdef782439b..14ce728a1e49 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt @@ -50,7 +50,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt index f64734a0fa27..4f5e1ae1bcd4 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 130d334355ee..29636f4bad1e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -30,7 +30,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt index e31b7557a271..5225690f54ba 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -44,7 +44,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) { +) { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index 91067599fe25..963d5c056403 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index b35add1c83ac..179b6d27b5c4 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,7 +26,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt index b8612151182d..c51087a6f57e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -50,7 +50,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt index 07180a007ac4..b4c348328e47 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt @@ -27,7 +27,7 @@ data class ApiError( @field:Valid @get:JsonProperty("reasonCode") val reasonCode: ReasonCode? = null - ) { +) { /** * diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt index c461236ba92a..5df427d75794 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @Schema(example = "null", description = "") @get:JsonProperty("name") var name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 1b0e48b1b18a..e504e4f5221b 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -31,7 +31,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") var message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt index 7eda583a9aa2..e75d0e40cdcf 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt @@ -45,7 +45,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") var complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt index 2d8a9e614552..7f59bf951d8f 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @get:JsonProperty("status") var status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt index 22870b8f00b3..fc7c99144cad 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt @@ -27,7 +27,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") var name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt index ad66ce80c7ce..acf3fff184a9 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt @@ -51,7 +51,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") var userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt index 284dcac560fc..ec1d852f4e9c 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt @@ -22,7 +22,7 @@ data class MultipartMixedRequestMarker( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt index f64734a0fa27..4f5e1ae1bcd4 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 130d334355ee..29636f4bad1e 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -30,7 +30,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt index e31b7557a271..5225690f54ba 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt @@ -44,7 +44,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) { +) { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt index 91067599fe25..963d5c056403 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt index b35add1c83ac..179b6d27b5c4 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,7 +26,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt index b8612151182d..c51087a6f57e 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt @@ -50,7 +50,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt index f64734a0fa27..4f5e1ae1bcd4 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 130d334355ee..29636f4bad1e 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -30,7 +30,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt index e31b7557a271..5225690f54ba 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt @@ -44,7 +44,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) { +) { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt index 91067599fe25..963d5c056403 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @get:JsonProperty("status") val status: Pet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt index b35add1c83ac..179b6d27b5c4 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,7 +26,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt index b8612151182d..c51087a6f57e 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt @@ -50,7 +50,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt index aab459aa9b9c..c65f0ca8ac6a 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Animal.kt @@ -32,7 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema JsonSubTypes.Type(value = Dog::class, name = "DOG") ) -interface Animal{ +interface Animal { @get:Schema(example = "null", requiredMode = Schema.RequiredMode.REQUIRED, description = "") val className: kotlin.String diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt index 99bd7012b47d..55337a40dfc2 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt @@ -29,7 +29,7 @@ data class Cat( @Schema(example = "null", description = "") @get:JsonProperty("color") override val color: kotlin.String? = "red" - ) : Animal{ +) : Animal { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt index 3836efee92f5..a900b0267637 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,7 +26,7 @@ data class Category( @Schema(example = "null", description = "") @get:JsonProperty("id") val id: kotlin.Long? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt index c56244d61881..c235e7f12d12 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt @@ -22,7 +22,7 @@ data class Client( @Schema(example = "null", description = "") @get:JsonProperty("client") val client: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt index 77f347e67676..62085ab06dfe 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt @@ -29,7 +29,7 @@ data class Dog( @Schema(example = "null", description = "") @get:JsonProperty("color") override val color: kotlin.String? = "red" - ) : Animal{ +) : Animal { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt index 99d69f31d3b6..04e8d84844d6 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt @@ -22,7 +22,7 @@ data class Foo( @Schema(example = "null", description = "") @get:JsonProperty("bar") val bar: kotlin.String? = "bar" - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt index e03f67824777..8b422b6fd292 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt @@ -24,7 +24,7 @@ data class FooGetDefaultResponse( @field:Valid @Schema(example = "null", description = "") @get:JsonProperty("string") val string: Foo? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index b0db805428c4..e2594ffae0e1 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -30,7 +30,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt index 708b8b64632f..5f4608b1f490 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt @@ -44,7 +44,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) { +) { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt index 6b7e81e01bc1..0683dc03dd0f 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt @@ -48,7 +48,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @get:JsonProperty("status") val status: Pet.Status? = null - ) { +) { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt index dd4c06abce87..4a9ea5f1f250 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,7 +26,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt index bb4d04326321..8b13675d3db7 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt @@ -50,7 +50,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) { +) { } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt index b6e8ca66c8e3..8514f2c8ba00 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 8ee88bf1f628..58be39aeacfc 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -31,7 +31,7 @@ data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt index 71928c0744b2..c67dc14ec918 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt @@ -45,7 +45,7 @@ data class Order( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt index baa07eec0456..0303d2d9d3d2 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @ApiModelProperty(example = "null", value = "pet status in the store") @get:JsonProperty("status") val status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt index 6319ca0bdc5b..d8a5928093c7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt @@ -27,7 +27,7 @@ data class Tag( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt index d95fc35c473f..8d982852e321 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt @@ -51,7 +51,7 @@ data class User( @ApiModelProperty(example = "null", value = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt index d7a49f7938fc..90635595b377 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index ee2151c581cb..331d9196ed74 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -31,7 +31,7 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt index 67cafde7e75b..3453faf1bae0 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt @@ -45,7 +45,7 @@ data class Order( @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt index b0a8c220d18f..28a0e7e268f2 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @Schema(example = "null", description = "pet status in the store") @get:JsonProperty("status") val status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt index 8166a76dd548..ef9382e70b56 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt @@ -27,7 +27,7 @@ data class Tag( @Schema(example = "null", description = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt index 6c6448ebe1d3..a88450a17f84 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt @@ -51,7 +51,7 @@ data class User( @Schema(example = "null", description = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt index b6e8ca66c8e3..8514f2c8ba00 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Category.kt @@ -27,7 +27,7 @@ data class Category( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 8ee88bf1f628..58be39aeacfc 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -31,7 +31,7 @@ data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("message") val message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt index 71928c0744b2..c67dc14ec918 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Order.kt @@ -45,7 +45,7 @@ data class Order( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt index baa07eec0456..0303d2d9d3d2 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Pet.kt @@ -49,7 +49,7 @@ data class Pet( @ApiModelProperty(example = "null", value = "pet status in the store") @get:JsonProperty("status") val status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt index 6319ca0bdc5b..d8a5928093c7 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/Tag.kt @@ -27,7 +27,7 @@ data class Tag( @ApiModelProperty(example = "null", value = "") @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt index d95fc35c473f..8d982852e321 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/model/User.kt @@ -51,7 +51,7 @@ data class User( @ApiModelProperty(example = "null", value = "User Status") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt index a423d367e718..0638b1718f3d 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,7 +24,7 @@ data class Category( @get:JsonProperty("id") val id: kotlin.Long? = null, @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index bf5b0e470981..f520047d850d 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,7 +27,7 @@ data class ModelApiResponse( @get:JsonProperty("type") val type: kotlin.String? = null, @get:JsonProperty("message") val message: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt index 8defd87ff6e9..4ebe51e765ed 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt @@ -38,7 +38,7 @@ data class Order( @get:JsonProperty("status") val status: Order.Status? = null, @get:JsonProperty("complete") val complete: kotlin.Boolean? = false - ) : Serializable{ +) : Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt index b151c43481c2..cf9ccf2f4f7d 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt @@ -42,7 +42,7 @@ data class Pet( @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @get:JsonProperty("status") val status: Pet.Status? = null - ) : Serializable{ +) : Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt index 4977cb040511..36f841600047 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,7 +24,7 @@ data class Tag( @get:JsonProperty("id") val id: kotlin.Long? = null, @get:JsonProperty("name") val name: kotlin.String? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt index b6d34aa6f694..b04c9e312592 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt @@ -42,7 +42,7 @@ data class User( @get:JsonProperty("phone") val phone: kotlin.String? = null, @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null - ) : Serializable{ +) : Serializable { companion object { private const val serialVersionUID: kotlin.Long = 1 From 1298b21388bf2db0d5a8aa0903d53401fd0e2ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 11 Sep 2025 10:02:42 +0200 Subject: [PATCH 06/20] use enum.getName() instead of hardcoded string as key in vendor extension map --- .../openapitools/codegen/languages/AbstractKotlinCodegen.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 8751a4df27d7..2ee6db282d96 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -835,10 +835,10 @@ protected boolean needToImport(String type) { @Override public CodegenModel fromModel(String name, Schema schema) { CodegenModel m = super.fromModel(name, schema); - List implementedInterfacesClasses = (List) m.getVendorExtensions().getOrDefault("x-kotlin-implements", List.of()); + List implementedInterfacesClasses = (List) m.getVendorExtensions().getOrDefault(VendorExtension.X_KOTLIN_IMPLEMENTS.getName(), List.of()); List implementedInterfacesFields = implementedInterfacesClasses.isEmpty() ? List.of() - : (List) m.getVendorExtensions().getOrDefault("x-kotlin-implements-fields", List.of()); + : (List) m.getVendorExtensions().getOrDefault(VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS.getName(), List.of()); m.optionalVars = m.optionalVars.stream().distinct().collect(Collectors.toList()); // Update allVars/requiredVars/optionalVars with isInherited // Each of these lists contains elements that are similar, but they are all cloned From 709919e4a5ee9a630e1b01ef6c6aa9eeccf590c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 11 Sep 2025 10:22:30 +0200 Subject: [PATCH 07/20] fix docs --- docs/generators/kotlin-spring.md | 4 ++-- .../main/java/org/openapitools/codegen/VendorExtension.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index 47099978d12f..9fc742bd2464 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -67,8 +67,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl |x-discriminator-value|Used with model inheritance to specify value for discriminator that identifies current model|MODEL| |x-field-extra-annotation|List of custom annotations to be added to property|FIELD, OPERATION_PARAMETER|null |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null -|x-kotlin-implements|Ability to specify interfaces that model must implement.|MODEL|empty array -|x-kotlin-implements-fields|Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`.|MODEL|empty array +|x-kotlin-implements|Ability to specify interfaces that model must implement|MODEL|empty array +|x-kotlin-implements-fields|Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`|MODEL|empty array ## IMPORT MAPPING diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java index e957659b32e2..70aa9ce222b1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/VendorExtension.java @@ -10,7 +10,7 @@ public enum VendorExtension { X_IMPLEMENTS("x-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implements", "empty array"), - X_KOTLIN_IMPLEMENTS("x-kotlin-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implements", "empty array"), + X_KOTLIN_IMPLEMENTS("x-kotlin-implements", ExtensionLevel.MODEL, "Ability to specify interfaces that model must implement", "empty array"), X_KOTLIN_IMPLEMENTS_FIELDS("x-kotlin-implements-fields", ExtensionLevel.MODEL, "Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`", "empty array"), X_SPRING_PAGINATED("x-spring-paginated", ExtensionLevel.OPERATION, "Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.", "false"), X_SPRING_PROVIDE_ARGS("x-spring-provide-args", ExtensionLevel.OPERATION, "Allows adding additional hidden parameters in the API specification to allow access to content such as header values or properties", "empty array"), From bb54fc9cb22fa652bf98165f36f4d291f997e238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Thu, 11 Sep 2025 10:36:29 +0200 Subject: [PATCH 08/20] fix test openapi spec and test --- .../codegen/kotlin/spring/KotlinSpringServerCodegenTest.java | 2 +- .../resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 3626d87e32cb..1d6b2cbdaa71 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 @@ -1018,7 +1018,7 @@ public void generateNonSerializableModelWithXimplements() throws Exception { assertFileNotContains( path, "import java.io.Serializable", - ") : Serializable, com.some.package.Named{", + ") : Serializable, com.some.package.Named {", ") : Serializable {", "private const val serialVersionUID: kotlin.Long = 1" ); diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml index f5f942f27e67..8efd273edb8c 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml @@ -720,7 +720,6 @@ components: category: $ref: '#/components/schemas/Category' name: - x-implements-field: true type: string example: doggie photoUrls: From b2d913529f5837be7c4ba0690193ae0648a44282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 10:19:14 +0200 Subject: [PATCH 09/20] add samples for x-kotlin-implements --- .../kotlin-spring-x-kotlin-implements.yaml | 14 + .../kotlin-spring/enumClass.mustache | 2 +- .../2_0/petstore-x-kotlin-implements.yaml | 709 ++++++++++++++++ .../java/org/openapitools/api/SomeApi.java | 2 +- ...sStdExceptionDerivedException.approved.txt | 3 - .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 26 + .../.openapi-generator/VERSION | 1 + .../README.md | 21 + .../build.gradle.kts | 49 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../gradlew | 249 ++++++ .../gradlew.bat | 92 ++ .../pom.xml | 137 +++ .../settings.gradle | 15 + .../src/main/kotlin/com/some/pack/Named.kt | 6 + .../main/kotlin/com/some/pack/WithCategory.kt | 6 + .../com/some/pack/WithDefaultMethods.kt | 12 + .../kotlin/org/openapitools/Application.kt | 13 + .../kotlin/org/openapitools/HomeController.kt | 17 + .../openapitools/SpringDocConfiguration.kt | 42 + .../kotlin/org/openapitools/api/ApiUtil.kt | 19 + .../kotlin/org/openapitools/api/Exceptions.kt | 30 + .../org/openapitools/api/PetApiController.kt | 178 ++++ .../openapitools/api/StoreApiController.kt | 103 +++ .../org/openapitools/api/UserApiController.kt | 162 ++++ .../EnumConverterConfiguration.kt | 26 + .../kotlin/org/openapitools/model/Category.kt | 32 + .../kotlin/org/openapitools/model/Color.kt | 40 + .../openapitools/model/ModelApiResponse.kt | 36 + .../kotlin/org/openapitools/model/Order.kt | 70 ++ .../main/kotlin/org/openapitools/model/Pet.kt | 80 ++ .../main/kotlin/org/openapitools/model/Tag.kt | 32 + .../kotlin/org/openapitools/model/User.kt | 56 ++ .../src/main/resources/application.yaml | 10 + .../src/main/resources/openapi.yaml | 790 ++++++++++++++++++ .../kotlin/org/openapitools/api/PetApiTest.kt | 128 +++ .../org/openapitools/api/StoreApiTest.kt | 65 ++ .../org/openapitools/api/UserApiTest.kt | 123 +++ 40 files changed, 3421 insertions(+), 5 deletions(-) create mode 100644 bin/configs/kotlin-spring-x-kotlin-implements.yaml create mode 100644 modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml delete mode 100644 samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew.bat create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/settings.gradle create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/openapi.yaml create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt diff --git a/bin/configs/kotlin-spring-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-x-kotlin-implements.yaml new file mode 100644 index 000000000000..3e47665d562a --- /dev/null +++ b/bin/configs/kotlin-spring-x-kotlin-implements.yaml @@ -0,0 +1,14 @@ +generatorName: kotlin-spring +outputDir: samples/server/petstore/kotlin-springboot-x-kotlin-implements +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +# comment out below to use default settings +#additionalProperties: +# documentationProvider: none +# annotationLibrary: none +# useSwaggerUI: "false" +# serviceImplementation: "true" +# serializableModel: "true" +# beanValidations: "true" +# useSpringBoot3: "true" diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache index 1d13a1f8432a..30916567a540 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/enumClass.mustache @@ -2,7 +2,7 @@ * {{{description}}} * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} */ -enum class {{classname}}(@get:JsonValue val value: {{dataType}}) {{#vendorExtensions.x-kotlin-implements}}{{#-first}}: {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-kotlin-implements}}{ +enum class {{classname}}(@get:JsonValue val value: {{dataType}}) {{#vendorExtensions.x-kotlin-implements}}{{#-first}}: {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}} {{/vendorExtensions.x-kotlin-implements}}{ {{#allowableValues}}{{#enumVars}} {{&name}}({{{value}}}){{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}; diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml new file mode 100644 index 000000000000..82b3940f9973 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml @@ -0,0 +1,709 @@ +swagger: '2.0' +info: + description: 'This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.' + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +host: petstore.swagger.io +basePath: /v2 +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +schemes: + - http +paths: + /pet: + post: + tags: + - pet + summary: Add a new pet to the store + description: '' + operationId: addPet + consumes: + - application/json + - application/xml + produces: + - application/xml + - application/json + parameters: + - in: body + name: body + description: Pet object that needs to be added to the store + required: true + schema: + $ref: '#/definitions/Pet' + responses: + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + put: + tags: + - pet + summary: Update an existing pet + description: '' + operationId: updatePet + consumes: + - application/json + - application/xml + produces: + - application/xml + - application/json + parameters: + - in: body + name: body + description: Pet object that needs to be added to the store + required: true + schema: + $ref: '#/definitions/Pet' + responses: + '400': + description: Invalid ID supplied + '404': + description: Pet not found + '405': + description: Validation exception + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + produces: + - application/xml + - application/json + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available + collectionFormat: csv + responses: + '200': + description: successful operation + schema: + type: array + items: + $ref: '#/definitions/Pet' + '400': + description: Invalid status value + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: 'Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.' + operationId: findPetsByTags + produces: + - application/xml + - application/json + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + type: array + items: + type: string + collectionFormat: csv + responses: + '200': + description: successful operation + schema: + type: array + items: + $ref: '#/definitions/Pet' + '400': + description: Invalid tag value + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + deprecated: true + '/pet/{petId}': + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + produces: + - application/xml + - application/json + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + type: integer + format: int64 + responses: + '200': + description: successful operation + schema: + $ref: '#/definitions/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + description: '' + operationId: updatePetWithForm + consumes: + - application/x-www-form-urlencoded + produces: + - application/xml + - application/json + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + type: integer + format: int64 + - name: name + in: formData + description: Updated name of the pet + required: false + type: string + - name: status + in: formData + description: Updated status of the pet + required: false + type: string + responses: + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + delete: + tags: + - pet + summary: Deletes a pet + description: '' + operationId: deletePet + produces: + - application/xml + - application/json + parameters: + - name: api_key + in: header + required: false + type: string + - name: petId + in: path + description: Pet id to delete + required: true + type: integer + format: int64 + responses: + '400': + description: Invalid pet value + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + '/pet/{petId}/uploadImage': + post: + tags: + - pet + summary: uploads an image + description: '' + operationId: uploadFile + consumes: + - multipart/form-data + produces: + - application/json + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + type: integer + format: int64 + - name: additionalMetadata + in: formData + description: Additional data to pass to server + required: false + type: string + - name: file + in: formData + description: file to upload + required: false + type: file + responses: + '200': + description: successful operation + schema: + $ref: '#/definitions/ApiResponse' + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + produces: + - application/json + parameters: [] + responses: + '200': + description: successful operation + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + description: '' + operationId: placeOrder + produces: + - application/xml + - application/json + parameters: + - in: body + name: body + description: order placed for purchasing the pet + required: true + schema: + $ref: '#/definitions/Order' + responses: + '200': + description: successful operation + schema: + $ref: '#/definitions/Order' + '400': + description: Invalid Order + '/store/order/{orderId}': + get: + tags: + - store + summary: Find purchase order by ID + description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions' + operationId: getOrderById + produces: + - application/xml + - application/json + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + type: integer + maximum: 5 + minimum: 1 + format: int64 + responses: + '200': + description: successful operation + schema: + $ref: '#/definitions/Order' + '400': + description: Invalid ID supplied + '404': + description: Order not found + delete: + tags: + - store + summary: Delete purchase order by ID + description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + operationId: deleteOrder + produces: + - application/xml + - application/json + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + type: string + responses: + '400': + description: Invalid ID supplied + '404': + description: Order not found + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + produces: + - application/xml + - application/json + parameters: + - in: body + name: body + description: Created user object + required: true + schema: + $ref: '#/definitions/User' + responses: + default: + description: successful operation + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithArrayInput + produces: + - application/xml + - application/json + parameters: + - in: body + name: body + description: List of user object + required: true + schema: + type: array + items: + $ref: '#/definitions/User' + responses: + default: + description: successful operation + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithListInput + produces: + - application/xml + - application/json + parameters: + - in: body + name: body + description: List of user object + required: true + schema: + type: array + items: + $ref: '#/definitions/User' + responses: + default: + description: successful operation + /user/login: + get: + tags: + - user + summary: Logs user into the system + description: '' + operationId: loginUser + produces: + - application/xml + - application/json + parameters: + - name: username + in: query + description: The user name for login + required: true + type: string + - name: password + in: query + description: The password for login in clear text + required: true + type: string + responses: + '200': + description: successful operation + schema: + type: string + headers: + X-Rate-Limit: + type: integer + format: int32 + description: calls per hour allowed by the user + X-Expires-After: + type: string + format: date-time + description: date in UTC when token expires + '400': + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: '' + operationId: logoutUser + produces: + - application/xml + - application/json + parameters: [] + responses: + default: + description: successful operation + '/user/{username}': + get: + tags: + - user + summary: Get user by user name + description: '' + operationId: getUserByName + produces: + - application/xml + - application/json + parameters: + - name: username + in: path + description: 'The name that needs to be fetched. Use user1 for testing.' + required: true + type: string + responses: + '200': + description: successful operation + schema: + $ref: '#/definitions/User' + '400': + description: Invalid username supplied + '404': + description: User not found + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + produces: + - application/xml + - application/json + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + type: string + - in: body + name: body + description: Updated user object + required: true + schema: + $ref: '#/definitions/User' + responses: + '400': + description: Invalid user supplied + '404': + description: User not found + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + produces: + - application/xml + - application/json + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + type: string + responses: + '400': + description: Invalid username supplied + '404': + description: User not found +securityDefinitions: + petstore_auth: + type: oauth2 + authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + flow: implicit + scopes: + 'write:pets': modify pets in your account + 'read:pets': read your pets + api_key: + type: apiKey + name: api_key + in: header +definitions: + Order: + title: Pet Order + description: An order for a pets from the pet store + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + xml: + name: Order + Category: + title: Pet category + description: A category for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Category + User: + title: a User + description: A User who is purchasing from the pet store + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + format: int32 + description: User Status + xml: + name: User + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + title: a Pet + description: A pet for sale in the pet store + type: object + required: + - name + - photoUrls + x-kotlin-implements: [ com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods ] + x-kotlin-implements-fields: [ name, category ] + properties: + id: + type: integer + format: int64 + category: + $ref: '#/definitions/Category' + name: + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/definitions/Tag' + status: + x-kotlin-implements: [ ] + type: string + description: pet status in the store + enum: + - available + - pending + - sold + color: + $ref: '#/definitions/Color' + xml: + name: Pet + Color: + x-kotlin-implements: [ com.some.pack.WithDefaultMethods ] + type: string + enum: + - black + - white + - brown + - yellow + - violet + ApiResponse: + title: An uploaded response + description: Describes the result of uploading an image resource + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java index 1617f4421bbf..0038765e787f 100644 --- a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java @@ -24,7 +24,7 @@ @Validated public interface SomeApi { - public static final String PATH_SOME_ENDPOINT_GET = "/some/endpoint"; + public static final String PATH_SOME_ENDPOINT_GET = "/com/some/endpoint"; /** * GET /some/endpoint * diff --git a/samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt b/samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt deleted file mode 100644 index bc8d2c1aebf9..000000000000 --- a/samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt +++ /dev/null @@ -1,3 +0,0 @@ -Status code: 500 INTERNAL_SERVER_ERROR -Reason: std::logic_error raised -Response headers: [Connection:"close"] \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.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-x-kotlin-implements/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES new file mode 100644 index 000000000000..5993c8f8ca26 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES @@ -0,0 +1,26 @@ +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/HomeController.kt +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/PetApiController.kt +src/main/kotlin/org/openapitools/api/StoreApiController.kt +src/main/kotlin/org/openapitools/api/UserApiController.kt +src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt +src/main/kotlin/org/openapitools/model/Category.kt +src/main/kotlin/org/openapitools/model/Color.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 +src/main/resources/openapi.yaml diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION new file mode 100644 index 000000000000..5e5282953086 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.16.0-SNAPSHOT diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md new file mode 100644 index 000000000000..b6865a081135 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/build.gradle.kts b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts new file mode 100644 index 000000000000..87318fc5e130 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts @@ -0,0 +1,49 @@ +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 = "1.8" +} + +plugins { + val kotlinVersion = "1.9.25" + id("org.jetbrains.kotlin.jvm") version kotlinVersion + id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion + id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion + id("org.springframework.boot") version "2.6.7" + id("io.spring.dependency-management") version "1.0.11.RELEASE" +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springdoc:springdoc-openapi-ui:1.6.8") + + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("javax.validation:validation-api") + implementation("javax.annotation:javax.annotation-api:1.3.2") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude(module = "junit") + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vSTxF-Vi3+ZOI=Thq2} zyQgjYY1_7^ZQHh{?P))4+qUiQJLi1&{yE>h?~jU%tjdV0h|FENbM3X(KnJdPKc?~k zh=^Ixv*+smUll!DTWH!jrV*wSh*(mx0o6}1@JExzF(#9FXgmTXVoU+>kDe68N)dkQ zH#_98Zv$}lQwjKL@yBd;U(UD0UCl322=pav<=6g>03{O_3oKTq;9bLFX1ia*lw;#K zOiYDcBJf)82->83N_Y(J7Kr_3lE)hAu;)Q(nUVydv+l+nQ$?|%MWTy`t>{havFSQloHwiIkGK9YZ79^9?AZo0ZyQlVR#}lF%dn5n%xYksXf8gnBm=wO7g_^! zauQ-bH1Dc@3ItZ-9D_*pH}p!IG7j8A_o94#~>$LR|TFq zZ-b00*nuw|-5C2lJDCw&8p5N~Z1J&TrcyErds&!l3$eSz%`(*izc;-?HAFD9AHb-| z>)id`QCrzRws^9(#&=pIx9OEf2rmlob8sK&xPCWS+nD~qzU|qG6KwA{zbikcfQrdH z+ zQg>O<`K4L8rN7`GJB0*3<3`z({lWe#K!4AZLsI{%z#ja^OpfjU{!{)x0ZH~RB0W5X zTwN^w=|nA!4PEU2=LR05x~}|B&ZP?#pNgDMwD*ajI6oJqv!L81gu=KpqH22avXf0w zX3HjbCI!n9>l046)5rr5&v5ja!xkKK42zmqHzPx$9Nn_MZk`gLeSLgC=LFf;H1O#B zn=8|^1iRrujHfbgA+8i<9jaXc;CQBAmQvMGQPhFec2H1knCK2x!T`e6soyrqCamX% zTQ4dX_E*8so)E*TB$*io{$c6X)~{aWfaqdTh=xEeGvOAN9H&-t5tEE-qso<+C!2>+ zskX51H-H}#X{A75wqFe-J{?o8Bx|>fTBtl&tcbdR|132Ztqu5X0i-pisB-z8n71%q%>EF}yy5?z=Ve`}hVh{Drv1YWL zW=%ug_&chF11gDv3D6B)Tz5g54H0mDHNjuKZ+)CKFk4Z|$RD zfRuKLW`1B>B?*RUfVd0+u8h3r-{@fZ{k)c!93t1b0+Q9vOaRnEn1*IL>5Z4E4dZ!7 ztp4GP-^1d>8~LMeb}bW!(aAnB1tM_*la=Xx)q(I0Y@__Zd$!KYb8T2VBRw%e$iSdZ zkwdMwd}eV9q*;YvrBFTv1>1+}{H!JK2M*C|TNe$ZSA>UHKk);wz$(F$rXVc|sI^lD zV^?_J!3cLM;GJuBMbftbaRUs$;F}HDEDtIeHQ)^EJJ1F9FKJTGH<(Jj`phE6OuvE) zqK^K`;3S{Y#1M@8yRQwH`?kHMq4tHX#rJ>5lY3DM#o@or4&^_xtBC(|JpGTfrbGkA z2Tu+AyT^pHannww!4^!$5?@5v`LYy~T`qs7SYt$JgrY(w%C+IWA;ZkwEF)u5sDvOK zGk;G>Mh&elvXDcV69J_h02l&O;!{$({fng9Rlc3ID#tmB^FIG^w{HLUpF+iB`|
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-x-kotlin-implements/gradlew.bat b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/pom.xml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml new file mode 100644 index 000000000000..c7589ea91c55 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml @@ -0,0 +1,137 @@ + + 4.0.0 + org.openapitools + openapi-spring + jar + openapi-spring + 1.0.0 + + 1.6.8 + 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 + + 1.8 + + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + org.jetbrains.kotlin + kotlin-maven-allopen + ${kotlin.version} + + + + + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin.version} + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi.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-x-kotlin-implements/settings.gradle b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/settings.gradle new file mode 100644 index 000000000000..14844905cd40 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt new file mode 100644 index 000000000000..2107a8487406 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt new file mode 100644 index 000000000000..6689da898885 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt new file mode 100644 index 000000000000..34acc9513573 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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 diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt new file mode 100644 index 000000000000..2fe6de62479e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt new file mode 100644 index 000000000000..0b75544d7a1e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt @@ -0,0 +1,17 @@ +package org.openapitools + +import org.springframework.context.annotation.Bean +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.ResponseBody +import org.springframework.web.bind.annotation.GetMapping + +/** + * Home redirection to OpenAPI api documentation + */ +@Controller +class HomeController { + + @RequestMapping("/") + fun index(): String = "redirect:swagger-ui.html" +} 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..ab4d5eb17b86 --- /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/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt new file mode 100644 index 000000000000..88e892d0f49a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -0,0 +1,19 @@ +package org.openapitools.api + +import org.springframework.web.context.request.NativeWebRequest + +import javax.servlet.http.HttpServletResponse +import java.io.IOException + +object ApiUtil { + fun setExampleResponse(req: NativeWebRequest, contentType: String, example: String) { + try { + val res = req.getNativeResponse(HttpServletResponse::class.java) + res?.characterEncoding = "UTF-8" + res?.addHeader("Content-Type", contentType) + res?.writer?.print(example) + } catch (e: IOException) { + throw RuntimeException(e) + } + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt new file mode 100644 index 000000000000..901db1237ee7 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt @@ -0,0 +1,30 @@ +package org.openapitools.api + +import org.springframework.context.annotation.Configuration +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.ControllerAdvice +import org.springframework.web.bind.annotation.ExceptionHandler +import javax.servlet.http.HttpServletResponse +import javax.validation.ConstraintViolationException + +// TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception +sealed class ApiException(msg: String, val code: Int) : Exception(msg) + +class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) + +@Configuration("org.openapitools.api.DefaultExceptionHandler") +@ControllerAdvice +class DefaultExceptionHandler { + + @ExceptionHandler(value = [ApiException::class]) + fun onApiException(ex: ApiException, response: HttpServletResponse): Unit = + response.sendError(ex.code, ex.message) + + @ExceptionHandler(value = [NotImplementedError::class]) + fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit = + response.sendError(HttpStatus.NOT_IMPLEMENTED.value()) + + @ExceptionHandler(value = [ConstraintViolationException::class]) + fun onConstraintViolation(ex: ConstraintViolationException, response: HttpServletResponse): Unit = + response.sendError(HttpStatus.BAD_REQUEST.value(), ex.constraintViolations.joinToString(", ") { it.message }) +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt new file mode 100644 index 000000000000..9442c15e6ebf --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -0,0 +1,178 @@ +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 + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class PetApiController() { + + @Operation( + 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", "application/xml"] + ) + fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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/xml", "application/json"] + ) + fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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/xml", "application/json"] + ) + fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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/xml", "application/json"] + ) + fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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", "application/xml"] + ) + fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile?): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt new file mode 100644 index 000000000000..6d5bb4aa6dcc --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -0,0 +1,103 @@ +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 + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class StoreApiController() { + + @Operation( + summary = "Delete purchase order by ID", + operationId = "deleteOrder", + description = """For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors""", + 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(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + summary = "Returns pet inventories by status", + operationId = "getInventory", + description = """Returns a map of status codes to quantities""", + 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(): ResponseEntity> { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + summary = "Find purchase order by ID", + operationId = "getOrderById", + description = """For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions""", + 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/xml", "application/json"] + ) + fun getOrderById(@Min(1L) @Max(5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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/xml", "application/json"] + ) + fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt new file mode 100644 index 000000000000..637fc2dccffe --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -0,0 +1,162 @@ +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 + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class UserApiController() { + + @Operation( + summary = "Create user", + operationId = "createUser", + description = """This can only be done by the logged in user.""", + responses = [ + ApiResponse(responseCode = "200", description = "successful operation") ] + ) + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user"] + ) + fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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"] + ) + fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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"] + ) + fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + summary = "Delete user", + operationId = "deleteUser", + description = """This can only be done by the logged in user.""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid username supplied"), + ApiResponse(responseCode = "404", description = "User not found") ] + ) + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/user/{username}"] + ) + fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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/xml", "application/json"] + ) + fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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/xml", "application/json"] + ) + fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + 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(): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + + @Operation( + summary = "Updated user", + operationId = "updateUser", + description = """This can only be done by the logged in user.""", + responses = [ + ApiResponse(responseCode = "400", description = "Invalid user supplied"), + ApiResponse(responseCode = "404", description = "User not found") ] + ) + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/user/{username}"] + ) + fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt new file mode 100644 index 000000000000..20229410386f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-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 new file mode 100644 index 000000000000..80649589750d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt @@ -0,0 +1,32 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +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.v3.oas.annotations.media.Schema + +/** + * A category for a pet + * @param id + * @param name + */ +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 +) { + +} + 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 new file mode 100644 index 000000000000..11c687f573df --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt @@ -0,0 +1,40 @@ +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 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.v3.oas.annotations.media.Schema + +/** +* +* 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-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 new file mode 100644 index 000000000000..29636f4bad1e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -0,0 +1,36 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import 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.v3.oas.annotations.media.Schema + +/** + * Describes the result of uploading an image resource + * @param code + * @param type + * @param message + */ +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 +) { + +} + 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 new file mode 100644 index 000000000000..5225690f54ba --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt @@ -0,0 +1,70 @@ +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 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.v3.oas.annotations.media.Schema + +/** + * An order for a pets from the pet store + * @param id + * @param petId + * @param quantity + * @param shipDate + * @param status Order Status + * @param complete + */ +data class Order( + + @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 = "Order Status") + @get:JsonProperty("status") val status: Order.Status? = null, + + @Schema(example = "null", description = "") + @get:JsonProperty("complete") val complete: kotlin.Boolean? = false +) { + + /** + * Order Status + * Values: placed,approved,delivered + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + placed("placed"), + approved("approved"), + delivered("delivered"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Order'") + } + } + } + +} + 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 new file mode 100644 index 000000000000..f009059e9313 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import org.openapitools.model.Category +import org.openapitools.model.Color +import org.openapitools.model.Tag +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.v3.oas.annotations.media.Schema + +/** + * A pet for sale in the pet store + * @param name + * @param photoUrls + * @param id + * @param category + * @param tags + * @param status pet status in the store + * @param color + */ +data class Pet( + + @Schema(example = "doggie", required = true, description = "") + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @Schema(example = "null", required = true, description = "") + @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + + @Schema(example = "null", description = "") + @get:JsonProperty("id") 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") val tags: kotlin.collections.List? = null, + + @Schema(example = "null", description = "pet status in the store") + @get:JsonProperty("status") val status: Pet.Status? = null, + + @field:Valid + @Schema(example = "null", description = "") + @get:JsonProperty("color") val color: Color? = null +) : com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { + + /** + * pet status in the store + * Values: available,pending,sold + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + available("available"), + pending("pending"), + sold("sold"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") + } + } + } + +} + 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 new file mode 100644 index 000000000000..179b6d27b5c4 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt @@ -0,0 +1,32 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +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.v3.oas.annotations.media.Schema + +/** + * A tag for a pet + * @param id + * @param name + */ +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 +) { + +} + 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 new file mode 100644 index 000000000000..c51087a6f57e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt @@ -0,0 +1,56 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +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.v3.oas.annotations.media.Schema + +/** + * A User who is purchasing from the pet store + * @param id + * @param username + * @param firstName + * @param lastName + * @param email + * @param password + * @param phone + * @param userStatus User Status + */ +data class User( + + @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 = "User Status") + @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null +) { + +} + diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml new file mode 100644 index 000000000000..8e2ebcde976d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/openapi.yaml new file mode 100644 index 000000000000..bac90283016d --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/openapi.yaml @@ -0,0 +1,790 @@ +openapi: 3.0.1 +info: + 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: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +servers: +- url: http://petstore.swagger.io/v2 +tags: +- description: Everything about your Pets + name: pet +- description: Access to Petstore orders + name: store +- description: Operations about user + name: user +paths: + /pet: + post: + operationId: addPet + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/Pet" + application/xml: + schema: + $ref: "#/components/schemas/Pet" + description: Pet object that needs to be added to the store + required: true + responses: + "405": + content: {} + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet + x-codegen-request-body-name: body + put: + operationId: updatePet + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/Pet" + application/xml: + schema: + $ref: "#/components/schemas/Pet" + description: Pet object that needs to be added to the store + required: true + responses: + "400": + content: {} + description: Invalid ID supplied + "404": + content: {} + description: Pet not found + "405": + content: {} + description: Validation exception + security: + - petstore_auth: + - write:pets + - read:pets + summary: Update an existing pet + tags: + - pet + x-codegen-request-body-name: body + /pet/findByStatus: + get: + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - description: Status values that need to be considered for filter + explode: false + in: query + name: status + required: true + schema: + items: + default: available + enum: + - available + - pending + - sold + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: "#/components/schemas/Pet" + type: array + application/json: + schema: + items: + $ref: "#/components/schemas/Pet" + type: array + description: successful operation + "400": + content: {} + description: Invalid status value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by status + tags: + - pet + /pet/findByTags: + get: + deprecated: true + description: "Multiple tags can be provided with comma separated strings. Use\ + \ tag1, tag2, tag3 for testing." + operationId: findPetsByTags + parameters: + - description: Tags to filter by + explode: false + in: query + name: tags + required: true + schema: + items: + type: string + type: array + style: form + responses: + "200": + content: + application/xml: + schema: + items: + $ref: "#/components/schemas/Pet" + type: array + application/json: + schema: + items: + $ref: "#/components/schemas/Pet" + type: array + description: successful operation + "400": + content: {} + description: Invalid tag value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Finds Pets by tags + tags: + - pet + /pet/{petId}: + delete: + operationId: deletePet + parameters: + - in: header + name: api_key + schema: + type: string + - description: Pet id to delete + in: path + name: petId + required: true + schema: + format: int64 + type: integer + responses: + "400": + content: {} + description: Invalid pet value + security: + - petstore_auth: + - write:pets + - read:pets + summary: Deletes a pet + tags: + - pet + get: + description: Returns a single pet + operationId: getPetById + parameters: + - description: ID of pet to return + in: path + name: petId + required: true + schema: + format: int64 + type: integer + responses: + "200": + content: + application/xml: + schema: + $ref: "#/components/schemas/Pet" + application/json: + schema: + $ref: "#/components/schemas/Pet" + description: successful operation + "400": + content: {} + description: Invalid ID supplied + "404": + content: {} + description: Pet not found + security: + - api_key: [] + summary: Find pet by ID + tags: + - pet + post: + operationId: updatePetWithForm + parameters: + - description: ID of pet that needs to be updated + in: path + name: petId + required: true + schema: + format: int64 + type: integer + requestBody: + content: + application/x-www-form-urlencoded: + schema: + $ref: "#/components/schemas/updatePetWithForm_request" + responses: + "405": + content: {} + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Updates a pet in the store with form data + tags: + - pet + /pet/{petId}/uploadImage: + post: + operationId: uploadFile + parameters: + - description: ID of pet to update + in: path + name: petId + required: true + schema: + format: int64 + type: integer + requestBody: + content: + multipart/form-data: + schema: + $ref: "#/components/schemas/uploadFile_request" + responses: + "200": + content: + application/json: + schema: + $ref: "#/components/schemas/ApiResponse" + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image + tags: + - pet + /store/inventory: + get: + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + "200": + content: + application/json: + schema: + additionalProperties: + format: int32 + type: integer + type: object + description: successful operation + security: + - api_key: [] + summary: Returns pet inventories by status + tags: + - store + /store/order: + post: + operationId: placeOrder + requestBody: + content: + '*/*': + schema: + $ref: "#/components/schemas/Order" + description: order placed for purchasing the pet + required: true + responses: + "200": + content: + application/xml: + schema: + $ref: "#/components/schemas/Order" + application/json: + schema: + $ref: "#/components/schemas/Order" + description: successful operation + "400": + content: {} + description: Invalid Order + summary: Place an order for a pet + tags: + - store + x-codegen-request-body-name: body + /store/order/{orderId}: + delete: + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - description: ID of the order that needs to be deleted + in: path + name: orderId + required: true + schema: + type: string + responses: + "400": + content: {} + description: Invalid ID supplied + "404": + content: {} + description: Order not found + summary: Delete purchase order by ID + tags: + - store + get: + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generate exceptions + operationId: getOrderById + parameters: + - description: ID of pet that needs to be fetched + in: path + name: orderId + required: true + schema: + format: int64 + maximum: 5 + minimum: 1 + type: integer + responses: + "200": + content: + application/xml: + schema: + $ref: "#/components/schemas/Order" + application/json: + schema: + $ref: "#/components/schemas/Order" + description: successful operation + "400": + content: {} + description: Invalid ID supplied + "404": + content: {} + description: Order not found + summary: Find purchase order by ID + tags: + - store + /user: + post: + description: This can only be done by the logged in user. + operationId: createUser + requestBody: + content: + '*/*': + schema: + $ref: "#/components/schemas/User" + description: Created user object + required: true + responses: + default: + content: {} + description: successful operation + summary: Create user + tags: + - user + x-codegen-request-body-name: body + /user/createWithArray: + post: + operationId: createUsersWithArrayInput + requestBody: + content: + '*/*': + schema: + items: + $ref: "#/components/schemas/User" + type: array + description: List of user object + required: true + responses: + default: + content: {} + description: successful operation + summary: Creates list of users with given input array + tags: + - user + x-codegen-request-body-name: body + /user/createWithList: + post: + operationId: createUsersWithListInput + requestBody: + content: + '*/*': + schema: + items: + $ref: "#/components/schemas/User" + type: array + description: List of user object + required: true + responses: + default: + content: {} + description: successful operation + summary: Creates list of users with given input array + tags: + - user + x-codegen-request-body-name: body + /user/login: + get: + operationId: loginUser + parameters: + - description: The user name for login + in: query + name: username + required: true + schema: + type: string + - description: The password for login in clear text + in: query + name: password + required: true + schema: + type: string + responses: + "200": + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + description: successful operation + headers: + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + format: int32 + type: integer + X-Expires-After: + description: date in UTC when token expires + schema: + format: date-time + type: string + "400": + content: {} + description: Invalid username/password supplied + summary: Logs user into the system + tags: + - user + /user/logout: + get: + operationId: logoutUser + responses: + default: + content: {} + description: successful operation + summary: Logs out current logged in user session + tags: + - user + /user/{username}: + delete: + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - description: The name that needs to be deleted + in: path + name: username + required: true + schema: + type: string + responses: + "400": + content: {} + description: Invalid username supplied + "404": + content: {} + description: User not found + summary: Delete user + tags: + - user + get: + operationId: getUserByName + parameters: + - description: The name that needs to be fetched. Use user1 for testing. + in: path + name: username + required: true + schema: + type: string + responses: + "200": + content: + application/xml: + schema: + $ref: "#/components/schemas/User" + application/json: + schema: + $ref: "#/components/schemas/User" + description: successful operation + "400": + content: {} + description: Invalid username supplied + "404": + content: {} + description: User not found + summary: Get user by user name + tags: + - user + put: + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - description: name that need to be deleted + in: path + name: username + required: true + schema: + type: string + requestBody: + content: + '*/*': + schema: + $ref: "#/components/schemas/User" + description: Updated user object + required: true + responses: + "400": + content: {} + description: Invalid user supplied + "404": + content: {} + description: User not found + summary: Updated user + tags: + - user + x-codegen-request-body-name: body +components: + schemas: + Order: + description: An order for a pets from the pet store + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: 2000-01-23T04:56:07.000+00:00 + complete: false + status: placed + properties: + id: + format: int64 + type: integer + petId: + format: int64 + type: integer + quantity: + format: int32 + type: integer + shipDate: + format: date-time + type: string + status: + description: Order Status + enum: + - placed + - approved + - delivered + type: string + complete: + default: false + type: boolean + title: Pet Order + type: object + xml: + name: Order + Category: + description: A category for a pet + example: + name: name + id: 6 + properties: + id: + format: int64 + type: integer + name: + type: string + title: Pet category + type: object + xml: + name: Category + User: + description: A User who is purchasing from the pet store + example: + firstName: firstName + lastName: lastName + password: password + userStatus: 6 + phone: phone + id: 0 + email: email + username: username + properties: + id: + format: int64 + type: integer + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + description: User Status + format: int32 + type: integer + title: a User + type: object + xml: + name: User + Tag: + description: A tag for a pet + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + title: Pet Tag + type: object + xml: + name: Tag + Pet: + description: A pet for sale in the pet store + example: + photoUrls: + - photoUrls + - photoUrls + color: black + name: doggie + id: 0 + category: + name: name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + category: + $ref: "#/components/schemas/Category" + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: "#/components/schemas/Tag" + type: array + xml: + name: tag + wrapped: true + status: + description: pet status in the store + enum: + - available + - pending + - sold + type: string + x-kotlin-implements: [] + color: + $ref: "#/components/schemas/Color" + required: + - name + - photoUrls + title: a Pet + type: object + xml: + name: Pet + x-kotlin-implements: + - com.some.pack.Named + - com.some.pack.WithCategory + - com.some.pack.WithDefaultMethods + x-kotlin-implements-fields: + - name + - category + Color: + enum: + - black + - white + - brown + - yellow + - violet + type: string + x-kotlin-implements: + - com.some.pack.WithDefaultMethods + ApiResponse: + description: Describes the result of uploading an image resource + example: + code: 0 + type: type + message: message + properties: + code: + format: int32 + type: integer + type: + type: string + message: + type: string + title: An uploaded response + type: object + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + type: object + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + type: object + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + api_key: + in: header + name: api_key + type: apiKey +x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt new file mode 100644 index 000000000000..13a6527bbae3 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt @@ -0,0 +1,128 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.junit.jupiter.api.Test +import org.springframework.http.ResponseEntity + +class PetApiTest { + + private val api: PetApiController = PetApiController() + + /** + * To test PetApiController.addPet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun addPetTest() { + val body: Pet = TODO() + val response: ResponseEntity = api.addPet(body) + + // TODO: test validations + } + + /** + * To test PetApiController.deletePet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deletePetTest() { + val petId: kotlin.Long = TODO() + val apiKey: kotlin.String? = TODO() + val response: ResponseEntity = api.deletePet(petId, apiKey) + + // TODO: test validations + } + + /** + * To test PetApiController.findPetsByStatus + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByStatusTest() { + val status: kotlin.collections.List = TODO() + val response: ResponseEntity> = api.findPetsByStatus(status) + + // TODO: test validations + } + + /** + * To test PetApiController.findPetsByTags + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByTagsTest() { + val tags: kotlin.collections.List = TODO() + val response: ResponseEntity> = api.findPetsByTags(tags) + + // TODO: test validations + } + + /** + * To test PetApiController.getPetById + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getPetByIdTest() { + val petId: kotlin.Long = TODO() + val response: ResponseEntity = api.getPetById(petId) + + // TODO: test validations + } + + /** + * To test PetApiController.updatePet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetTest() { + val body: Pet = TODO() + val response: ResponseEntity = api.updatePet(body) + + // TODO: test validations + } + + /** + * To test PetApiController.updatePetWithForm + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetWithFormTest() { + val petId: kotlin.Long = TODO() + val name: kotlin.String? = TODO() + val status: kotlin.String? = TODO() + val response: ResponseEntity = api.updatePetWithForm(petId, name, status) + + // TODO: test validations + } + + /** + * To test PetApiController.uploadFile + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun uploadFileTest() { + val petId: kotlin.Long = TODO() + val additionalMetadata: kotlin.String? = TODO() + val file: org.springframework.web.multipart.MultipartFile? = TODO() + val response: ResponseEntity = api.uploadFile(petId, additionalMetadata, file) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt new file mode 100644 index 000000000000..6c8599b0d527 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt @@ -0,0 +1,65 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.junit.jupiter.api.Test +import org.springframework.http.ResponseEntity + +class StoreApiTest { + + private val api: StoreApiController = StoreApiController() + + /** + * To test StoreApiController.deleteOrder + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteOrderTest() { + val orderId: kotlin.String = TODO() + val response: ResponseEntity = api.deleteOrder(orderId) + + // TODO: test validations + } + + /** + * To test StoreApiController.getInventory + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getInventoryTest() { + val response: ResponseEntity> = api.getInventory() + + // TODO: test validations + } + + /** + * To test StoreApiController.getOrderById + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getOrderByIdTest() { + val orderId: kotlin.Long = TODO() + val response: ResponseEntity = api.getOrderById(orderId) + + // TODO: test validations + } + + /** + * To test StoreApiController.placeOrder + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun placeOrderTest() { + val body: Order = TODO() + val response: ResponseEntity = api.placeOrder(body) + + // TODO: test validations + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt new file mode 100644 index 000000000000..60dd148029c7 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt @@ -0,0 +1,123 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.junit.jupiter.api.Test +import org.springframework.http.ResponseEntity + +class UserApiTest { + + private val api: UserApiController = UserApiController() + + /** + * To test UserApiController.createUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUserTest() { + val body: User = TODO() + val response: ResponseEntity = api.createUser(body) + + // TODO: test validations + } + + /** + * To test UserApiController.createUsersWithArrayInput + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithArrayInputTest() { + val body: kotlin.collections.List = TODO() + val response: ResponseEntity = api.createUsersWithArrayInput(body) + + // TODO: test validations + } + + /** + * To test UserApiController.createUsersWithListInput + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithListInputTest() { + val body: kotlin.collections.List = TODO() + val response: ResponseEntity = api.createUsersWithListInput(body) + + // TODO: test validations + } + + /** + * To test UserApiController.deleteUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteUserTest() { + val username: kotlin.String = TODO() + val response: ResponseEntity = api.deleteUser(username) + + // TODO: test validations + } + + /** + * To test UserApiController.getUserByName + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getUserByNameTest() { + val username: kotlin.String = TODO() + val response: ResponseEntity = api.getUserByName(username) + + // TODO: test validations + } + + /** + * To test UserApiController.loginUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun loginUserTest() { + val username: kotlin.String = TODO() + val password: kotlin.String = TODO() + val response: ResponseEntity = api.loginUser(username, password) + + // TODO: test validations + } + + /** + * To test UserApiController.logoutUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun logoutUserTest() { + val response: ResponseEntity = api.logoutUser() + + // TODO: test validations + } + + /** + * To test UserApiController.updateUser + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updateUserTest() { + val username: kotlin.String = TODO() + val body: User = TODO() + val response: ResponseEntity = api.updateUser(username, body) + + // TODO: test validations + } +} From 6894f07c758e9378283025ecd064710d264d501b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 10:25:03 +0200 Subject: [PATCH 10/20] add samples for x-kotlin-implements to proper output folder --- bin/configs/kotlin-spring-x-kotlin-implements.yaml | 2 +- .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 4 ++++ .../.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/com/some/pack/Named.kt | 0 .../src/main/kotlin/com/some/pack/WithCategory.kt | 0 .../main/kotlin/com/some/pack/WithDefaultMethods.kt | 0 .../src/main/kotlin/org/openapitools/Application.kt | 0 .../main/kotlin/org/openapitools/HomeController.kt | 0 .../org/openapitools/SpringDocConfiguration.kt | 0 .../src/main/kotlin/org/openapitools/api/ApiUtil.kt | 0 .../main/kotlin/org/openapitools/api/Exceptions.kt | 0 .../kotlin/org/openapitools/api/PetApiController.kt | 0 .../org/openapitools/api/StoreApiController.kt | 0 .../org/openapitools/api/UserApiController.kt | 0 .../configuration/EnumConverterConfiguration.kt | 0 .../main/kotlin/org/openapitools/model/Category.kt | 0 .../src/main/kotlin/org/openapitools/model/Color.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 .../src/main/resources/openapi.yaml | 0 .../test/kotlin/org/openapitools/api/PetApiTest.kt | 0 .../kotlin/org/openapitools/api/StoreApiTest.kt | 0 .../test/kotlin/org/openapitools/api/UserApiTest.kt | 0 36 files changed, 5 insertions(+), 1 deletion(-) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/.openapi-generator-ignore (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/.openapi-generator/FILES (85%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/.openapi-generator/VERSION (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/README.md (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/build.gradle.kts (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/gradle/wrapper/gradle-wrapper.jar (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/gradle/wrapper/gradle-wrapper.properties (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/gradlew (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/gradlew.bat (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/pom.xml (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/settings.gradle (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/com/some/pack/Named.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/com/some/pack/WithCategory.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/com/some/pack/WithDefaultMethods.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/Application.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/HomeController.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/ApiUtil.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/Exceptions.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/PetApiController.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/StoreApiController.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/UserApiController.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Category.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Color.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Order.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Pet.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Tag.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/User.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/resources/application.yaml (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/main/resources/openapi.yaml (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/test/kotlin/org/openapitools/api/PetApiTest.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/test/kotlin/org/openapitools/api/StoreApiTest.kt (100%) rename samples/server/petstore/{kotlin-springboot-x-kotlin-implements => kotlin-spring-x-kotlin-implements}/src/test/kotlin/org/openapitools/api/UserApiTest.kt (100%) diff --git a/bin/configs/kotlin-spring-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-x-kotlin-implements.yaml index 3e47665d562a..10c1a3b17c4b 100644 --- a/bin/configs/kotlin-spring-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-x-kotlin-implements.yaml @@ -1,5 +1,5 @@ generatorName: kotlin-spring -outputDir: samples/server/petstore/kotlin-springboot-x-kotlin-implements +outputDir: samples/server/petstore/kotlin-spring-x-kotlin-implements library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore b/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator-ignore similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator-ignore diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES b/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/FILES similarity index 85% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/FILES index 5993c8f8ca26..3644c6b8b789 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/FILES @@ -1,3 +1,4 @@ +.openapi-generator-ignore README.md build.gradle.kts gradle/wrapper/gradle-wrapper.jar @@ -24,3 +25,6 @@ src/main/kotlin/org/openapitools/model/Tag.kt src/main/kotlin/org/openapitools/model/User.kt src/main/resources/application.yaml src/main/resources/openapi.yaml +src/test/kotlin/org/openapitools/api/PetApiTest.kt +src/test/kotlin/org/openapitools/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION b/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/VERSION similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/VERSION diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md b/samples/server/petstore/kotlin-spring-x-kotlin-implements/README.md similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/README.md diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts b/samples/server/petstore/kotlin-spring-x-kotlin-implements/build.gradle.kts similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/build.gradle.kts diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties b/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew b/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew.bat b/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew.bat similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew.bat rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew.bat diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml b/samples/server/petstore/kotlin-spring-x-kotlin-implements/pom.xml similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/pom.xml diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/settings.gradle b/samples/server/petstore/kotlin-spring-x-kotlin-implements/settings.gradle similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/settings.gradle rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/settings.gradle diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt rename to samples/server/petstore/kotlin-spring-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/api/ApiUtil.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/application.yaml similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/application.yaml diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/openapi.yaml similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/openapi.yaml rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/openapi.yaml diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt similarity index 100% rename from samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt rename to samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt From b0c57c8198bb69ddbb7993e07b75a7194950e60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 10:52:32 +0200 Subject: [PATCH 11/20] fix --- ...getOrderByIdThrowsStdExceptionDerivedException.approved.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt diff --git a/samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt b/samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt new file mode 100644 index 000000000000..bc8d2c1aebf9 --- /dev/null +++ b/samples/server/petstore/cpp-restbed/test/java_client_tests/java_client/src/test/java/test_error_handling_server_stubs/approval_files/StoreApiTest.getOrderByIdThrowsStdExceptionDerivedException.approved.txt @@ -0,0 +1,3 @@ +Status code: 500 INTERNAL_SERVER_ERROR +Reason: std::logic_error raised +Response headers: [Connection:"close"] \ No newline at end of file From 325fbdd7f56110e642706cd4f937ee480bdd1f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 10:53:34 +0200 Subject: [PATCH 12/20] revert unwanted changes --- .../src/main/java/org/openapitools/api/SomeApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java index 0038765e787f..1617f4421bbf 100644 --- a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java @@ -24,7 +24,7 @@ @Validated public interface SomeApi { - public static final String PATH_SOME_ENDPOINT_GET = "/com/some/endpoint"; + public static final String PATH_SOME_ENDPOINT_GET = "/some/endpoint"; /** * GET /some/endpoint * From 6013278a8263bc024a714a3e5e66dfc65e38ce19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 11:16:26 +0200 Subject: [PATCH 13/20] move to correct place --- ...otlin-spring-boot-x-kotlin-implements.yaml | 13 + .../kotlin-spring-x-kotlin-implements.yaml | 14 - .../kotlin/org/openapitools/HomeController.kt | 17 - .../openapitools/SpringDocConfiguration.kt | 42 - .../org/openapitools/api/PetApiController.kt | 178 ---- .../openapitools/api/StoreApiController.kt | 103 --- .../org/openapitools/api/UserApiController.kt | 162 ---- .../src/main/resources/openapi.yaml | 790 ------------------ .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 9 +- .../.openapi-generator/VERSION | 0 .../README.md | 0 .../build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradlew | 0 .../gradlew.bat | 0 .../pom.xml | 8 +- .../settings.gradle | 0 .../src/main/kotlin/com/some/pack/Named.kt | 0 .../main/kotlin/com/some/pack/WithCategory.kt | 0 .../com/some/pack/WithDefaultMethods.kt | 0 .../kotlin/org/openapitools/Application.kt | 0 .../kotlin/org/openapitools/api/ApiUtil.kt | 0 .../kotlin/org/openapitools/api/Exceptions.kt | 0 .../org/openapitools/api/PetApiController.kt | 111 +++ .../org/openapitools/api/PetApiService.kt | 94 +++ .../org/openapitools/api/PetApiServiceImpl.kt | 40 + .../openapitools/api/StoreApiController.kt | 69 ++ .../org/openapitools/api/StoreApiService.kt | 48 ++ .../openapitools/api/StoreApiServiceImpl.kt | 23 + .../org/openapitools/api/UserApiController.kt | 104 +++ .../org/openapitools/api/UserApiService.kt | 87 ++ .../openapitools/api/UserApiServiceImpl.kt | 39 + .../EnumConverterConfiguration.kt | 0 .../kotlin/org/openapitools/model/Category.kt | 9 +- .../kotlin/org/openapitools/model/Color.kt | 2 +- .../openapitools/model/ModelApiResponse.kt | 10 +- .../kotlin/org/openapitools/model/Order.kt | 13 +- .../main/kotlin/org/openapitools/model/Pet.kt | 14 +- .../main/kotlin/org/openapitools/model/Tag.kt | 9 +- .../kotlin/org/openapitools/model/User.kt | 15 +- .../src/main/resources/application.yaml | 0 .../kotlin/org/openapitools/api/PetApiTest.kt | 3 +- .../org/openapitools/api/StoreApiTest.kt | 3 +- .../org/openapitools/api/UserApiTest.kt | 3 +- 46 files changed, 672 insertions(+), 1361 deletions(-) create mode 100644 bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml delete mode 100644 bin/configs/kotlin-spring-x-kotlin-implements.yaml delete mode 100644 samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt delete mode 100644 samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt delete mode 100644 samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt delete mode 100644 samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt delete mode 100644 samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt delete mode 100644 samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/openapi.yaml rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/.openapi-generator-ignore (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/.openapi-generator/FILES (76%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/.openapi-generator/VERSION (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/README.md (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/build.gradle.kts (96%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/gradle/wrapper/gradle-wrapper.jar (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/gradle/wrapper/gradle-wrapper.properties (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/gradlew (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/gradlew.bat (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/pom.xml (94%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/settings.gradle (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/com/some/pack/Named.kt (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/com/some/pack/WithCategory.kt (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/com/some/pack/WithDefaultMethods.kt (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/Application.kt (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/ApiUtil.kt (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/api/Exceptions.kt (100%) create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Category.kt (82%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Color.kt (95%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt (81%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Order.kt (83%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Pet.kt (79%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/Tag.kt (82%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/kotlin/org/openapitools/model/User.kt (74%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/main/resources/application.yaml (100%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/test/kotlin/org/openapitools/api/PetApiTest.kt (96%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/test/kotlin/org/openapitools/api/StoreApiTest.kt (91%) rename samples/server/petstore/{kotlin-spring-x-kotlin-implements => kotlin-springboot-x-kotlin-implements}/src/test/kotlin/org/openapitools/api/UserApiTest.kt (95%) diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml new file mode 100644 index 000000000000..eb03a41e164e --- /dev/null +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -0,0 +1,13 @@ +generatorName: kotlin-spring +outputDir: samples/server/petstore/kotlin-springboot-x-kotlin-implements +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-spring +additionalProperties: + documentationProvider: none + annotationLibrary: none + useSwaggerUI: "false" + serviceImplementation: "true" + serializableModel: "true" + beanValidations: "true" + requestMappingMode: controller diff --git a/bin/configs/kotlin-spring-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-x-kotlin-implements.yaml deleted file mode 100644 index 10c1a3b17c4b..000000000000 --- a/bin/configs/kotlin-spring-x-kotlin-implements.yaml +++ /dev/null @@ -1,14 +0,0 @@ -generatorName: kotlin-spring -outputDir: samples/server/petstore/kotlin-spring-x-kotlin-implements -library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml -templateDir: modules/openapi-generator/src/main/resources/kotlin-spring -# comment out below to use default settings -#additionalProperties: -# documentationProvider: none -# annotationLibrary: none -# useSwaggerUI: "false" -# serviceImplementation: "true" -# serializableModel: "true" -# beanValidations: "true" -# useSpringBoot3: "true" diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt deleted file mode 100644 index 0b75544d7a1e..000000000000 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/HomeController.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.openapitools - -import org.springframework.context.annotation.Bean -import org.springframework.stereotype.Controller -import org.springframework.web.bind.annotation.RequestMapping -import org.springframework.web.bind.annotation.ResponseBody -import org.springframework.web.bind.annotation.GetMapping - -/** - * Home redirection to OpenAPI api documentation - */ -@Controller -class HomeController { - - @RequestMapping("/") - fun index(): String = "redirect:swagger-ui.html" -} diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/SpringDocConfiguration.kt deleted file mode 100644 index ab4d5eb17b86..000000000000 --- a/samples/server/petstore/kotlin-spring-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") - ) - ) - } -} diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt deleted file mode 100644 index 9442c15e6ebf..000000000000 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ /dev/null @@ -1,178 +0,0 @@ -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 - -import org.springframework.web.bind.annotation.* -import org.springframework.validation.annotation.Validated -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.beans.factory.annotation.Autowired - -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -import kotlin.collections.List -import kotlin.collections.Map - -@RestController -@Validated -@RequestMapping("\${api.base-path:/v2}") -class PetApiController() { - - @Operation( - 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", "application/xml"] - ) - fun addPet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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(@Parameter(description = "Pet id to delete", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "", `in` = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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/xml", "application/json"] - ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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/xml", "application/json"] - ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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/xml", "application/json"] - ) - fun getPetById(@Parameter(description = "ID of pet to return", required = true) @PathVariable("petId") petId: kotlin.Long): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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", "application/xml"] - ) - fun updatePet(@Parameter(description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody body: Pet): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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(@Parameter(description = "ID of pet that needs to be updated", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) name: kotlin.String? ,@Parameter(description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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(@Parameter(description = "ID of pet to update", required = true) @PathVariable("petId") petId: kotlin.Long,@Parameter(description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? ,@Parameter(description = "file to upload") @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile?): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } -} diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt deleted file mode 100644 index 6d5bb4aa6dcc..000000000000 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ /dev/null @@ -1,103 +0,0 @@ -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 - -import org.springframework.web.bind.annotation.* -import org.springframework.validation.annotation.Validated -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.beans.factory.annotation.Autowired - -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -import kotlin.collections.List -import kotlin.collections.Map - -@RestController -@Validated -@RequestMapping("\${api.base-path:/v2}") -class StoreApiController() { - - @Operation( - summary = "Delete purchase order by ID", - operationId = "deleteOrder", - description = """For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors""", - 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(@Parameter(description = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - summary = "Returns pet inventories by status", - operationId = "getInventory", - description = """Returns a map of status codes to quantities""", - 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(): ResponseEntity> { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - summary = "Find purchase order by ID", - operationId = "getOrderById", - description = """For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions""", - 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/xml", "application/json"] - ) - fun getOrderById(@Min(1L) @Max(5L) @Parameter(description = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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/xml", "application/json"] - ) - fun placeOrder(@Parameter(description = "order placed for purchasing the pet", required = true) @Valid @RequestBody body: Order): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } -} diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt deleted file mode 100644 index 637fc2dccffe..000000000000 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ /dev/null @@ -1,162 +0,0 @@ -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 - -import org.springframework.web.bind.annotation.* -import org.springframework.validation.annotation.Validated -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.beans.factory.annotation.Autowired - -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -import kotlin.collections.List -import kotlin.collections.Map - -@RestController -@Validated -@RequestMapping("\${api.base-path:/v2}") -class UserApiController() { - - @Operation( - summary = "Create user", - operationId = "createUser", - description = """This can only be done by the logged in user.""", - responses = [ - ApiResponse(responseCode = "200", description = "successful operation") ] - ) - @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"] - ) - fun createUser(@Parameter(description = "Created user object", required = true) @Valid @RequestBody body: User): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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"] - ) - fun createUsersWithArrayInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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"] - ) - fun createUsersWithListInput(@Parameter(description = "List of user object", required = true) @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - summary = "Delete user", - operationId = "deleteUser", - description = """This can only be done by the logged in user.""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid username supplied"), - ApiResponse(responseCode = "404", description = "User not found") ] - ) - @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] - ) - fun deleteUser(@Parameter(description = "The name that needs to be deleted", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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/xml", "application/json"] - ) - fun getUserByName(@Parameter(description = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") username: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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/xml", "application/json"] - ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - 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(): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - - @Operation( - summary = "Updated user", - operationId = "updateUser", - description = """This can only be done by the logged in user.""", - responses = [ - ApiResponse(responseCode = "400", description = "Invalid user supplied"), - ApiResponse(responseCode = "404", description = "User not found") ] - ) - @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"] - ) - fun updateUser(@Parameter(description = "name that need to be deleted", required = true) @PathVariable("username") username: kotlin.String,@Parameter(description = "Updated user object", required = true) @Valid @RequestBody body: User): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } -} diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/openapi.yaml deleted file mode 100644 index bac90283016d..000000000000 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/openapi.yaml +++ /dev/null @@ -1,790 +0,0 @@ -openapi: 3.0.1 -info: - 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: - name: Apache-2.0 - url: https://www.apache.org/licenses/LICENSE-2.0.html - title: OpenAPI Petstore - version: 1.0.0 -servers: -- url: http://petstore.swagger.io/v2 -tags: -- description: Everything about your Pets - name: pet -- description: Access to Petstore orders - name: store -- description: Operations about user - name: user -paths: - /pet: - post: - operationId: addPet - requestBody: - content: - application/json: - schema: - $ref: "#/components/schemas/Pet" - application/xml: - schema: - $ref: "#/components/schemas/Pet" - description: Pet object that needs to be added to the store - required: true - responses: - "405": - content: {} - description: Invalid input - security: - - petstore_auth: - - write:pets - - read:pets - summary: Add a new pet to the store - tags: - - pet - x-codegen-request-body-name: body - put: - operationId: updatePet - requestBody: - content: - application/json: - schema: - $ref: "#/components/schemas/Pet" - application/xml: - schema: - $ref: "#/components/schemas/Pet" - description: Pet object that needs to be added to the store - required: true - responses: - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Pet not found - "405": - content: {} - description: Validation exception - security: - - petstore_auth: - - write:pets - - read:pets - summary: Update an existing pet - tags: - - pet - x-codegen-request-body-name: body - /pet/findByStatus: - get: - description: Multiple status values can be provided with comma separated strings - operationId: findPetsByStatus - parameters: - - description: Status values that need to be considered for filter - explode: false - in: query - name: status - required: true - schema: - items: - default: available - enum: - - available - - pending - - sold - type: string - type: array - style: form - responses: - "200": - content: - application/xml: - schema: - items: - $ref: "#/components/schemas/Pet" - type: array - application/json: - schema: - items: - $ref: "#/components/schemas/Pet" - type: array - description: successful operation - "400": - content: {} - description: Invalid status value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by status - tags: - - pet - /pet/findByTags: - get: - deprecated: true - description: "Multiple tags can be provided with comma separated strings. Use\ - \ tag1, tag2, tag3 for testing." - operationId: findPetsByTags - parameters: - - description: Tags to filter by - explode: false - in: query - name: tags - required: true - schema: - items: - type: string - type: array - style: form - responses: - "200": - content: - application/xml: - schema: - items: - $ref: "#/components/schemas/Pet" - type: array - application/json: - schema: - items: - $ref: "#/components/schemas/Pet" - type: array - description: successful operation - "400": - content: {} - description: Invalid tag value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Finds Pets by tags - tags: - - pet - /pet/{petId}: - delete: - operationId: deletePet - parameters: - - in: header - name: api_key - schema: - type: string - - description: Pet id to delete - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "400": - content: {} - description: Invalid pet value - security: - - petstore_auth: - - write:pets - - read:pets - summary: Deletes a pet - tags: - - pet - get: - description: Returns a single pet - operationId: getPetById - parameters: - - description: ID of pet to return - in: path - name: petId - required: true - schema: - format: int64 - type: integer - responses: - "200": - content: - application/xml: - schema: - $ref: "#/components/schemas/Pet" - application/json: - schema: - $ref: "#/components/schemas/Pet" - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Pet not found - security: - - api_key: [] - summary: Find pet by ID - tags: - - pet - post: - operationId: updatePetWithForm - parameters: - - description: ID of pet that needs to be updated - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - application/x-www-form-urlencoded: - schema: - $ref: "#/components/schemas/updatePetWithForm_request" - responses: - "405": - content: {} - description: Invalid input - security: - - petstore_auth: - - write:pets - - read:pets - summary: Updates a pet in the store with form data - tags: - - pet - /pet/{petId}/uploadImage: - post: - operationId: uploadFile - parameters: - - description: ID of pet to update - in: path - name: petId - required: true - schema: - format: int64 - type: integer - requestBody: - content: - multipart/form-data: - schema: - $ref: "#/components/schemas/uploadFile_request" - responses: - "200": - content: - application/json: - schema: - $ref: "#/components/schemas/ApiResponse" - description: successful operation - security: - - petstore_auth: - - write:pets - - read:pets - summary: uploads an image - tags: - - pet - /store/inventory: - get: - description: Returns a map of status codes to quantities - operationId: getInventory - responses: - "200": - content: - application/json: - schema: - additionalProperties: - format: int32 - type: integer - type: object - description: successful operation - security: - - api_key: [] - summary: Returns pet inventories by status - tags: - - store - /store/order: - post: - operationId: placeOrder - requestBody: - content: - '*/*': - schema: - $ref: "#/components/schemas/Order" - description: order placed for purchasing the pet - required: true - responses: - "200": - content: - application/xml: - schema: - $ref: "#/components/schemas/Order" - application/json: - schema: - $ref: "#/components/schemas/Order" - description: successful operation - "400": - content: {} - description: Invalid Order - summary: Place an order for a pet - tags: - - store - x-codegen-request-body-name: body - /store/order/{orderId}: - delete: - description: For valid response try integer IDs with value < 1000. Anything - above 1000 or nonintegers will generate API errors - operationId: deleteOrder - parameters: - - description: ID of the order that needs to be deleted - in: path - name: orderId - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Delete purchase order by ID - tags: - - store - get: - description: For valid response try integer IDs with value <= 5 or > 10. Other - values will generate exceptions - operationId: getOrderById - parameters: - - description: ID of pet that needs to be fetched - in: path - name: orderId - required: true - schema: - format: int64 - maximum: 5 - minimum: 1 - type: integer - responses: - "200": - content: - application/xml: - schema: - $ref: "#/components/schemas/Order" - application/json: - schema: - $ref: "#/components/schemas/Order" - description: successful operation - "400": - content: {} - description: Invalid ID supplied - "404": - content: {} - description: Order not found - summary: Find purchase order by ID - tags: - - store - /user: - post: - description: This can only be done by the logged in user. - operationId: createUser - requestBody: - content: - '*/*': - schema: - $ref: "#/components/schemas/User" - description: Created user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Create user - tags: - - user - x-codegen-request-body-name: body - /user/createWithArray: - post: - operationId: createUsersWithArrayInput - requestBody: - content: - '*/*': - schema: - items: - $ref: "#/components/schemas/User" - type: array - description: List of user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - /user/createWithList: - post: - operationId: createUsersWithListInput - requestBody: - content: - '*/*': - schema: - items: - $ref: "#/components/schemas/User" - type: array - description: List of user object - required: true - responses: - default: - content: {} - description: successful operation - summary: Creates list of users with given input array - tags: - - user - x-codegen-request-body-name: body - /user/login: - get: - operationId: loginUser - parameters: - - description: The user name for login - in: query - name: username - required: true - schema: - type: string - - description: The password for login in clear text - in: query - name: password - required: true - schema: - type: string - responses: - "200": - content: - application/xml: - schema: - type: string - application/json: - schema: - type: string - description: successful operation - headers: - X-Rate-Limit: - description: calls per hour allowed by the user - schema: - format: int32 - type: integer - X-Expires-After: - description: date in UTC when token expires - schema: - format: date-time - type: string - "400": - content: {} - description: Invalid username/password supplied - summary: Logs user into the system - tags: - - user - /user/logout: - get: - operationId: logoutUser - responses: - default: - content: {} - description: successful operation - summary: Logs out current logged in user session - tags: - - user - /user/{username}: - delete: - description: This can only be done by the logged in user. - operationId: deleteUser - parameters: - - description: The name that needs to be deleted - in: path - name: username - required: true - schema: - type: string - responses: - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Delete user - tags: - - user - get: - operationId: getUserByName - parameters: - - description: The name that needs to be fetched. Use user1 for testing. - in: path - name: username - required: true - schema: - type: string - responses: - "200": - content: - application/xml: - schema: - $ref: "#/components/schemas/User" - application/json: - schema: - $ref: "#/components/schemas/User" - description: successful operation - "400": - content: {} - description: Invalid username supplied - "404": - content: {} - description: User not found - summary: Get user by user name - tags: - - user - put: - description: This can only be done by the logged in user. - operationId: updateUser - parameters: - - description: name that need to be deleted - in: path - name: username - required: true - schema: - type: string - requestBody: - content: - '*/*': - schema: - $ref: "#/components/schemas/User" - description: Updated user object - required: true - responses: - "400": - content: {} - description: Invalid user supplied - "404": - content: {} - description: User not found - summary: Updated user - tags: - - user - x-codegen-request-body-name: body -components: - schemas: - Order: - description: An order for a pets from the pet store - example: - petId: 6 - quantity: 1 - id: 0 - shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false - status: placed - properties: - id: - format: int64 - type: integer - petId: - format: int64 - type: integer - quantity: - format: int32 - type: integer - shipDate: - format: date-time - type: string - status: - description: Order Status - enum: - - placed - - approved - - delivered - type: string - complete: - default: false - type: boolean - title: Pet Order - type: object - xml: - name: Order - Category: - description: A category for a pet - example: - name: name - id: 6 - properties: - id: - format: int64 - type: integer - name: - type: string - title: Pet category - type: object - xml: - name: Category - User: - description: A User who is purchasing from the pet store - example: - firstName: firstName - lastName: lastName - password: password - userStatus: 6 - phone: phone - id: 0 - email: email - username: username - properties: - id: - format: int64 - type: integer - username: - type: string - firstName: - type: string - lastName: - type: string - email: - type: string - password: - type: string - phone: - type: string - userStatus: - description: User Status - format: int32 - type: integer - title: a User - type: object - xml: - name: User - Tag: - description: A tag for a pet - example: - name: name - id: 1 - properties: - id: - format: int64 - type: integer - name: - type: string - title: Pet Tag - type: object - xml: - name: Tag - Pet: - description: A pet for sale in the pet store - example: - photoUrls: - - photoUrls - - photoUrls - color: black - name: doggie - id: 0 - category: - name: name - id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - properties: - id: - format: int64 - type: integer - category: - $ref: "#/components/schemas/Category" - name: - example: doggie - type: string - photoUrls: - items: - type: string - type: array - xml: - name: photoUrl - wrapped: true - tags: - items: - $ref: "#/components/schemas/Tag" - type: array - xml: - name: tag - wrapped: true - status: - description: pet status in the store - enum: - - available - - pending - - sold - type: string - x-kotlin-implements: [] - color: - $ref: "#/components/schemas/Color" - required: - - name - - photoUrls - title: a Pet - type: object - xml: - name: Pet - x-kotlin-implements: - - com.some.pack.Named - - com.some.pack.WithCategory - - com.some.pack.WithDefaultMethods - x-kotlin-implements-fields: - - name - - category - Color: - enum: - - black - - white - - brown - - yellow - - violet - type: string - x-kotlin-implements: - - com.some.pack.WithDefaultMethods - ApiResponse: - description: Describes the result of uploading an image resource - example: - code: 0 - type: type - message: message - properties: - code: - format: int32 - type: integer - type: - type: string - message: - type: string - title: An uploaded response - type: object - updatePetWithForm_request: - properties: - name: - description: Updated name of the pet - type: string - status: - description: Updated status of the pet - type: string - type: object - uploadFile_request: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - file: - description: file to upload - format: binary - type: string - type: object - securitySchemes: - petstore_auth: - flows: - implicit: - authorizationUrl: http://petstore.swagger.io/api/oauth/dialog - scopes: - write:pets: modify pets in your account - read:pets: read your pets - type: oauth2 - api_key: - in: header - name: api_key - type: apiKey -x-original-swagger-version: "2.0" diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator-ignore b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator-ignore rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator-ignore diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/FILES b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES similarity index 76% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/FILES rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES index 3644c6b8b789..f3b298adbd74 100644 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/FILES @@ -8,13 +8,17 @@ gradlew.bat pom.xml settings.gradle src/main/kotlin/org/openapitools/Application.kt -src/main/kotlin/org/openapitools/HomeController.kt -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/PetApiController.kt +src/main/kotlin/org/openapitools/api/PetApiService.kt +src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt src/main/kotlin/org/openapitools/api/StoreApiController.kt +src/main/kotlin/org/openapitools/api/StoreApiService.kt +src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt src/main/kotlin/org/openapitools/api/UserApiController.kt +src/main/kotlin/org/openapitools/api/UserApiService.kt +src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt src/main/kotlin/org/openapitools/model/Category.kt src/main/kotlin/org/openapitools/model/Color.kt @@ -24,7 +28,6 @@ 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 -src/main/resources/openapi.yaml src/test/kotlin/org/openapitools/api/PetApiTest.kt src/test/kotlin/org/openapitools/api/StoreApiTest.kt src/test/kotlin/org/openapitools/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/.openapi-generator/VERSION rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/.openapi-generator/VERSION diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/README.md b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/README.md rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/README.md diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/build.gradle.kts b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts similarity index 96% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/build.gradle.kts rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts index 87318fc5e130..2af5e54061e5 100644 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts @@ -33,7 +33,6 @@ 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-ui: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-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew.bat b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew.bat similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/gradlew.bat rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/gradlew.bat diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/pom.xml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml similarity index 94% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/pom.xml rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml index c7589ea91c55..dfd0d3a9f6b6 100644 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/pom.xml +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml @@ -6,7 +6,6 @@ openapi-spring 1.0.0 - 1.6.8 3.0.2 1.3.2 1.6.21 @@ -87,12 +86,7 @@ spring-boot-starter-web - - - org.springdoc - springdoc-openapi-ui - ${springdoc-openapi.version} - + diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/settings.gradle b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/settings.gradle similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/settings.gradle rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/settings.gradle diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Named.kt diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithCategory.kt diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/WithDefaultMethods.kt diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt new file mode 100644 index 000000000000..4e393ceef9b1 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -0,0 +1,111 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class PetApiController(@Autowired(required = true) val service: PetApiService) { + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json", "application/xml"] + ) + fun addPet( @Valid @RequestBody body: Pet): ResponseEntity { + return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) + } + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/pet/{petId}"] + ) + fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { + return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/xml", "application/json"] + ) + fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/xml", "application/json"] + ) + fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { + return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json", "application/xml"] + ) + fun updatePet( @Valid @RequestBody body: Pet): ResponseEntity { + return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { + return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile?): ResponseEntity { + return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt new file mode 100644 index 000000000000..bee779a69332 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt @@ -0,0 +1,94 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet + +interface PetApiService { + + /** + * POST /pet : Add a new pet to the store + * + * @param body Pet object that needs to be added to the store (required) + * @return Invalid input (status code 405) + * @see PetApi#addPet + */ + fun addPet(body: Pet): Unit + + /** + * DELETE /pet/{petId} : Deletes a pet + * + * @param petId Pet id to delete (required) + * @param apiKey (optional) + * @return Invalid pet value (status code 400) + * @see PetApi#deletePet + */ + fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit + + /** + * GET /pet/findByStatus : Finds Pets by status + * Multiple status values can be provided with comma separated strings + * + * @param status Status values that need to be considered for filter (required) + * @return successful operation (status code 200) + * or Invalid status value (status code 400) + * @see PetApi#findPetsByStatus + */ + fun findPetsByStatus(status: kotlin.collections.List): List + + /** + * GET /pet/findByTags : Finds Pets by tags + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @param tags Tags to filter by (required) + * @return successful operation (status code 200) + * or Invalid tag value (status code 400) + * @deprecated + * @see PetApi#findPetsByTags + */ + fun findPetsByTags(tags: kotlin.collections.List): List + + /** + * GET /pet/{petId} : Find pet by ID + * Returns a single pet + * + * @param petId ID of pet to return (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * @see PetApi#getPetById + */ + fun getPetById(petId: kotlin.Long): Pet + + /** + * PUT /pet : Update an existing pet + * + * @param body Pet object that needs to be added to the store (required) + * @return Invalid ID supplied (status code 400) + * or Pet not found (status code 404) + * or Validation exception (status code 405) + * @see PetApi#updatePet + */ + fun updatePet(body: Pet): Unit + + /** + * POST /pet/{petId} : Updates a pet in the store with form data + * + * @param petId ID of pet that needs to be updated (required) + * @param name Updated name of the pet (optional) + * @param status Updated status of the pet (optional) + * @return Invalid input (status code 405) + * @see PetApi#updatePetWithForm + */ + fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit + + /** + * POST /pet/{petId}/uploadImage : uploads an image + * + * @param petId ID of pet to update (required) + * @param additionalMetadata Additional data to pass to server (optional) + * @param file file to upload (optional) + * @return successful operation (status code 200) + * @see PetApi#uploadFile + */ + fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile?): ModelApiResponse +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt new file mode 100644 index 000000000000..6b401e7ee880 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt @@ -0,0 +1,40 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.stereotype.Service +@Service +class PetApiServiceImpl : PetApiService { + + override fun addPet(body: Pet): Unit { + TODO("Implement me") + } + + override fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun findPetsByStatus(status: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun findPetsByTags(tags: kotlin.collections.List): List { + TODO("Implement me") + } + + override fun getPetById(petId: kotlin.Long): Pet { + TODO("Implement me") + } + + override fun updatePet(body: Pet): Unit { + TODO("Implement me") + } + + override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit { + TODO("Implement me") + } + + override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile?): ModelApiResponse { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt new file mode 100644 index 000000000000..6cbb8279976f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -0,0 +1,69 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity + +import org.springframework.web.bind.annotation.* +import org.springframework.validation.annotation.Validated +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.beans.factory.annotation.Autowired + +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class StoreApiController(@Autowired(required = true) val service: StoreApiService) { + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] + ) + fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { + return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] + ) + fun getInventory(): ResponseEntity> { + return ResponseEntity(service.getInventory(), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/xml", "application/json"] + ) + fun getOrderById(@Min(1L) @Max(5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/xml", "application/json"] + ) + fun placeOrder( @Valid @RequestBody body: Order): ResponseEntity { + return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt new file mode 100644 index 000000000000..60e754529448 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt @@ -0,0 +1,48 @@ +package org.openapitools.api + +import org.openapitools.model.Order + +interface StoreApiService { + + /** + * DELETE /store/order/{orderId} : Delete purchase order by ID + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @param orderId ID of the order that needs to be deleted (required) + * @return Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#deleteOrder + */ + fun deleteOrder(orderId: kotlin.String): Unit + + /** + * GET /store/inventory : Returns pet inventories by status + * Returns a map of status codes to quantities + * + * @return successful operation (status code 200) + * @see StoreApi#getInventory + */ + fun getInventory(): Map + + /** + * GET /store/order/{orderId} : Find purchase order by ID + * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + * + * @param orderId ID of pet that needs to be fetched (required) + * @return successful operation (status code 200) + * or Invalid ID supplied (status code 400) + * or Order not found (status code 404) + * @see StoreApi#getOrderById + */ + fun getOrderById(orderId: kotlin.Long): Order + + /** + * POST /store/order : Place an order for a pet + * + * @param body order placed for purchasing the pet (required) + * @return successful operation (status code 200) + * or Invalid Order (status code 400) + * @see StoreApi#placeOrder + */ + fun placeOrder(body: Order): Order +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt new file mode 100644 index 000000000000..7e733e28dc50 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt @@ -0,0 +1,23 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.stereotype.Service +@Service +class StoreApiServiceImpl : StoreApiService { + + override fun deleteOrder(orderId: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getInventory(): Map { + TODO("Implement me") + } + + override fun getOrderById(orderId: kotlin.Long): Order { + TODO("Implement me") + } + + override fun placeOrder(body: Order): Order { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt new file mode 100644 index 000000000000..daf5c943c2ec --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -0,0 +1,104 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.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.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +import kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +@RequestMapping("\${api.base-path:/v2}") +class UserApiController(@Autowired(required = true) val service: UserApiService) { + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user"] + ) + fun createUser( @Valid @RequestBody body: User): ResponseEntity { + return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithArray"] + ) + fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithList"] + ) + fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { + return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/user/{username}"] + ) + fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { + return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/xml", "application/json"] + ) + fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { + return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/login"], + produces = ["application/xml", "application/json"] + ) + fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/logout"] + ) + fun logoutUser(): ResponseEntity { + return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) + } + + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/user/{username}"] + ) + fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): ResponseEntity { + return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt new file mode 100644 index 000000000000..a1bcf6be237c --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt @@ -0,0 +1,87 @@ +package org.openapitools.api + +import org.openapitools.model.User + +interface UserApiService { + + /** + * POST /user : Create user + * This can only be done by the logged in user. + * + * @param body Created user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUser + */ + fun createUser(body: User): Unit + + /** + * POST /user/createWithArray : Creates list of users with given input array + * + * @param body List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithArrayInput + */ + fun createUsersWithArrayInput(body: kotlin.collections.List): Unit + + /** + * POST /user/createWithList : Creates list of users with given input array + * + * @param body List of user object (required) + * @return successful operation (status code 200) + * @see UserApi#createUsersWithListInput + */ + fun createUsersWithListInput(body: kotlin.collections.List): Unit + + /** + * DELETE /user/{username} : Delete user + * This can only be done by the logged in user. + * + * @param username The name that needs to be deleted (required) + * @return Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#deleteUser + */ + fun deleteUser(username: kotlin.String): Unit + + /** + * GET /user/{username} : Get user by user name + * + * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @return successful operation (status code 200) + * or Invalid username supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#getUserByName + */ + fun getUserByName(username: kotlin.String): User + + /** + * GET /user/login : Logs user into the system + * + * @param username The user name for login (required) + * @param password The password for login in clear text (required) + * @return successful operation (status code 200) + * or Invalid username/password supplied (status code 400) + * @see UserApi#loginUser + */ + fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String + + /** + * GET /user/logout : Logs out current logged in user session + * + * @return successful operation (status code 200) + * @see UserApi#logoutUser + */ + fun logoutUser(): Unit + + /** + * PUT /user/{username} : Updated user + * This can only be done by the logged in user. + * + * @param username name that need to be deleted (required) + * @param body Updated user object (required) + * @return Invalid user supplied (status code 400) + * or User not found (status code 404) + * @see UserApi#updateUser + */ + fun updateUser(username: kotlin.String, body: User): Unit +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt new file mode 100644 index 000000000000..ebd822220153 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt @@ -0,0 +1,39 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.stereotype.Service +@Service +class UserApiServiceImpl : UserApiService { + + override fun createUser(body: User): Unit { + TODO("Implement me") + } + + override fun createUsersWithArrayInput(body: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun createUsersWithListInput(body: kotlin.collections.List): Unit { + TODO("Implement me") + } + + override fun deleteUser(username: kotlin.String): Unit { + TODO("Implement me") + } + + override fun getUserByName(username: kotlin.String): User { + TODO("Implement me") + } + + override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + TODO("Implement me") + } + + override fun logoutUser(): Unit { + TODO("Implement me") + } + + override fun updateUser(username: kotlin.String, body: User): Unit { + TODO("Implement me") + } +} diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt diff --git a/samples/server/petstore/kotlin-spring-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 similarity index 82% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt index 80649589750d..0638b1718f3d 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -3,6 +3,7 @@ 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 @@ -12,7 +13,6 @@ 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 /** * A category for a pet @@ -21,12 +21,13 @@ import io.swagger.v3.oas.annotations.media.Schema */ 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 { + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } } diff --git a/samples/server/petstore/kotlin-spring-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 similarity index 95% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt index 11c687f573df..d46c704e991c 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -5,6 +5,7 @@ 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 @@ -14,7 +15,6 @@ 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-spring-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 similarity index 81% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 29636f4bad1e..f520047d850d 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -3,6 +3,7 @@ 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 @@ -12,7 +13,6 @@ 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 /** * Describes the result of uploading an image resource @@ -22,15 +22,15 @@ import io.swagger.v3.oas.annotations.media.Schema */ 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 { + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } } diff --git a/samples/server/petstore/kotlin-spring-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 similarity index 83% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt index 5225690f54ba..4ebe51e765ed 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -5,6 +5,7 @@ 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 @@ -14,7 +15,6 @@ 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 /** * An order for a pets from the pet store @@ -27,24 +27,18 @@ import io.swagger.v3.oas.annotations.media.Schema */ 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 = "Order Status") @get:JsonProperty("status") val status: Order.Status? = null, - @Schema(example = "null", description = "") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false -) { +) : Serializable { /** * Order Status @@ -66,5 +60,8 @@ data class Order( } } + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } } diff --git a/samples/server/petstore/kotlin-spring-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 similarity index 79% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt index f009059e9313..4007b3f434d9 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -8,6 +8,7 @@ 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 @@ -17,7 +18,6 @@ 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 /** * A pet for sale in the pet store @@ -31,30 +31,23 @@ import io.swagger.v3.oas.annotations.media.Schema */ data class Pet( - @Schema(example = "doggie", required = true, description = "") @get:JsonProperty("name", required = true) override val name: kotlin.String, - @Schema(example = "null", required = true, description = "") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, - @Schema(example = "null", description = "") @get:JsonProperty("id") 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") val tags: kotlin.collections.List? = null, - @Schema(example = "null", description = "pet status in the store") @get:JsonProperty("status") val status: Pet.Status? = null, @field:Valid - @Schema(example = "null", description = "") @get:JsonProperty("color") val color: Color? = null -) : com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { +) : Serializable, com.some.pack.Named : Serializable, , com.some.pack.WithCategory : Serializable, , com.some.pack.WithDefaultMethods { /** * pet status in the store @@ -76,5 +69,8 @@ data class Pet( } } + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } } diff --git a/samples/server/petstore/kotlin-spring-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 similarity index 82% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt index 179b6d27b5c4..36f841600047 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -3,6 +3,7 @@ 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 @@ -12,7 +13,6 @@ 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 /** * A tag for a pet @@ -21,12 +21,13 @@ import io.swagger.v3.oas.annotations.media.Schema */ 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 { + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } } diff --git a/samples/server/petstore/kotlin-spring-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 similarity index 74% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt index c51087a6f57e..b04c9e312592 100644 --- a/samples/server/petstore/kotlin-spring-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 @@ -3,6 +3,7 @@ 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 @@ -12,7 +13,6 @@ 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 /** * A User who is purchasing from the pet store @@ -27,30 +27,25 @@ import io.swagger.v3.oas.annotations.media.Schema */ 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 = "User Status") @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-spring-x-kotlin-implements/src/main/resources/application.yaml b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml similarity index 100% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/main/resources/application.yaml rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/resources/application.yaml diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt similarity index 96% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt index 13a6527bbae3..4ee3b320cc3e 100644 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/PetApiTest.kt @@ -7,7 +7,8 @@ import org.springframework.http.ResponseEntity class PetApiTest { - private val api: PetApiController = PetApiController() + private val service: PetApiService = PetApiServiceImpl() + private val api: PetApiController = PetApiController(service) /** * To test PetApiController.addPet diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt similarity index 91% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt index 6c8599b0d527..69e269b03ef1 100644 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/StoreApiTest.kt @@ -6,7 +6,8 @@ import org.springframework.http.ResponseEntity class StoreApiTest { - private val api: StoreApiController = StoreApiController() + private val service: StoreApiService = StoreApiServiceImpl() + private val api: StoreApiController = StoreApiController(service) /** * To test StoreApiController.deleteOrder diff --git a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt similarity index 95% rename from samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt rename to samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt index 60dd148029c7..eb20423da71c 100644 --- a/samples/server/petstore/kotlin-spring-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/test/kotlin/org/openapitools/api/UserApiTest.kt @@ -6,7 +6,8 @@ import org.springframework.http.ResponseEntity class UserApiTest { - private val api: UserApiController = UserApiController() + private val service: UserApiService = UserApiServiceImpl() + private val api: UserApiController = UserApiController(service) /** * To test UserApiController.createUser From 7c665ebfccc1f4def0c02a13567646a6a7626e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 11:27:54 +0200 Subject: [PATCH 14/20] fix mustache template --- .../src/main/resources/kotlin-spring/dataClass.mustache | 4 ++-- .../.openapi-generator/FILES | 4 ---- .../src/main/kotlin/org/openapitools/model/Pet.kt | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache index 8a4f7a4a79f2..f818fd75239f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClass.mustache @@ -33,8 +33,8 @@ }}{{^parent}}{{! no newline }}{{#serializableModel}}{{! no newline }}{{^vendorExtensions.x-kotlin-implements}} : Serializable{{/vendorExtensions.x-kotlin-implements}}{{! no newline - }}{{#vendorExtensions.x-kotlin-implements}} : Serializable, {{! no newline - }}{{#-first}}{{{.}}}{{/-first}}{{! no newline + }}{{#vendorExtensions.x-kotlin-implements}}{{! no newline + }}{{#-first}} : Serializable, {{{.}}}{{/-first}}{{! no newline }}{{^-first}}, {{{.}}}{{/-first}}{{! no newline }}{{/vendorExtensions.x-kotlin-implements}}{{! no newline }}{{/serializableModel}}{{! no newline 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 f3b298adbd74..b7fb98d60d86 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 @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md build.gradle.kts gradle/wrapper/gradle-wrapper.jar @@ -28,6 +27,3 @@ 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 -src/test/kotlin/org/openapitools/api/PetApiTest.kt -src/test/kotlin/org/openapitools/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/api/UserApiTest.kt 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 4007b3f434d9..e4b670add014 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 @@ -47,7 +47,7 @@ data class Pet( @field:Valid @get:JsonProperty("color") val color: Color? = null -) : Serializable, com.some.pack.Named : Serializable, , com.some.pack.WithCategory : Serializable, , com.some.pack.WithDefaultMethods { +) : Serializable, com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { /** * pet status in the store From b1141e162cfa7d8014715296fd6dd0e6ba2ffd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Fri, 12 Sep 2025 11:28:56 +0200 Subject: [PATCH 15/20] add to samples-kotlin-server.yaml --- .github/workflows/samples-kotlin-server.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml index 6dbb7d6ed9a4..191e0861c93e 100644 --- a/.github/workflows/samples-kotlin-server.yaml +++ b/.github/workflows/samples-kotlin-server.yaml @@ -38,6 +38,7 @@ jobs: - samples/server/petstore/kotlin-springboot-source-swagger1 - 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-server/ktor - samples/server/petstore/kotlin-server/ktor2 - samples/server/petstore/kotlin-server/jaxrs-spec From 1ba7a4eccbf85ed2511779ffe382bfe45f86e490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Sep 2025 09:21:21 +0200 Subject: [PATCH 16/20] reuse 1 open api schema for everything. Add also case where interface extends interface. --- ...otlin-spring-boot-x-kotlin-implements.yaml | 2 +- .../spring/KotlinSpringServerCodegenTest.java | 16 +- .../2_0/petstore-x-kotlin-implements.yaml | 709 ------------------ .../petstore-with-x-kotlin-implements.yaml | 557 ++++++-------- .../.openapi-generator/FILES | 2 + .../main/kotlin/com/some/pack/Fetchable.kt | 6 + .../org/openapitools/api/PetApiController.kt | 18 +- .../org/openapitools/api/PetApiService.kt | 15 +- .../org/openapitools/api/PetApiServiceImpl.kt | 4 +- .../openapitools/api/StoreApiController.kt | 11 +- .../org/openapitools/api/StoreApiService.kt | 13 +- .../openapitools/api/StoreApiServiceImpl.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 32 +- .../org/openapitools/api/UserApiService.kt | 29 +- .../openapitools/api/UserApiServiceImpl.kt | 8 +- .../main/kotlin/org/openapitools/model/Cat.kt | 58 ++ .../kotlin/org/openapitools/model/Category.kt | 2 +- .../kotlin/org/openapitools/model/Color.kt | 2 +- .../main/kotlin/org/openapitools/model/Dog.kt | 82 ++ .../openapitools/model/ModelApiResponse.kt | 2 +- .../kotlin/org/openapitools/model/Order.kt | 6 +- .../main/kotlin/org/openapitools/model/Pet.kt | 50 +- .../main/kotlin/org/openapitools/model/Tag.kt | 2 +- .../kotlin/org/openapitools/model/User.kt | 4 +- 24 files changed, 477 insertions(+), 1157 deletions(-) delete mode 100644 modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Fetchable.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml index eb03a41e164e..8ea206848c99 100644 --- a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -1,7 +1,7 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-x-kotlin-implements library: spring-boot -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml +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 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 1d6b2cbdaa71..d036a1f94339 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 @@ -977,12 +977,12 @@ public void generateSerializableModelWithXimplements() throws Exception { generator.opts(input).generate(); - Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Pet.kt"); + Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Dog.kt"); assertFileContains( path, "import java.io.Serializable", - "@get:JsonProperty(\"name\", required = true) override val name: kotlin.String,", - ") : Serializable, com.some.package.Named {", + "@get:JsonProperty(\"likesFetch\", required = true) override val likesFetch: kotlin.Boolean,", + ") : Pet, Serializable, com.some.pack.Fetchable {", "private const val serialVersionUID: kotlin.Long = 1" ); } @@ -1009,17 +1009,17 @@ public void generateNonSerializableModelWithXimplements() throws Exception { generator.opts(input).generate(); - Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Pet.kt"); + Path path = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/model/Dog.kt"); assertFileContains( path, - "@get:JsonProperty(\"name\", required = true) override val name: kotlin.String,", - ") : com.some.package.Named {" + "@get:JsonProperty(\"likesFetch\", required = true) override val likesFetch: kotlin.Boolean,", + ") : Pet, com.some.pack.Fetchable {" ); assertFileNotContains( path, "import java.io.Serializable", - ") : Serializable, com.some.package.Named {", - ") : Serializable {", + ") : Pet, Serializable, com.some.pack.Fetchable {", + ") : Pet, Serializable {", "private const val serialVersionUID: kotlin.Long = 1" ); } diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml deleted file mode 100644 index 82b3940f9973..000000000000 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-x-kotlin-implements.yaml +++ /dev/null @@ -1,709 +0,0 @@ -swagger: '2.0' -info: - description: 'This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.' - version: 1.0.0 - title: OpenAPI Petstore - license: - name: Apache-2.0 - url: 'https://www.apache.org/licenses/LICENSE-2.0.html' -host: petstore.swagger.io -basePath: /v2 -tags: - - name: pet - description: Everything about your Pets - - name: store - description: Access to Petstore orders - - name: user - description: Operations about user -schemes: - - http -paths: - /pet: - post: - tags: - - pet - summary: Add a new pet to the store - description: '' - operationId: addPet - consumes: - - application/json - - application/xml - produces: - - application/xml - - application/json - parameters: - - in: body - name: body - description: Pet object that needs to be added to the store - required: true - schema: - $ref: '#/definitions/Pet' - responses: - '405': - description: Invalid input - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - put: - tags: - - pet - summary: Update an existing pet - description: '' - operationId: updatePet - consumes: - - application/json - - application/xml - produces: - - application/xml - - application/json - parameters: - - in: body - name: body - description: Pet object that needs to be added to the store - required: true - schema: - $ref: '#/definitions/Pet' - responses: - '400': - description: Invalid ID supplied - '404': - description: Pet not found - '405': - description: Validation exception - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - /pet/findByStatus: - get: - tags: - - pet - summary: Finds Pets by status - description: Multiple status values can be provided with comma separated strings - operationId: findPetsByStatus - produces: - - application/xml - - application/json - parameters: - - name: status - in: query - description: Status values that need to be considered for filter - required: true - type: array - items: - type: string - enum: - - available - - pending - - sold - default: available - collectionFormat: csv - responses: - '200': - description: successful operation - schema: - type: array - items: - $ref: '#/definitions/Pet' - '400': - description: Invalid status value - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - /pet/findByTags: - get: - tags: - - pet - summary: Finds Pets by tags - description: 'Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.' - operationId: findPetsByTags - produces: - - application/xml - - application/json - parameters: - - name: tags - in: query - description: Tags to filter by - required: true - type: array - items: - type: string - collectionFormat: csv - responses: - '200': - description: successful operation - schema: - type: array - items: - $ref: '#/definitions/Pet' - '400': - description: Invalid tag value - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - deprecated: true - '/pet/{petId}': - get: - tags: - - pet - summary: Find pet by ID - description: Returns a single pet - operationId: getPetById - produces: - - application/xml - - application/json - parameters: - - name: petId - in: path - description: ID of pet to return - required: true - type: integer - format: int64 - responses: - '200': - description: successful operation - schema: - $ref: '#/definitions/Pet' - '400': - description: Invalid ID supplied - '404': - description: Pet not found - security: - - api_key: [] - post: - tags: - - pet - summary: Updates a pet in the store with form data - description: '' - operationId: updatePetWithForm - consumes: - - application/x-www-form-urlencoded - produces: - - application/xml - - application/json - parameters: - - name: petId - in: path - description: ID of pet that needs to be updated - required: true - type: integer - format: int64 - - name: name - in: formData - description: Updated name of the pet - required: false - type: string - - name: status - in: formData - description: Updated status of the pet - required: false - type: string - responses: - '405': - description: Invalid input - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - delete: - tags: - - pet - summary: Deletes a pet - description: '' - operationId: deletePet - produces: - - application/xml - - application/json - parameters: - - name: api_key - in: header - required: false - type: string - - name: petId - in: path - description: Pet id to delete - required: true - type: integer - format: int64 - responses: - '400': - description: Invalid pet value - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - '/pet/{petId}/uploadImage': - post: - tags: - - pet - summary: uploads an image - description: '' - operationId: uploadFile - consumes: - - multipart/form-data - produces: - - application/json - parameters: - - name: petId - in: path - description: ID of pet to update - required: true - type: integer - format: int64 - - name: additionalMetadata - in: formData - description: Additional data to pass to server - required: false - type: string - - name: file - in: formData - description: file to upload - required: false - type: file - responses: - '200': - description: successful operation - schema: - $ref: '#/definitions/ApiResponse' - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - /store/inventory: - get: - tags: - - store - summary: Returns pet inventories by status - description: Returns a map of status codes to quantities - operationId: getInventory - produces: - - application/json - parameters: [] - responses: - '200': - description: successful operation - schema: - type: object - additionalProperties: - type: integer - format: int32 - security: - - api_key: [] - /store/order: - post: - tags: - - store - summary: Place an order for a pet - description: '' - operationId: placeOrder - produces: - - application/xml - - application/json - parameters: - - in: body - name: body - description: order placed for purchasing the pet - required: true - schema: - $ref: '#/definitions/Order' - responses: - '200': - description: successful operation - schema: - $ref: '#/definitions/Order' - '400': - description: Invalid Order - '/store/order/{orderId}': - get: - tags: - - store - summary: Find purchase order by ID - description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions' - operationId: getOrderById - produces: - - application/xml - - application/json - parameters: - - name: orderId - in: path - description: ID of pet that needs to be fetched - required: true - type: integer - maximum: 5 - minimum: 1 - format: int64 - responses: - '200': - description: successful operation - schema: - $ref: '#/definitions/Order' - '400': - description: Invalid ID supplied - '404': - description: Order not found - delete: - tags: - - store - summary: Delete purchase order by ID - description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors - operationId: deleteOrder - produces: - - application/xml - - application/json - parameters: - - name: orderId - in: path - description: ID of the order that needs to be deleted - required: true - type: string - responses: - '400': - description: Invalid ID supplied - '404': - description: Order not found - /user: - post: - tags: - - user - summary: Create user - description: This can only be done by the logged in user. - operationId: createUser - produces: - - application/xml - - application/json - parameters: - - in: body - name: body - description: Created user object - required: true - schema: - $ref: '#/definitions/User' - responses: - default: - description: successful operation - /user/createWithArray: - post: - tags: - - user - summary: Creates list of users with given input array - description: '' - operationId: createUsersWithArrayInput - produces: - - application/xml - - application/json - parameters: - - in: body - name: body - description: List of user object - required: true - schema: - type: array - items: - $ref: '#/definitions/User' - responses: - default: - description: successful operation - /user/createWithList: - post: - tags: - - user - summary: Creates list of users with given input array - description: '' - operationId: createUsersWithListInput - produces: - - application/xml - - application/json - parameters: - - in: body - name: body - description: List of user object - required: true - schema: - type: array - items: - $ref: '#/definitions/User' - responses: - default: - description: successful operation - /user/login: - get: - tags: - - user - summary: Logs user into the system - description: '' - operationId: loginUser - produces: - - application/xml - - application/json - parameters: - - name: username - in: query - description: The user name for login - required: true - type: string - - name: password - in: query - description: The password for login in clear text - required: true - type: string - responses: - '200': - description: successful operation - schema: - type: string - headers: - X-Rate-Limit: - type: integer - format: int32 - description: calls per hour allowed by the user - X-Expires-After: - type: string - format: date-time - description: date in UTC when token expires - '400': - description: Invalid username/password supplied - /user/logout: - get: - tags: - - user - summary: Logs out current logged in user session - description: '' - operationId: logoutUser - produces: - - application/xml - - application/json - parameters: [] - responses: - default: - description: successful operation - '/user/{username}': - get: - tags: - - user - summary: Get user by user name - description: '' - operationId: getUserByName - produces: - - application/xml - - application/json - parameters: - - name: username - in: path - description: 'The name that needs to be fetched. Use user1 for testing.' - required: true - type: string - responses: - '200': - description: successful operation - schema: - $ref: '#/definitions/User' - '400': - description: Invalid username supplied - '404': - description: User not found - put: - tags: - - user - summary: Updated user - description: This can only be done by the logged in user. - operationId: updateUser - produces: - - application/xml - - application/json - parameters: - - name: username - in: path - description: name that need to be deleted - required: true - type: string - - in: body - name: body - description: Updated user object - required: true - schema: - $ref: '#/definitions/User' - responses: - '400': - description: Invalid user supplied - '404': - description: User not found - delete: - tags: - - user - summary: Delete user - description: This can only be done by the logged in user. - operationId: deleteUser - produces: - - application/xml - - application/json - parameters: - - name: username - in: path - description: The name that needs to be deleted - required: true - type: string - responses: - '400': - description: Invalid username supplied - '404': - description: User not found -securityDefinitions: - petstore_auth: - type: oauth2 - authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' - flow: implicit - scopes: - 'write:pets': modify pets in your account - 'read:pets': read your pets - api_key: - type: apiKey - name: api_key - in: header -definitions: - Order: - title: Pet Order - description: An order for a pets from the pet store - type: object - properties: - id: - type: integer - format: int64 - petId: - type: integer - format: int64 - quantity: - type: integer - format: int32 - shipDate: - type: string - format: date-time - status: - type: string - description: Order Status - enum: - - placed - - approved - - delivered - complete: - type: boolean - default: false - xml: - name: Order - Category: - title: Pet category - description: A category for a pet - type: object - properties: - id: - type: integer - format: int64 - name: - type: string - xml: - name: Category - User: - title: a User - description: A User who is purchasing from the pet store - type: object - properties: - id: - type: integer - format: int64 - username: - type: string - firstName: - type: string - lastName: - type: string - email: - type: string - password: - type: string - phone: - type: string - userStatus: - type: integer - format: int32 - description: User Status - xml: - name: User - Tag: - title: Pet Tag - description: A tag for a pet - type: object - properties: - id: - type: integer - format: int64 - name: - type: string - xml: - name: Tag - Pet: - title: a Pet - description: A pet for sale in the pet store - type: object - required: - - name - - photoUrls - x-kotlin-implements: [ com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods ] - x-kotlin-implements-fields: [ name, category ] - properties: - id: - type: integer - format: int64 - category: - $ref: '#/definitions/Category' - name: - type: string - example: doggie - photoUrls: - type: array - xml: - name: photoUrl - wrapped: true - items: - type: string - tags: - type: array - xml: - name: tag - wrapped: true - items: - $ref: '#/definitions/Tag' - status: - x-kotlin-implements: [ ] - type: string - description: pet status in the store - enum: - - available - - pending - - sold - color: - $ref: '#/definitions/Color' - xml: - name: Pet - Color: - x-kotlin-implements: [ com.some.pack.WithDefaultMethods ] - type: string - enum: - - black - - white - - brown - - yellow - - violet - ApiResponse: - title: An uploaded response - description: Describes the result of uploading an image resource - type: object - properties: - code: - type: integer - format: int32 - type: - type: string - message: - type: string diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml index 8efd273edb8c..f42e88a242e2 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml @@ -1,15 +1,15 @@ -openapi: 3.0.0 -servers: - - url: 'http://petstore.swagger.io/v2' +openapi: 3.0.3 info: - description: >- - This is a sample server Petstore server. For this sample, you can use the api key - `special-key` to test the authorization filters. - version: 1.0.0 title: OpenAPI Petstore + version: 1.0.0 + 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: name: Apache-2.0 - url: 'https://www.apache.org/licenses/LICENSE-2.0.html' + url: https://www.apache.org/licenses/LICENSE-2.0.html +servers: + - url: https://petstore.swagger.io/v2 tags: - name: pet description: Everything about your Pets @@ -17,51 +17,39 @@ tags: description: Access to Petstore orders - name: user description: Operations about user + paths: /pet: post: tags: - pet summary: Add a new pet to the store - description: '' operationId: addPet + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' responses: - '200': - description: successful operation - content: - application/xml: - schema: - $ref: '#/components/schemas/Pet' - application/json: - schema: - $ref: '#/components/schemas/Pet' '405': description: Invalid input security: - petstore_auth: - - 'write:pets' - - 'read:pets' - requestBody: - $ref: '#/components/requestBodies/Pet' + - write:pets + - read:pets put: tags: - pet summary: Update an existing pet - description: '' operationId: updatePet - externalDocs: - url: "http://petstore.swagger.io/v2/doc/updatePet" - description: "API documentation for the updatePet operation" + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' responses: - '200': - description: successful operation - content: - application/xml: - schema: - $ref: '#/components/schemas/Pet' - application/json: - schema: - $ref: '#/components/schemas/Pet' '400': description: Invalid ID supplied '404': @@ -70,10 +58,8 @@ paths: description: Validation exception security: - petstore_auth: - - 'write:pets' - - 'read:pets' - requestBody: - $ref: '#/components/requestBodies/Pet' + - write:pets + - read:pets /pet/findByStatus: get: tags: @@ -86,9 +72,6 @@ paths: in: query description: Status values that need to be considered for filter required: true - style: form - explode: false - deprecated: true schema: type: array items: @@ -97,16 +80,13 @@ paths: - available - pending - sold - default: available + default: [ available ] + style: form + explode: false responses: '200': description: successful operation content: - application/xml: - schema: - type: array - items: - $ref: '#/components/schemas/Pet' application/json: schema: type: array @@ -116,36 +96,30 @@ paths: description: Invalid status value security: - petstore_auth: - - 'read:pets' + - write:pets + - read:pets /pet/findByTags: get: tags: - pet summary: Finds Pets by tags - description: >- - Multiple tags can be provided with comma separated strings. Use tag1, - tag2, tag3 for testing. + description: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. operationId: findPetsByTags parameters: - name: tags in: query description: Tags to filter by required: true - style: form - explode: false schema: type: array items: type: string + style: form + explode: false responses: '200': description: successful operation content: - application/xml: - schema: - type: array - items: - $ref: '#/components/schemas/Pet' application/json: schema: type: array @@ -155,9 +129,9 @@ paths: description: Invalid tag value security: - petstore_auth: - - 'read:pets' - deprecated: true - '/pet/{petId}': + - write:pets + - read:pets + /pet/{petId}: get: tags: - pet @@ -176,9 +150,6 @@ paths: '200': description: successful operation content: - application/xml: - schema: - $ref: '#/components/schemas/Pet' application/json: schema: $ref: '#/components/schemas/Pet' @@ -187,13 +158,25 @@ paths: '404': description: Pet not found security: - - api_key: [] + - api_key: [ ] post: tags: - pet summary: Updates a pet in the store with form data - description: '' operationId: updatePetWithForm + requestBody: + required: false + content: + application/x-www-form-urlencoded: + schema: + type: object + properties: + name: + type: string + description: Updated name of the pet + status: + type: string + description: Updated status of the pet parameters: - name: petId in: path @@ -207,32 +190,14 @@ paths: description: Invalid input security: - petstore_auth: - - 'write:pets' - - 'read:pets' - requestBody: - content: - application/x-www-form-urlencoded: - schema: - type: object - properties: - name: - description: Updated name of the pet - type: string - status: - description: Updated status of the pet - type: string + - write:pets + - read:pets delete: tags: - pet summary: Deletes a pet - description: '' operationId: deletePet parameters: - - name: api_key - in: header - required: false - schema: - type: string - name: petId in: path description: Pet id to delete @@ -240,19 +205,23 @@ paths: schema: type: integer format: int64 + - name: api_key + in: header + required: false + schema: + type: string responses: '400': description: Invalid pet value security: - petstore_auth: - - 'write:pets' - - 'read:pets' - '/pet/{petId}/uploadImage': + - write:pets + - read:pets + /pet/{petId}/uploadImage: post: tags: - pet - summary: uploads an image - description: '' + summary: Uploads an image operationId: uploadFile parameters: - name: petId @@ -262,36 +231,34 @@ paths: schema: type: integer format: int64 - responses: - '200': - description: successful operation - content: - application/json: - schema: - $ref: '#/components/schemas/ApiResponse' - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' requestBody: + required: false content: multipart/form-data: schema: type: object properties: additionalMetadata: - description: Additional data to pass to server type: string file: - description: file to upload type: string format: binary + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - write:pets + - read:pets /store/inventory: get: tags: - store summary: Returns pet inventories by status - description: Returns a map of status codes to quantities operationId: getInventory responses: '200': @@ -304,59 +271,46 @@ paths: type: integer format: int32 security: - - api_key: [] + - api_key: [ ] /store/order: post: tags: - store summary: Place an order for a pet - description: '' operationId: placeOrder + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Order' responses: '200': description: successful operation content: - application/xml: - schema: - $ref: '#/components/schemas/Order' application/json: schema: $ref: '#/components/schemas/Order' '400': description: Invalid Order - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/Order' - description: order placed for purchasing the pet - required: true - '/store/order/{orderId}': + /store/order/{orderId}: get: tags: - store summary: Find purchase order by ID - description: >- - For valid response try integer IDs with value <= 5 or > 10. Other values - will generate exceptions operationId: getOrderById parameters: - name: orderId in: path - description: ID of pet that needs to be fetched required: true schema: type: integer - format: int64 minimum: 1 maximum: 5 responses: '200': description: successful operation content: - application/xml: - schema: - $ref: '#/components/schemas/Order' application/json: schema: $ref: '#/components/schemas/Order' @@ -368,14 +322,10 @@ paths: tags: - store summary: Delete purchase order by ID - description: >- - For valid response try integer IDs with value < 1000. Anything above - 1000 or nonintegers will generate API errors operationId: deleteOrder parameters: - name: orderId in: path - description: ID of the order that needs to be deleted required: true schema: type: string @@ -389,95 +339,79 @@ paths: tags: - user summary: Create user - description: This can only be done by the logged in user. operationId: createUser - responses: - default: - description: successful operation - security: - - api_key: [] requestBody: + required: true content: application/json: schema: $ref: '#/components/schemas/User' - description: Created user object - required: true + responses: + '200': + description: successful operation /user/createWithArray: post: tags: - user summary: Creates list of users with given input array - description: '' operationId: createUsersWithArrayInput + requestBody: + required: true + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' responses: - default: + '200': description: successful operation - security: - - api_key: [] - requestBody: - $ref: '#/components/requestBodies/UserArray' /user/createWithList: post: tags: - user summary: Creates list of users with given input array - description: '' operationId: createUsersWithListInput + requestBody: + required: true + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' responses: - default: + '200': description: successful operation - security: - - api_key: [] - requestBody: - $ref: '#/components/requestBodies/UserArray' /user/login: get: tags: - user summary: Logs user into the system - description: '' operationId: loginUser parameters: - name: username in: query - description: The user name for login required: true schema: type: string - pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' - name: password in: query - description: The password for login in clear text required: true schema: type: string responses: '200': description: successful operation - headers: - Set-Cookie: - description: >- - Cookie authentication key for use with the `api_key` - apiKey authentication. + content: + application/json: schema: type: string - example: AUTH_KEY=abcde12345; Path=/; HttpOnly + headers: X-Rate-Limit: - description: calls per hour allowed by the user schema: type: integer - format: int32 X-Expires-After: - description: date in UTC when token expires - schema: - type: string - format: date-time - content: - application/xml: - schema: - type: string - application/json: schema: type: string '400': @@ -487,24 +421,19 @@ paths: tags: - user summary: Logs out current logged in user session - description: '' operationId: logoutUser responses: - default: + '200': description: successful operation - security: - - api_key: [] - '/user/{username}': + /user/{username}: get: tags: - user summary: Get user by user name - description: '' operationId: getUserByName parameters: - name: username in: path - description: The name that needs to be fetched. Use user1 for testing. required: true schema: type: string @@ -512,9 +441,6 @@ paths: '200': description: successful operation content: - application/xml: - schema: - $ref: '#/components/schemas/User' application/json: schema: $ref: '#/components/schemas/User' @@ -526,39 +452,32 @@ paths: tags: - user summary: Updated user - description: This can only be done by the logged in user. operationId: updateUser parameters: - name: username in: path - description: name that need to be deleted required: true schema: type: string - responses: - '400': - description: Invalid user supplied - '404': - description: User not found - security: - - api_key: [] requestBody: + required: true content: application/json: schema: $ref: '#/components/schemas/User' - description: Updated user object - required: true + responses: + '400': + description: Invalid user supplied + '404': + description: User not found delete: tags: - user summary: Delete user - description: This can only be done by the logged in user. operationId: deleteUser parameters: - name: username in: path - description: The name that needs to be deleted required: true schema: type: string @@ -567,64 +486,115 @@ paths: description: Invalid username supplied '404': description: User not found - security: - - api_key: [] - /fake/annotations: - post: - tags: - - fake - summary: annotate - operationId: annotations - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Annotation' - responses: - '200': - description: OK -externalDocs: - description: Find out more about Swagger - url: 'http://swagger.io' + components: - requestBodies: - UserArray: - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/User' - description: List of user object - required: true - Pet: - content: - application/json: - schema: - $ref: '#/components/schemas/Pet' - application/xml: - schema: - $ref: '#/components/schemas/Pet' - description: Pet object that needs to be added to the store - required: true securitySchemes: petstore_auth: type: oauth2 flows: implicit: - authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog scopes: - 'write:pets': modify pets in your account - 'read:pets': read your pets + write:pets: modify pets in your account + read:pets: read your pets api_key: type: apiKey name: api_key in: header schemas: + Pet: + type: object + discriminator: + propertyName: petType + mapping: + Dog: '#/components/schemas/Dog' + Cat: '#/components/schemas/Cat' + x-kotlin-implements: [ com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods ] + x-kotlin-implements-fields: [ name, category ] + required: + - name + - photoUrls + - petType + properties: + id: + type: integer + format: int64 + category: + $ref: '#/components/schemas/Category' + name: + type: string + photoUrls: + type: array + items: + type: string + tags: + type: array + items: + $ref: '#/components/schemas/Tag' + status: + type: string + enum: + - available + - pending + - sold + color: + $ref: '#/components/schemas/Color' + petType: + type: string + Dog: + allOf: + - $ref: '#/components/schemas/Pet' + x-kotlin-implements: [ com.some.pack.Fetchable ] + x-kotlin-implements-fields: [ likesFetch ] + properties: + bark: + type: boolean + breed: + type: string + enum: + - Dingo + - Husky + - Retriever + - Shepherd + likesFetch: + type: boolean + description: Whether the dog enjoys fetching + required: [ bark, breed, likesFetch ] + type: object + Cat: + allOf: + - $ref: '#/components/schemas/Pet' + properties: + hunts: + type: boolean + age: + type: integer + type: object + Category: + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + Tag: + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + Color: + type: string + enum: + - black + - white + - brown + - yellow + - violet Order: - title: Pet Order - description: An order for a pets from the pet store type: object properties: id: @@ -641,7 +611,6 @@ components: format: date-time status: type: string - description: Order Status enum: - placed - approved @@ -649,24 +618,7 @@ components: complete: type: boolean default: false - xml: - name: Order - Category: - title: Pet category - description: A category for a pet - type: object - properties: - id: - type: integer - format: int64 - name: - type: string - pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' - xml: - name: Category User: - title: a User - description: A User who is purchasing from the pet store type: object properties: id: @@ -687,68 +639,7 @@ components: userStatus: type: integer format: int32 - description: User Status - xml: - name: User - required: - - username - Tag: - title: Pet Tag - description: A tag for a pet - type: object - properties: - id: - type: integer - format: int64 - name: - type: string - xml: - name: Tag - Pet: - x-kotlin-implements: [ 'com.some.package.Named' ] - x-kotlin-implements-fields: [ name ] - title: a Pet - description: A pet for sale in the pet store - type: object - required: - - name - - photoUrls - properties: - id: - type: integer - format: int64 - category: - $ref: '#/components/schemas/Category' - name: - type: string - example: doggie - photoUrls: - type: array - xml: - name: photoUrl - wrapped: true - items: - type: string - tags: - type: array - xml: - name: tag - wrapped: true - items: - $ref: '#/components/schemas/Tag' - status: - type: string - description: pet status in the store - deprecated: true - enum: - - available - - pending - - sold - xml: - name: Pet ApiResponse: - title: An uploaded response - description: Describes the result of uploading an image resource type: object properties: code: @@ -758,31 +649,3 @@ components: type: string message: type: string - Annotation: - type: object - properties: - id: - type: string - format: uuid - UserOrPet: - oneOf: - - $ref: "#/components/schemas/User" - - $ref: "#/components/schemas/Pet" - UserOrPetOrArrayString: - oneOf: - - $ref: "#/components/schemas/User" - - $ref: "#/components/schemas/Pet" - - type: array - items: - type: string - AnyOfUserOrPet: - anyOf: - - $ref: "#/components/schemas/User" - - $ref: "#/components/schemas/Pet" - AnyOfUserOrPetOrArrayString: - anyOf: - - $ref: "#/components/schemas/User" - - $ref: "#/components/schemas/Pet" - - type: array - items: - type: string 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 b7fb98d60d86..705fcfa02933 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 @@ -19,8 +19,10 @@ src/main/kotlin/org/openapitools/api/UserApiController.kt src/main/kotlin/org/openapitools/api/UserApiService.kt src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt src/main/kotlin/org/openapitools/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 diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Fetchable.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/com/some/pack/Fetchable.kt new file mode 100644 index 000000000000..b8680298a112 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt index 4e393ceef9b1..be4dff3d3c8b 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -33,10 +33,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.POST], value = ["/pet"], - consumes = ["application/json", "application/xml"] + consumes = ["application/json"] ) - fun addPet( @Valid @RequestBody body: Pet): ResponseEntity { - return ResponseEntity(service.addPet(body), HttpStatus.valueOf(405)) + fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { + return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(405)) } @@ -52,7 +52,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByStatus"], - produces = ["application/xml", "application/json"] + produces = ["application/json"] ) fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) @@ -62,7 +62,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], value = ["/pet/findByTags"], - produces = ["application/xml", "application/json"] + produces = ["application/json"] ) fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) @@ -72,7 +72,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.GET], value = ["/pet/{petId}"], - produces = ["application/xml", "application/json"] + produces = ["application/json"] ) fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) @@ -82,10 +82,10 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { @RequestMapping( method = [RequestMethod.PUT], value = ["/pet"], - consumes = ["application/json", "application/xml"] + consumes = ["application/json"] ) - fun updatePet( @Valid @RequestBody body: Pet): ResponseEntity { - return ResponseEntity(service.updatePet(body), HttpStatus.valueOf(400)) + fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { + return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(400)) } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt index bee779a69332..22acc20dae22 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt @@ -8,11 +8,11 @@ interface PetApiService { /** * POST /pet : Add a new pet to the store * - * @param body Pet object that needs to be added to the store (required) + * @param pet (required) * @return Invalid input (status code 405) * @see PetApi#addPet */ - fun addPet(body: Pet): Unit + fun addPet(pet: Pet): Unit /** * DELETE /pet/{petId} : Deletes a pet @@ -42,7 +42,6 @@ interface PetApiService { * @param tags Tags to filter by (required) * @return successful operation (status code 200) * or Invalid tag value (status code 400) - * @deprecated * @see PetApi#findPetsByTags */ fun findPetsByTags(tags: kotlin.collections.List): List @@ -62,13 +61,13 @@ interface PetApiService { /** * PUT /pet : Update an existing pet * - * @param body Pet object that needs to be added to the store (required) + * @param pet (required) * @return Invalid ID supplied (status code 400) * or Pet not found (status code 404) * or Validation exception (status code 405) * @see PetApi#updatePet */ - fun updatePet(body: Pet): Unit + fun updatePet(pet: Pet): Unit /** * POST /pet/{petId} : Updates a pet in the store with form data @@ -82,11 +81,11 @@ interface PetApiService { fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit /** - * POST /pet/{petId}/uploadImage : uploads an image + * POST /pet/{petId}/uploadImage : Uploads an image * * @param petId ID of pet to update (required) - * @param additionalMetadata Additional data to pass to server (optional) - * @param file file to upload (optional) + * @param additionalMetadata (optional) + * @param file (optional) * @return successful operation (status code 200) * @see PetApi#uploadFile */ diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt index 6b401e7ee880..f44a68c3d990 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service @Service class PetApiServiceImpl : PetApiService { - override fun addPet(body: Pet): Unit { + override fun addPet(pet: Pet): Unit { TODO("Implement me") } @@ -26,7 +26,7 @@ class PetApiServiceImpl : PetApiService { TODO("Implement me") } - override fun updatePet(body: Pet): Unit { + override fun updatePet(pet: Pet): Unit { TODO("Implement me") } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 6cbb8279976f..2021fb0a685c 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -51,9 +51,9 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.GET], value = ["/store/order/{orderId}"], - produces = ["application/xml", "application/json"] + produces = ["application/json"] ) - fun getOrderById(@Min(1L) @Max(5L) @PathVariable("orderId") orderId: kotlin.Long): ResponseEntity { + fun getOrderById(@Min(1) @Max(5) @PathVariable("orderId") orderId: kotlin.Int): ResponseEntity { return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) } @@ -61,9 +61,10 @@ class StoreApiController(@Autowired(required = true) val service: StoreApiServic @RequestMapping( method = [RequestMethod.POST], value = ["/store/order"], - produces = ["application/xml", "application/json"] + produces = ["application/json"], + consumes = ["application/json"] ) - fun placeOrder( @Valid @RequestBody body: Order): ResponseEntity { - return ResponseEntity(service.placeOrder(body), HttpStatus.valueOf(200)) + fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { + return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt index 60e754529448..18a2fa71ab91 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt @@ -6,9 +6,8 @@ interface StoreApiService { /** * DELETE /store/order/{orderId} : Delete purchase order by ID - * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * - * @param orderId ID of the order that needs to be deleted (required) + * @param orderId (required) * @return Invalid ID supplied (status code 400) * or Order not found (status code 404) * @see StoreApi#deleteOrder @@ -17,7 +16,6 @@ interface StoreApiService { /** * GET /store/inventory : Returns pet inventories by status - * Returns a map of status codes to quantities * * @return successful operation (status code 200) * @see StoreApi#getInventory @@ -26,23 +24,22 @@ interface StoreApiService { /** * GET /store/order/{orderId} : Find purchase order by ID - * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions * - * @param orderId ID of pet that needs to be fetched (required) + * @param orderId (required) * @return successful operation (status code 200) * or Invalid ID supplied (status code 400) * or Order not found (status code 404) * @see StoreApi#getOrderById */ - fun getOrderById(orderId: kotlin.Long): Order + fun getOrderById(orderId: kotlin.Int): Order /** * POST /store/order : Place an order for a pet * - * @param body order placed for purchasing the pet (required) + * @param order (required) * @return successful operation (status code 200) * or Invalid Order (status code 400) * @see StoreApi#placeOrder */ - fun placeOrder(body: Order): Order + fun placeOrder(order: Order): Order } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt index 7e733e28dc50..e20f1bb6cece 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt @@ -13,11 +13,11 @@ class StoreApiServiceImpl : StoreApiService { TODO("Implement me") } - override fun getOrderById(orderId: kotlin.Long): Order { + override fun getOrderById(orderId: kotlin.Int): Order { TODO("Implement me") } - override fun placeOrder(body: Order): Order { + override fun placeOrder(order: Order): Order { TODO("Implement me") } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt index daf5c943c2ec..b0d28877806c 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -31,28 +31,31 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.POST], - value = ["/user"] + value = ["/user"], + consumes = ["application/json"] ) - fun createUser( @Valid @RequestBody body: User): ResponseEntity { - return ResponseEntity(service.createUser(body), HttpStatus.valueOf(200)) + fun createUser( @Valid @RequestBody user: User): ResponseEntity { + return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) } @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithArray"] + value = ["/user/createWithArray"], + consumes = ["application/json"] ) - fun createUsersWithArrayInput( @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { - return ResponseEntity(service.createUsersWithArrayInput(body), HttpStatus.valueOf(200)) + fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) } @RequestMapping( method = [RequestMethod.POST], - value = ["/user/createWithList"] + value = ["/user/createWithList"], + consumes = ["application/json"] ) - fun createUsersWithListInput( @Valid @RequestBody body: kotlin.collections.List): ResponseEntity { - return ResponseEntity(service.createUsersWithListInput(body), HttpStatus.valueOf(200)) + fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { + return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) } @@ -68,7 +71,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], value = ["/user/{username}"], - produces = ["application/xml", "application/json"] + produces = ["application/json"] ) fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) @@ -78,7 +81,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.GET], value = ["/user/login"], - produces = ["application/xml", "application/json"] + 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 { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) @@ -96,9 +99,10 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) @RequestMapping( method = [RequestMethod.PUT], - value = ["/user/{username}"] + value = ["/user/{username}"], + consumes = ["application/json"] ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody body: User): ResponseEntity { - return ResponseEntity(service.updateUser(username, body), HttpStatus.valueOf(400)) + fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { + return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) } } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt index a1bcf6be237c..4580aba4442a 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt @@ -6,37 +6,35 @@ interface UserApiService { /** * POST /user : Create user - * This can only be done by the logged in user. * - * @param body Created user object (required) + * @param user (required) * @return successful operation (status code 200) * @see UserApi#createUser */ - fun createUser(body: User): Unit + fun createUser(user: User): Unit /** * POST /user/createWithArray : Creates list of users with given input array * - * @param body List of user object (required) + * @param user (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithArrayInput */ - fun createUsersWithArrayInput(body: kotlin.collections.List): Unit + fun createUsersWithArrayInput(user: kotlin.collections.List): Unit /** * POST /user/createWithList : Creates list of users with given input array * - * @param body List of user object (required) + * @param user (required) * @return successful operation (status code 200) * @see UserApi#createUsersWithListInput */ - fun createUsersWithListInput(body: kotlin.collections.List): Unit + fun createUsersWithListInput(user: kotlin.collections.List): Unit /** * DELETE /user/{username} : Delete user - * This can only be done by the logged in user. * - * @param username The name that needs to be deleted (required) + * @param username (required) * @return Invalid username supplied (status code 400) * or User not found (status code 404) * @see UserApi#deleteUser @@ -46,7 +44,7 @@ interface UserApiService { /** * GET /user/{username} : Get user by user name * - * @param username The name that needs to be fetched. Use user1 for testing. (required) + * @param username (required) * @return successful operation (status code 200) * or Invalid username supplied (status code 400) * or User not found (status code 404) @@ -57,8 +55,8 @@ interface UserApiService { /** * GET /user/login : Logs user into the system * - * @param username The user name for login (required) - * @param password The password for login in clear text (required) + * @param username (required) + * @param password (required) * @return successful operation (status code 200) * or Invalid username/password supplied (status code 400) * @see UserApi#loginUser @@ -75,13 +73,12 @@ interface UserApiService { /** * PUT /user/{username} : Updated user - * This can only be done by the logged in user. * - * @param username name that need to be deleted (required) - * @param body Updated user object (required) + * @param username (required) + * @param user (required) * @return Invalid user supplied (status code 400) * or User not found (status code 404) * @see UserApi#updateUser */ - fun updateUser(username: kotlin.String, body: User): Unit + fun updateUser(username: kotlin.String, user: User): Unit } diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt index ebd822220153..0c24688975c9 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt @@ -5,15 +5,15 @@ import org.springframework.stereotype.Service @Service class UserApiServiceImpl : UserApiService { - override fun createUser(body: User): Unit { + override fun createUser(user: User): Unit { TODO("Implement me") } - override fun createUsersWithArrayInput(body: kotlin.collections.List): Unit { + override fun createUsersWithArrayInput(user: kotlin.collections.List): Unit { TODO("Implement me") } - override fun createUsersWithListInput(body: kotlin.collections.List): Unit { + override fun createUsersWithListInput(user: kotlin.collections.List): Unit { TODO("Implement me") } @@ -33,7 +33,7 @@ class UserApiServiceImpl : UserApiService { TODO("Implement me") } - override fun updateUser(username: kotlin.String, body: User): Unit { + override fun updateUser(username: kotlin.String, user: User): Unit { TODO("Implement me") } } 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 new file mode 100644 index 000000000000..69d297db20bd --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt @@ -0,0 +1,58 @@ +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 + +/** + * + * @param hunts + * @param age + */ +data class Cat( + + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + + @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + + @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, + + @get:JsonProperty("age") val age: kotlin.Int? = null, + + @get:JsonProperty("id") override val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") override val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, + + @get:JsonProperty("status") override val status: Cat.Status? = null, + + @field:Valid + @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-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 0638b1718f3d..f98ea616ec26 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 @@ -15,7 +15,7 @@ import javax.validation.constraints.Size import javax.validation.Valid /** - * A category for a pet + * * @param id * @param name */ 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..2b3e6a27f52e 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 @@ -20,7 +20,7 @@ import javax.validation.Valid * * Values: black,white,brown,yellow,violet */ -enum class Color(@get:JsonValue val value: kotlin.String) : com.some.pack.WithDefaultMethods { +enum class Color(@get:JsonValue val value: kotlin.String) { black("black"), white("white"), 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 new file mode 100644 index 000000000000..d75991c0c636 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt @@ -0,0 +1,82 @@ +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 + +/** + * + * @param bark + * @param breed + * @param likesFetch Whether the dog enjoys fetching + */ +data class Dog( + + @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, + + @get:JsonProperty("breed", required = true) val breed: Dog.Breed, + + @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, + + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + + @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + + @get:JsonProperty("id") override val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") override val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, + + @get:JsonProperty("status") override val status: Dog.Status? = null, + + @field:Valid + @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-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 f520047d850d..d5f1bfed6348 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 @@ -15,7 +15,7 @@ import javax.validation.constraints.Size import javax.validation.Valid /** - * Describes the result of uploading an image resource + * * @param code * @param type * @param message 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 4ebe51e765ed..b9cf389785aa 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 @@ -17,12 +17,12 @@ import javax.validation.constraints.Size import javax.validation.Valid /** - * An order for a pets from the pet store + * * @param id * @param petId * @param quantity * @param shipDate - * @param status Order Status + * @param status * @param complete */ data class Order( @@ -41,7 +41,7 @@ data class Order( ) : Serializable { /** - * Order Status + * * Values: placed,approved,delivered */ enum class Status(@get:JsonValue val value: kotlin.String) { 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 e4b670add014..20887890f694 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 @@ -3,7 +3,10 @@ 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 @@ -20,37 +23,54 @@ import javax.validation.constraints.Size import javax.validation.Valid /** - * A pet for sale in the pet store + * * @param name * @param photoUrls + * @param petType * @param id * @param category * @param tags - * @param status pet status in the store + * @param status * @param color */ -data class Pet( +@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") +) - @get:JsonProperty("name", required = true) override val name: kotlin.String, +interface Pet : Serializable, com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { + + override val name: kotlin.String - @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, + + val photoUrls: kotlin.collections.List - @get:JsonProperty("id") val id: kotlin.Long? = null, + + val petType: kotlin.String - @field:Valid - @get:JsonProperty("category") override val category: Category? = null, + + val id: kotlin.Long? - @field:Valid - @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, + + override val category: Category? - @get:JsonProperty("status") val status: Pet.Status? = null, + + val tags: kotlin.collections.List? + + + val status: Pet.Status? + + + val color: Color? - @field:Valid - @get:JsonProperty("color") val color: Color? = null -) : Serializable, com.some.pack.Named, com.some.pack.WithCategory, com.some.pack.WithDefaultMethods { /** - * pet status in the store + * * Values: available,pending,sold */ enum class Status(@get:JsonValue val value: kotlin.String) { 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 36f841600047..cce8583e6d59 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 @@ -15,7 +15,7 @@ import javax.validation.constraints.Size import javax.validation.Valid /** - * A tag for a pet + * * @param id * @param name */ 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 b04c9e312592..f24ba91ffb73 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 @@ -15,7 +15,7 @@ import javax.validation.constraints.Size import javax.validation.Valid /** - * A User who is purchasing from the pet store + * * @param id * @param username * @param firstName @@ -23,7 +23,7 @@ import javax.validation.Valid * @param email * @param password * @param phone - * @param userStatus User Status + * @param userStatus */ data class User( From 3d78287a0434404ab36f08c667a7d1d6732bb89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Sep 2025 09:43:49 +0200 Subject: [PATCH 17/20] add warn logs when x-kotlin-implements-fields is used without x-kotlin-implements to improve usability --- .../codegen/languages/AbstractKotlinCodegen.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 2ee6db282d96..e637234fb0f6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -836,9 +836,15 @@ protected boolean needToImport(String type) { public CodegenModel fromModel(String name, Schema schema) { CodegenModel m = super.fromModel(name, schema); List implementedInterfacesClasses = (List) m.getVendorExtensions().getOrDefault(VendorExtension.X_KOTLIN_IMPLEMENTS.getName(), List.of()); - List implementedInterfacesFields = implementedInterfacesClasses.isEmpty() - ? List.of() - : (List) m.getVendorExtensions().getOrDefault(VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS.getName(), List.of()); + List implementedInterfacesFields = Optional.ofNullable((List) m.getVendorExtensions().get(VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS.getName())) + .map(xKotlinImplementsFields -> { + if (implementedInterfacesClasses.isEmpty() && !xKotlinImplementsFields.isEmpty()) { + LOGGER.warn("Annotating {} with {} without {} is not supported. {} will be ignored.", + name, VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS.getName(), VendorExtension.X_KOTLIN_IMPLEMENTS.getName(), + VendorExtension.X_KOTLIN_IMPLEMENTS_FIELDS.getName()); + } + return xKotlinImplementsFields; + }).orElse(List.of()); m.optionalVars = m.optionalVars.stream().distinct().collect(Collectors.toList()); // Update allVars/requiredVars/optionalVars with isInherited // Each of these lists contains elements that are similar, but they are all cloned From fb3501535a8f0b14e4fd74aa4ad32b4457fb5149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Sep 2025 10:52:32 +0200 Subject: [PATCH 18/20] remove unnecessary generated files --- .../kotlin/org/openapitools/Application.kt | 13 -- .../kotlin/org/openapitools/api/ApiUtil.kt | 19 --- .../kotlin/org/openapitools/api/Exceptions.kt | 30 ----- .../org/openapitools/api/PetApiController.kt | 111 ------------------ .../org/openapitools/api/PetApiService.kt | 93 --------------- .../org/openapitools/api/PetApiServiceImpl.kt | 40 ------- .../openapitools/api/StoreApiController.kt | 70 ----------- .../org/openapitools/api/StoreApiService.kt | 45 ------- .../openapitools/api/StoreApiServiceImpl.kt | 23 ---- .../org/openapitools/api/UserApiController.kt | 108 ----------------- .../org/openapitools/api/UserApiService.kt | 84 ------------- .../openapitools/api/UserApiServiceImpl.kt | 39 ------ .../EnumConverterConfiguration.kt | 26 ---- .../main/kotlin/org/openapitools/model/Cat.kt | 58 --------- .../kotlin/org/openapitools/model/Category.kt | 33 ------ .../kotlin/org/openapitools/model/Color.kt | 40 ------- .../main/kotlin/org/openapitools/model/Dog.kt | 82 ------------- .../openapitools/model/ModelApiResponse.kt | 36 ------ .../kotlin/org/openapitools/model/Order.kt | 67 ----------- .../main/kotlin/org/openapitools/model/Pet.kt | 96 --------------- .../main/kotlin/org/openapitools/model/Tag.kt | 33 ------ .../kotlin/org/openapitools/model/User.kt | 51 -------- 22 files changed, 1197 deletions(-) delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt delete mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt deleted file mode 100644 index 2fe6de62479e..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/Application.kt +++ /dev/null @@ -1,13 +0,0 @@ -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-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt deleted file mode 100644 index 88e892d0f49a..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.openapitools.api - -import org.springframework.web.context.request.NativeWebRequest - -import javax.servlet.http.HttpServletResponse -import java.io.IOException - -object ApiUtil { - fun setExampleResponse(req: NativeWebRequest, contentType: String, example: String) { - try { - val res = req.getNativeResponse(HttpServletResponse::class.java) - res?.characterEncoding = "UTF-8" - res?.addHeader("Content-Type", contentType) - res?.writer?.print(example) - } catch (e: IOException) { - throw RuntimeException(e) - } - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt deleted file mode 100644 index 901db1237ee7..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt +++ /dev/null @@ -1,30 +0,0 @@ -package org.openapitools.api - -import org.springframework.context.annotation.Configuration -import org.springframework.http.HttpStatus -import org.springframework.web.bind.annotation.ControllerAdvice -import org.springframework.web.bind.annotation.ExceptionHandler -import javax.servlet.http.HttpServletResponse -import javax.validation.ConstraintViolationException - -// TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception -sealed class ApiException(msg: String, val code: Int) : Exception(msg) - -class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) - -@Configuration("org.openapitools.api.DefaultExceptionHandler") -@ControllerAdvice -class DefaultExceptionHandler { - - @ExceptionHandler(value = [ApiException::class]) - fun onApiException(ex: ApiException, response: HttpServletResponse): Unit = - response.sendError(ex.code, ex.message) - - @ExceptionHandler(value = [NotImplementedError::class]) - fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit = - response.sendError(HttpStatus.NOT_IMPLEMENTED.value()) - - @ExceptionHandler(value = [ConstraintViolationException::class]) - fun onConstraintViolation(ex: ConstraintViolationException, response: HttpServletResponse): Unit = - response.sendError(HttpStatus.BAD_REQUEST.value(), ex.constraintViolations.joinToString(", ") { it.message }) -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt deleted file mode 100644 index be4dff3d3c8b..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ /dev/null @@ -1,111 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.ModelApiResponse -import org.openapitools.model.Pet -import org.springframework.http.HttpStatus -import org.springframework.http.MediaType -import org.springframework.http.ResponseEntity - -import org.springframework.web.bind.annotation.* -import org.springframework.validation.annotation.Validated -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.beans.factory.annotation.Autowired - -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -import kotlin.collections.List -import kotlin.collections.Map - -@RestController -@Validated -@RequestMapping("\${api.base-path:/v2}") -class PetApiController(@Autowired(required = true) val service: PetApiService) { - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet"], - consumes = ["application/json"] - ) - fun addPet( @Valid @RequestBody pet: Pet): ResponseEntity { - return ResponseEntity(service.addPet(pet), HttpStatus.valueOf(405)) - } - - - @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/pet/{petId}"] - ) - fun deletePet( @PathVariable("petId") petId: kotlin.Long, @RequestHeader(value = "api_key", required = false) apiKey: kotlin.String?): ResponseEntity { - return ResponseEntity(service.deletePet(petId, apiKey), HttpStatus.valueOf(400)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByStatus"], - produces = ["application/json"] - ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { - return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/findByTags"], - produces = ["application/json"] - ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { - return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/pet/{petId}"], - produces = ["application/json"] - ) - fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity { - return ResponseEntity(service.getPetById(petId), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.PUT], - value = ["/pet"], - consumes = ["application/json"] - ) - fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity { - return ResponseEntity(service.updatePet(pet), HttpStatus.valueOf(400)) - } - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}"], - consumes = ["application/x-www-form-urlencoded"] - ) - fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity { - return ResponseEntity(service.updatePetWithForm(petId, name, status), HttpStatus.valueOf(405)) - } - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/pet/{petId}/uploadImage"], - produces = ["application/json"], - consumes = ["multipart/form-data"] - ) - fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile?): ResponseEntity { - return ResponseEntity(service.uploadFile(petId, additionalMetadata, file), HttpStatus.valueOf(200)) - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt deleted file mode 100644 index 22acc20dae22..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiService.kt +++ /dev/null @@ -1,93 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.ModelApiResponse -import org.openapitools.model.Pet - -interface PetApiService { - - /** - * POST /pet : Add a new pet to the store - * - * @param pet (required) - * @return Invalid input (status code 405) - * @see PetApi#addPet - */ - fun addPet(pet: Pet): Unit - - /** - * DELETE /pet/{petId} : Deletes a pet - * - * @param petId Pet id to delete (required) - * @param apiKey (optional) - * @return Invalid pet value (status code 400) - * @see PetApi#deletePet - */ - fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit - - /** - * GET /pet/findByStatus : Finds Pets by status - * Multiple status values can be provided with comma separated strings - * - * @param status Status values that need to be considered for filter (required) - * @return successful operation (status code 200) - * or Invalid status value (status code 400) - * @see PetApi#findPetsByStatus - */ - fun findPetsByStatus(status: kotlin.collections.List): List - - /** - * GET /pet/findByTags : Finds Pets by tags - * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - * - * @param tags Tags to filter by (required) - * @return successful operation (status code 200) - * or Invalid tag value (status code 400) - * @see PetApi#findPetsByTags - */ - fun findPetsByTags(tags: kotlin.collections.List): List - - /** - * GET /pet/{petId} : Find pet by ID - * Returns a single pet - * - * @param petId ID of pet to return (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * @see PetApi#getPetById - */ - fun getPetById(petId: kotlin.Long): Pet - - /** - * PUT /pet : Update an existing pet - * - * @param pet (required) - * @return Invalid ID supplied (status code 400) - * or Pet not found (status code 404) - * or Validation exception (status code 405) - * @see PetApi#updatePet - */ - fun updatePet(pet: Pet): Unit - - /** - * POST /pet/{petId} : Updates a pet in the store with form data - * - * @param petId ID of pet that needs to be updated (required) - * @param name Updated name of the pet (optional) - * @param status Updated status of the pet (optional) - * @return Invalid input (status code 405) - * @see PetApi#updatePetWithForm - */ - fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit - - /** - * POST /pet/{petId}/uploadImage : Uploads an image - * - * @param petId ID of pet to update (required) - * @param additionalMetadata (optional) - * @param file (optional) - * @return successful operation (status code 200) - * @see PetApi#uploadFile - */ - fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile?): ModelApiResponse -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt deleted file mode 100644 index f44a68c3d990..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt +++ /dev/null @@ -1,40 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.ModelApiResponse -import org.openapitools.model.Pet -import org.springframework.stereotype.Service -@Service -class PetApiServiceImpl : PetApiService { - - override fun addPet(pet: Pet): Unit { - TODO("Implement me") - } - - override fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?): Unit { - TODO("Implement me") - } - - override fun findPetsByStatus(status: kotlin.collections.List): List { - TODO("Implement me") - } - - override fun findPetsByTags(tags: kotlin.collections.List): List { - TODO("Implement me") - } - - override fun getPetById(petId: kotlin.Long): Pet { - TODO("Implement me") - } - - override fun updatePet(pet: Pet): Unit { - TODO("Implement me") - } - - override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?): Unit { - TODO("Implement me") - } - - override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: org.springframework.web.multipart.MultipartFile?): ModelApiResponse { - TODO("Implement me") - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt deleted file mode 100644 index 2021fb0a685c..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ /dev/null @@ -1,70 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.Order -import org.springframework.http.HttpStatus -import org.springframework.http.MediaType -import org.springframework.http.ResponseEntity - -import org.springframework.web.bind.annotation.* -import org.springframework.validation.annotation.Validated -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.beans.factory.annotation.Autowired - -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -import kotlin.collections.List -import kotlin.collections.Map - -@RestController -@Validated -@RequestMapping("\${api.base-path:/v2}") -class StoreApiController(@Autowired(required = true) val service: StoreApiService) { - - - @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/store/order/{orderId}"] - ) - fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity { - return ResponseEntity(service.deleteOrder(orderId), HttpStatus.valueOf(400)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/inventory"], - produces = ["application/json"] - ) - fun getInventory(): ResponseEntity> { - return ResponseEntity(service.getInventory(), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/store/order/{orderId}"], - produces = ["application/json"] - ) - fun getOrderById(@Min(1) @Max(5) @PathVariable("orderId") orderId: kotlin.Int): ResponseEntity { - return ResponseEntity(service.getOrderById(orderId), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/store/order"], - produces = ["application/json"], - consumes = ["application/json"] - ) - fun placeOrder( @Valid @RequestBody order: Order): ResponseEntity { - return ResponseEntity(service.placeOrder(order), HttpStatus.valueOf(200)) - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt deleted file mode 100644 index 18a2fa71ab91..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiService.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.Order - -interface StoreApiService { - - /** - * DELETE /store/order/{orderId} : Delete purchase order by ID - * - * @param orderId (required) - * @return Invalid ID supplied (status code 400) - * or Order not found (status code 404) - * @see StoreApi#deleteOrder - */ - fun deleteOrder(orderId: kotlin.String): Unit - - /** - * GET /store/inventory : Returns pet inventories by status - * - * @return successful operation (status code 200) - * @see StoreApi#getInventory - */ - fun getInventory(): Map - - /** - * GET /store/order/{orderId} : Find purchase order by ID - * - * @param orderId (required) - * @return successful operation (status code 200) - * or Invalid ID supplied (status code 400) - * or Order not found (status code 404) - * @see StoreApi#getOrderById - */ - fun getOrderById(orderId: kotlin.Int): Order - - /** - * POST /store/order : Place an order for a pet - * - * @param order (required) - * @return successful operation (status code 200) - * or Invalid Order (status code 400) - * @see StoreApi#placeOrder - */ - fun placeOrder(order: Order): Order -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt deleted file mode 100644 index e20f1bb6cece..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt +++ /dev/null @@ -1,23 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.Order -import org.springframework.stereotype.Service -@Service -class StoreApiServiceImpl : StoreApiService { - - override fun deleteOrder(orderId: kotlin.String): Unit { - TODO("Implement me") - } - - override fun getInventory(): Map { - TODO("Implement me") - } - - override fun getOrderById(orderId: kotlin.Int): Order { - TODO("Implement me") - } - - override fun placeOrder(order: Order): Order { - TODO("Implement me") - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt deleted file mode 100644 index b0d28877806c..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ /dev/null @@ -1,108 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.User -import org.springframework.http.HttpStatus -import org.springframework.http.MediaType -import org.springframework.http.ResponseEntity - -import org.springframework.web.bind.annotation.* -import org.springframework.validation.annotation.Validated -import org.springframework.web.context.request.NativeWebRequest -import org.springframework.beans.factory.annotation.Autowired - -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -import kotlin.collections.List -import kotlin.collections.Map - -@RestController -@Validated -@RequestMapping("\${api.base-path:/v2}") -class UserApiController(@Autowired(required = true) val service: UserApiService) { - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/user"], - consumes = ["application/json"] - ) - fun createUser( @Valid @RequestBody user: User): ResponseEntity { - return ResponseEntity(service.createUser(user), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithArray"], - consumes = ["application/json"] - ) - fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { - return ResponseEntity(service.createUsersWithArrayInput(user), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.POST], - value = ["/user/createWithList"], - consumes = ["application/json"] - ) - fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity { - return ResponseEntity(service.createUsersWithListInput(user), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.DELETE], - value = ["/user/{username}"] - ) - fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity { - return ResponseEntity(service.deleteUser(username), HttpStatus.valueOf(400)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/{username}"], - produces = ["application/json"] - ) - fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity { - return ResponseEntity(service.getUserByName(username), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/login"], - produces = ["application/json"] - ) - fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { - return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.GET], - value = ["/user/logout"] - ) - fun logoutUser(): ResponseEntity { - return ResponseEntity(service.logoutUser(), HttpStatus.valueOf(200)) - } - - - @RequestMapping( - method = [RequestMethod.PUT], - value = ["/user/{username}"], - consumes = ["application/json"] - ) - fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity { - return ResponseEntity(service.updateUser(username, user), HttpStatus.valueOf(400)) - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt deleted file mode 100644 index 4580aba4442a..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiService.kt +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.User - -interface UserApiService { - - /** - * POST /user : Create user - * - * @param user (required) - * @return successful operation (status code 200) - * @see UserApi#createUser - */ - fun createUser(user: User): Unit - - /** - * POST /user/createWithArray : Creates list of users with given input array - * - * @param user (required) - * @return successful operation (status code 200) - * @see UserApi#createUsersWithArrayInput - */ - fun createUsersWithArrayInput(user: kotlin.collections.List): Unit - - /** - * POST /user/createWithList : Creates list of users with given input array - * - * @param user (required) - * @return successful operation (status code 200) - * @see UserApi#createUsersWithListInput - */ - fun createUsersWithListInput(user: kotlin.collections.List): Unit - - /** - * DELETE /user/{username} : Delete user - * - * @param username (required) - * @return Invalid username supplied (status code 400) - * or User not found (status code 404) - * @see UserApi#deleteUser - */ - fun deleteUser(username: kotlin.String): Unit - - /** - * GET /user/{username} : Get user by user name - * - * @param username (required) - * @return successful operation (status code 200) - * or Invalid username supplied (status code 400) - * or User not found (status code 404) - * @see UserApi#getUserByName - */ - fun getUserByName(username: kotlin.String): User - - /** - * GET /user/login : Logs user into the system - * - * @param username (required) - * @param password (required) - * @return successful operation (status code 200) - * or Invalid username/password supplied (status code 400) - * @see UserApi#loginUser - */ - fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String - - /** - * GET /user/logout : Logs out current logged in user session - * - * @return successful operation (status code 200) - * @see UserApi#logoutUser - */ - fun logoutUser(): Unit - - /** - * PUT /user/{username} : Updated user - * - * @param username (required) - * @param user (required) - * @return Invalid user supplied (status code 400) - * or User not found (status code 404) - * @see UserApi#updateUser - */ - fun updateUser(username: kotlin.String, user: User): Unit -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt deleted file mode 100644 index 0c24688975c9..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +++ /dev/null @@ -1,39 +0,0 @@ -package org.openapitools.api - -import org.openapitools.model.User -import org.springframework.stereotype.Service -@Service -class UserApiServiceImpl : UserApiService { - - override fun createUser(user: User): Unit { - TODO("Implement me") - } - - override fun createUsersWithArrayInput(user: kotlin.collections.List): Unit { - TODO("Implement me") - } - - override fun createUsersWithListInput(user: kotlin.collections.List): Unit { - TODO("Implement me") - } - - override fun deleteUser(username: kotlin.String): Unit { - TODO("Implement me") - } - - override fun getUserByName(username: kotlin.String): User { - TODO("Implement me") - } - - override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { - TODO("Implement me") - } - - override fun logoutUser(): Unit { - TODO("Implement me") - } - - override fun updateUser(username: kotlin.String, user: User): Unit { - TODO("Implement me") - } -} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt deleted file mode 100644 index 20229410386f..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt +++ /dev/null @@ -1,26 +0,0 @@ -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-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 deleted file mode 100644 index 69d297db20bd..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt +++ /dev/null @@ -1,58 +0,0 @@ -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 - -/** - * - * @param hunts - * @param age - */ -data class Cat( - - @get:JsonProperty("name", required = true) override val name: kotlin.String, - - @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, - - @get:JsonProperty("petType", required = true) override val petType: kotlin.String, - - @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, - - @get:JsonProperty("age") val age: kotlin.Int? = null, - - @get:JsonProperty("id") override val id: kotlin.Long? = null, - - @field:Valid - @get:JsonProperty("category") override val category: Category? = null, - - @field:Valid - @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, - - @get:JsonProperty("status") override val status: Cat.Status? = null, - - @field:Valid - @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-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 deleted file mode 100644 index f98ea616ec26..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt +++ /dev/null @@ -1,33 +0,0 @@ -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 - -/** - * - * @param id - * @param name - */ -data class Category( - - @get:JsonProperty("id") val id: kotlin.Long? = null, - - @get:JsonProperty("name") val name: kotlin.String? = null -) : Serializable { - - companion object { - private const val serialVersionUID: kotlin.Long = 1 - } -} - diff --git a/samples/server/petstore/kotlin-springboot-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 deleted file mode 100644 index 2b3e6a27f52e..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt +++ /dev/null @@ -1,40 +0,0 @@ -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 - -/** -* -* Values: black,white,brown,yellow,violet -*/ -enum class Color(@get:JsonValue val value: kotlin.String) { - - 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-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 deleted file mode 100644 index d75991c0c636..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt +++ /dev/null @@ -1,82 +0,0 @@ -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 - -/** - * - * @param bark - * @param breed - * @param likesFetch Whether the dog enjoys fetching - */ -data class Dog( - - @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, - - @get:JsonProperty("breed", required = true) val breed: Dog.Breed, - - @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, - - @get:JsonProperty("name", required = true) override val name: kotlin.String, - - @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, - - @get:JsonProperty("petType", required = true) override val petType: kotlin.String, - - @get:JsonProperty("id") override val id: kotlin.Long? = null, - - @field:Valid - @get:JsonProperty("category") override val category: Category? = null, - - @field:Valid - @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, - - @get:JsonProperty("status") override val status: Dog.Status? = null, - - @field:Valid - @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-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 deleted file mode 100644 index d5f1bfed6348..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ /dev/null @@ -1,36 +0,0 @@ -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 - -/** - * - * @param code - * @param type - * @param message - */ -data class ModelApiResponse( - - @get:JsonProperty("code") val code: kotlin.Int? = null, - - @get:JsonProperty("type") val type: kotlin.String? = null, - - @get:JsonProperty("message") val message: kotlin.String? = null -) : Serializable { - - companion object { - private const val serialVersionUID: kotlin.Long = 1 - } -} - diff --git a/samples/server/petstore/kotlin-springboot-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 deleted file mode 100644 index b9cf389785aa..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt +++ /dev/null @@ -1,67 +0,0 @@ -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 - -/** - * - * @param id - * @param petId - * @param quantity - * @param shipDate - * @param status - * @param complete - */ -data class Order( - - @get:JsonProperty("id") val id: kotlin.Long? = null, - - @get:JsonProperty("petId") val petId: kotlin.Long? = null, - - @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, - - @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, - - @get:JsonProperty("status") val status: Order.Status? = null, - - @get:JsonProperty("complete") val complete: kotlin.Boolean? = false -) : Serializable { - - /** - * - * 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-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 deleted file mode 100644 index 20887890f694..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt +++ /dev/null @@ -1,96 +0,0 @@ -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 - -/** - * - * @param name - * @param photoUrls - * @param petType - * @param id - * @param category - * @param tags - * @param status - * @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 { - - override val name: kotlin.String - - - val photoUrls: kotlin.collections.List - - - val petType: kotlin.String - - - val id: kotlin.Long? - - - override val category: Category? - - - val tags: kotlin.collections.List? - - - val status: Pet.Status? - - - val color: Color? - - - /** - * - * Values: available,pending,sold - */ - enum class Status(@get:JsonValue val value: kotlin.String) { - - available("available"), - pending("pending"), - sold("sold"); - - companion object { - @JvmStatic - @JsonCreator - fun forValue(value: kotlin.String): Status { - return values().firstOrNull{it -> it.value == value} - ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") - } - } - } - - companion object { - private const val serialVersionUID: kotlin.Long = 1 - } -} - diff --git a/samples/server/petstore/kotlin-springboot-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 deleted file mode 100644 index cce8583e6d59..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt +++ /dev/null @@ -1,33 +0,0 @@ -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 - -/** - * - * @param id - * @param name - */ -data class Tag( - - @get:JsonProperty("id") val id: kotlin.Long? = null, - - @get:JsonProperty("name") val name: kotlin.String? = null -) : Serializable { - - companion object { - private const val serialVersionUID: kotlin.Long = 1 - } -} - diff --git a/samples/server/petstore/kotlin-springboot-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 deleted file mode 100644 index f24ba91ffb73..000000000000 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt +++ /dev/null @@ -1,51 +0,0 @@ -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 - -/** - * - * @param id - * @param username - * @param firstName - * @param lastName - * @param email - * @param password - * @param phone - * @param userStatus - */ -data class User( - - @get:JsonProperty("id") val id: kotlin.Long? = null, - - @get:JsonProperty("username") val username: kotlin.String? = null, - - @get:JsonProperty("firstName") val firstName: kotlin.String? = null, - - @get:JsonProperty("lastName") val lastName: kotlin.String? = null, - - @get:JsonProperty("email") val email: kotlin.String? = null, - - @get:JsonProperty("password") val password: kotlin.String? = null, - - @get:JsonProperty("phone") val phone: kotlin.String? = null, - - @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null -) : Serializable { - - companion object { - private const val serialVersionUID: kotlin.Long = 1 - } -} - From 3086ce8ab725ec8dc9916379987b9f2668b98dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Sep 2025 10:54:55 +0200 Subject: [PATCH 19/20] remove unnecessary generated files --- ...otlin-spring-boot-x-kotlin-implements.yaml | 5 +- .../.openapi-generator/FILES | 14 +-- .../build.gradle.kts | 4 + .../pom.xml | 8 +- .../kotlin/org/openapitools/api/ApiUtil.kt | 19 ++++ .../kotlin/org/openapitools/api/Exceptions.kt | 30 ++++++ .../kotlin/org/openapitools/api/PetApi.kt | 99 +++++++++++++++++++ .../kotlin/org/openapitools/api/StoreApi.kt | 66 +++++++++++++ .../kotlin/org/openapitools/api/UserApi.kt | 96 ++++++++++++++++++ .../EnumConverterConfiguration.kt | 26 +++++ .../main/kotlin/org/openapitools/model/Cat.kt | 58 +++++++++++ .../kotlin/org/openapitools/model/Category.kt | 33 +++++++ .../kotlin/org/openapitools/model/Color.kt | 40 ++++++++ .../main/kotlin/org/openapitools/model/Dog.kt | 82 +++++++++++++++ .../openapitools/model/ModelApiResponse.kt | 36 +++++++ .../kotlin/org/openapitools/model/Order.kt | 67 +++++++++++++ .../main/kotlin/org/openapitools/model/Pet.kt | 96 ++++++++++++++++++ .../main/kotlin/org/openapitools/model/Tag.kt | 33 +++++++ .../kotlin/org/openapitools/model/User.kt | 51 ++++++++++ 19 files changed, 846 insertions(+), 17 deletions(-) create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml index 8ea206848c99..c4068770d55d 100644 --- a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml +++ b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml @@ -7,7 +7,8 @@ additionalProperties: documentationProvider: none annotationLibrary: none useSwaggerUI: "false" - serviceImplementation: "true" + serviceImplementation: "false" + skipDefaultInterface: "true" + interfaceOnly: "true" serializableModel: "true" beanValidations: "true" - requestMappingMode: controller 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 705fcfa02933..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,18 +6,11 @@ gradlew gradlew.bat pom.xml settings.gradle -src/main/kotlin/org/openapitools/Application.kt src/main/kotlin/org/openapitools/api/ApiUtil.kt src/main/kotlin/org/openapitools/api/Exceptions.kt -src/main/kotlin/org/openapitools/api/PetApiController.kt -src/main/kotlin/org/openapitools/api/PetApiService.kt -src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt -src/main/kotlin/org/openapitools/api/StoreApiController.kt -src/main/kotlin/org/openapitools/api/StoreApiService.kt -src/main/kotlin/org/openapitools/api/StoreApiServiceImpl.kt -src/main/kotlin/org/openapitools/api/UserApiController.kt -src/main/kotlin/org/openapitools/api/UserApiService.kt -src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt +src/main/kotlin/org/openapitools/api/PetApi.kt +src/main/kotlin/org/openapitools/api/StoreApi.kt +src/main/kotlin/org/openapitools/api/UserApi.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 @@ -28,4 +21,3 @@ 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-x-kotlin-implements/build.gradle.kts b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/build.gradle.kts index 2af5e54061e5..d1c663986d73 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 @@ -20,6 +20,10 @@ tasks.withType { kotlinOptions.jvmTarget = "1.8" } +tasks.bootJar { + enabled = false +} + plugins { val kotlinVersion = "1.9.25" id("org.jetbrains.kotlin.jvm") version kotlinVersion 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 dfd0d3a9f6b6..852c00952ba9 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/pom.xml @@ -23,17 +23,17 @@ ${project.basedir}/src/test/kotlin - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-source-plugin + attach-sources - repackage + jar - kotlin-maven-plugin org.jetbrains.kotlin diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt new file mode 100644 index 000000000000..88e892d0f49a --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -0,0 +1,19 @@ +package org.openapitools.api + +import org.springframework.web.context.request.NativeWebRequest + +import javax.servlet.http.HttpServletResponse +import java.io.IOException + +object ApiUtil { + fun setExampleResponse(req: NativeWebRequest, contentType: String, example: String) { + try { + val res = req.getNativeResponse(HttpServletResponse::class.java) + res?.characterEncoding = "UTF-8" + res?.addHeader("Content-Type", contentType) + res?.writer?.print(example) + } catch (e: IOException) { + throw RuntimeException(e) + } + } +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt new file mode 100644 index 000000000000..901db1237ee7 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/Exceptions.kt @@ -0,0 +1,30 @@ +package org.openapitools.api + +import org.springframework.context.annotation.Configuration +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.ControllerAdvice +import org.springframework.web.bind.annotation.ExceptionHandler +import javax.servlet.http.HttpServletResponse +import javax.validation.ConstraintViolationException + +// TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception +sealed class ApiException(msg: String, val code: Int) : Exception(msg) + +class NotFoundException(msg: String, code: Int = HttpStatus.NOT_FOUND.value()) : ApiException(msg, code) + +@Configuration("org.openapitools.api.DefaultExceptionHandler") +@ControllerAdvice +class DefaultExceptionHandler { + + @ExceptionHandler(value = [ApiException::class]) + fun onApiException(ex: ApiException, response: HttpServletResponse): Unit = + response.sendError(ex.code, ex.message) + + @ExceptionHandler(value = [NotImplementedError::class]) + fun onNotImplemented(ex: NotImplementedError, response: HttpServletResponse): Unit = + response.sendError(HttpStatus.NOT_IMPLEMENTED.value()) + + @ExceptionHandler(value = [ConstraintViolationException::class]) + fun onConstraintViolation(ex: ConstraintViolationException, response: HttpServletResponse): Unit = + response.sendError(HttpStatus.BAD_REQUEST.value(), ex.constraintViolations.joinToString(", ") { it.message }) +} diff --git a/samples/server/petstore/kotlin-springboot-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 new file mode 100644 index 000000000000..9c9c038b48f6 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -0,0 +1,99 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.16.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. +*/ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.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 kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +interface PetApi { + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet"], + consumes = ["application/json"] + ) + fun addPet( @Valid @RequestBody pet: Pet): 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 + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByStatus"], + produces = ["application/json"] + ) + fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/findByTags"], + produces = ["application/json"] + ) + fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/pet/{petId}"], + produces = ["application/json"] + ) + fun getPetById( @PathVariable("petId") petId: kotlin.Long): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/pet"], + consumes = ["application/json"] + ) + fun updatePet( @Valid @RequestBody pet: Pet): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}"], + consumes = ["application/x-www-form-urlencoded"] + ) + fun updatePetWithForm( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "name", required = false) name: kotlin.String? , @Valid @RequestParam(value = "status", required = false) status: kotlin.String? ): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/pet/{petId}/uploadImage"], + produces = ["application/json"], + consumes = ["multipart/form-data"] + ) + fun uploadFile( @PathVariable("petId") petId: kotlin.Long, @Valid @RequestParam(value = "additionalMetadata", required = false) additionalMetadata: kotlin.String? , @Valid @RequestPart("file", required = false) file: org.springframework.web.multipart.MultipartFile?): ResponseEntity +} 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 new file mode 100644 index 000000000000..7e1cabcb2573 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -0,0 +1,66 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.16.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. +*/ +package org.openapitools.api + +import org.openapitools.model.Order +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.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 kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +interface StoreApi { + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/store/order/{orderId}"] + ) + fun deleteOrder( @PathVariable("orderId") orderId: kotlin.String): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/inventory"], + produces = ["application/json"] + ) + fun getInventory(): ResponseEntity> + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/store/order/{orderId}"], + produces = ["application/json"] + ) + fun getOrderById(@Min(1) @Max(5) @PathVariable("orderId") orderId: kotlin.Int): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/store/order"], + produces = ["application/json"], + consumes = ["application/json"] + ) + fun placeOrder( @Valid @RequestBody order: Order): 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 new file mode 100644 index 000000000000..3ff8e2a94ea0 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -0,0 +1,96 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.16.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. +*/ +package org.openapitools.api + +import org.openapitools.model.User +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.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 kotlin.collections.List +import kotlin.collections.Map + +@RestController +@Validated +interface UserApi { + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user"], + consumes = ["application/json"] + ) + fun createUser( @Valid @RequestBody user: User): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithArray"], + consumes = ["application/json"] + ) + fun createUsersWithArrayInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.POST], + value = ["/user/createWithList"], + consumes = ["application/json"] + ) + fun createUsersWithListInput( @Valid @RequestBody user: kotlin.collections.List): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.DELETE], + value = ["/user/{username}"] + ) + fun deleteUser( @PathVariable("username") username: kotlin.String): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/{username}"], + produces = ["application/json"] + ) + fun getUserByName( @PathVariable("username") username: kotlin.String): ResponseEntity + + + @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): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.GET], + value = ["/user/logout"] + ) + fun logoutUser(): ResponseEntity + + + @RequestMapping( + method = [RequestMethod.PUT], + value = ["/user/{username}"], + consumes = ["application/json"] + ) + fun updateUser( @PathVariable("username") username: kotlin.String, @Valid @RequestBody user: User): ResponseEntity +} diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/configuration/EnumConverterConfiguration.kt new file mode 100644 index 000000000000..20229410386f --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/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-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 new file mode 100644 index 000000000000..69d297db20bd --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt @@ -0,0 +1,58 @@ +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 + +/** + * + * @param hunts + * @param age + */ +data class Cat( + + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + + @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + + @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, + + @get:JsonProperty("age") val age: kotlin.Int? = null, + + @get:JsonProperty("id") override val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") override val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, + + @get:JsonProperty("status") override val status: Cat.Status? = null, + + @field:Valid + @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-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 new file mode 100644 index 000000000000..f98ea616ec26 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * + * @param id + * @param name + */ +data class Category( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-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 new file mode 100644 index 000000000000..2b3e6a27f52e --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt @@ -0,0 +1,40 @@ +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 + +/** +* +* Values: black,white,brown,yellow,violet +*/ +enum class Color(@get:JsonValue val value: kotlin.String) { + + 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-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 new file mode 100644 index 000000000000..d75991c0c636 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt @@ -0,0 +1,82 @@ +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 + +/** + * + * @param bark + * @param breed + * @param likesFetch Whether the dog enjoys fetching + */ +data class Dog( + + @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, + + @get:JsonProperty("breed", required = true) val breed: Dog.Breed, + + @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, + + @get:JsonProperty("name", required = true) override val name: kotlin.String, + + @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, + + @get:JsonProperty("petType", required = true) override val petType: kotlin.String, + + @get:JsonProperty("id") override val id: kotlin.Long? = null, + + @field:Valid + @get:JsonProperty("category") override val category: Category? = null, + + @field:Valid + @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, + + @get:JsonProperty("status") override val status: Dog.Status? = null, + + @field:Valid + @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-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 new file mode 100644 index 000000000000..d5f1bfed6348 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -0,0 +1,36 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * + * @param code + * @param type + * @param message + */ +data class ModelApiResponse( + + @get:JsonProperty("code") val code: kotlin.Int? = null, + + @get:JsonProperty("type") val type: kotlin.String? = null, + + @get:JsonProperty("message") val message: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-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 new file mode 100644 index 000000000000..b9cf389785aa --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt @@ -0,0 +1,67 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty +import com.fasterxml.jackson.annotation.JsonValue +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * + * @param id + * @param petId + * @param quantity + * @param shipDate + * @param status + * @param complete + */ +data class Order( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("petId") val petId: kotlin.Long? = null, + + @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + + @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, + + @get:JsonProperty("status") val status: Order.Status? = null, + + @get:JsonProperty("complete") val complete: kotlin.Boolean? = false +) : Serializable { + + /** + * + * 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-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 new file mode 100644 index 000000000000..20887890f694 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt @@ -0,0 +1,96 @@ +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 + +/** + * + * @param name + * @param photoUrls + * @param petType + * @param id + * @param category + * @param tags + * @param status + * @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 { + + override val name: kotlin.String + + + val photoUrls: kotlin.collections.List + + + val petType: kotlin.String + + + val id: kotlin.Long? + + + override val category: Category? + + + val tags: kotlin.collections.List? + + + val status: Pet.Status? + + + val color: Color? + + + /** + * + * Values: available,pending,sold + */ + enum class Status(@get:JsonValue val value: kotlin.String) { + + available("available"), + pending("pending"), + sold("sold"); + + companion object { + @JvmStatic + @JsonCreator + fun forValue(value: kotlin.String): Status { + return values().firstOrNull{it -> it.value == value} + ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") + } + } + } + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-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 new file mode 100644 index 000000000000..cce8583e6d59 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt @@ -0,0 +1,33 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * + * @param id + * @param name + */ +data class Tag( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("name") val name: kotlin.String? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + diff --git a/samples/server/petstore/kotlin-springboot-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 new file mode 100644 index 000000000000..f24ba91ffb73 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt @@ -0,0 +1,51 @@ +package org.openapitools.model + +import java.util.Locale +import java.util.Objects +import com.fasterxml.jackson.annotation.JsonProperty +import java.io.Serializable +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size +import javax.validation.Valid + +/** + * + * @param id + * @param username + * @param firstName + * @param lastName + * @param email + * @param password + * @param phone + * @param userStatus + */ +data class User( + + @get:JsonProperty("id") val id: kotlin.Long? = null, + + @get:JsonProperty("username") val username: kotlin.String? = null, + + @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + + @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + + @get:JsonProperty("email") val email: kotlin.String? = null, + + @get:JsonProperty("password") val password: kotlin.String? = null, + + @get:JsonProperty("phone") val phone: kotlin.String? = null, + + @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null +) : Serializable { + + companion object { + private const val serialVersionUID: kotlin.Long = 1 + } +} + From 212d2cc1fd210a854f0260c4cb8135427d1ddf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Sep 2025 11:18:54 +0200 Subject: [PATCH 20/20] remove "status" inner enum from Pet as it fails to properly import as Pet.Status in implementations. This is a separate bug - not caused by x-kotlin-implements --- .../petstore-with-x-kotlin-implements.yaml | 7 +----- .../main/kotlin/org/openapitools/model/Cat.kt | 2 -- .../kotlin/org/openapitools/model/Color.kt | 2 +- .../main/kotlin/org/openapitools/model/Dog.kt | 2 -- .../main/kotlin/org/openapitools/model/Pet.kt | 24 ------------------- 5 files changed, 2 insertions(+), 35 deletions(-) diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml index f42e88a242e2..b54ec0cd53ef 100644 --- a/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml @@ -531,12 +531,6 @@ components: type: array items: $ref: '#/components/schemas/Tag' - status: - type: string - enum: - - available - - pending - - sold color: $ref: '#/components/schemas/Color' petType: @@ -587,6 +581,7 @@ components: name: type: string Color: + x-kotlin-implements: [ com.some.pack.WithDefaultMethods ] type: string enum: - black 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 69d297db20bd..147ed4ff31a4 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 @@ -45,8 +45,6 @@ data class Cat( @field:Valid @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, - @get:JsonProperty("status") override val status: Cat.Status? = null, - @field:Valid @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/Color.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Color.kt index 2b3e6a27f52e..d46c704e991c 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 @@ -20,7 +20,7 @@ import javax.validation.Valid * * Values: black,white,brown,yellow,violet */ -enum class Color(@get:JsonValue val value: kotlin.String) { +enum class Color(@get:JsonValue val value: kotlin.String) : com.some.pack.WithDefaultMethods { black("black"), white("white"), 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 d75991c0c636..789cb452e748 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 @@ -48,8 +48,6 @@ data class Dog( @field:Valid @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, - @get:JsonProperty("status") override val status: Dog.Status? = null, - @field:Valid @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/Pet.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt index 20887890f694..a3dbd5258a11 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 @@ -30,7 +30,6 @@ import javax.validation.Valid * @param id * @param category * @param tags - * @param status * @param color */ @JsonIgnoreProperties( @@ -63,32 +62,9 @@ interface Pet : Serializable, com.some.pack.Named, com.some.pack.WithCategory, c val tags: kotlin.collections.List? - val status: Pet.Status? - - val color: Color? - /** - * - * Values: available,pending,sold - */ - enum class Status(@get:JsonValue val value: kotlin.String) { - - available("available"), - pending("pending"), - sold("sold"); - - companion object { - @JvmStatic - @JsonCreator - fun forValue(value: kotlin.String): Status { - return values().firstOrNull{it -> it.value == value} - ?: throw IllegalArgumentException("Unexpected value '$value' for enum 'Pet'") - } - } - } - companion object { private const val serialVersionUID: kotlin.Long = 1 }