diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md index 9e8c7c2291df..d1871b49f88d 100644 --- a/docs/generators/kotlin-server.md +++ b/docs/generators/kotlin-server.md @@ -18,6 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl | Option | Description | Values | Default | | ------ | ----------- | ------ | ------- | +|Whether Kotlin serialization should be used|Whether Kotlin serialization should be used| |true| |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |apiSuffix|suffix for api classes| |Api| |artifactId|Generated artifact id (name of jar).| |kotlin-server| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java index 384f8a1ca735..13744a69f92a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java @@ -51,6 +51,8 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen implements BeanVa @Getter @Setter private Boolean compressionFeatureEnabled = true; @Getter @Setter + private Boolean kotlinSerializationEnabled = true; + @Getter @Setter private Boolean resourcesFeatureEnabled = true; @Getter @Setter private Boolean metricsFeatureEnabled = true; @@ -136,6 +138,7 @@ public KotlinServerCodegen() { addSwitch(Constants.AUTOMATIC_HEAD_REQUESTS, Constants.AUTOMATIC_HEAD_REQUESTS_DESC, getAutoHeadFeatureEnabled()); addSwitch(Constants.CONDITIONAL_HEADERS, Constants.CONDITIONAL_HEADERS_DESC, getConditionalHeadersFeatureEnabled()); addSwitch(Constants.HSTS, Constants.HSTS_DESC, getHstsFeatureEnabled()); + addSwitch(Constants.KOTLIN_SERIALIZATION, Constants.KOTLIN_SERIALIZATION, getKotlinSerializationEnabled()); addSwitch(Constants.CORS, Constants.CORS_DESC, getCorsFeatureEnabled()); addSwitch(Constants.COMPRESSION, Constants.COMPRESSION_DESC, getCompressionFeatureEnabled()); addSwitch(Constants.RESOURCES, Constants.RESOURCES_DESC, getResourcesFeatureEnabled()); @@ -292,6 +295,14 @@ public void processOpts() { supportingFiles.add(new SupportingFile("gradle.properties", "", "gradle.properties")); if (isKtor()) { + setKotlinSerializationEnabled(true); + + if (additionalProperties.containsKey(Constants.KOTLIN_SERIALIZATION)) { + setKotlinSerializationEnabled(convertPropertyToBooleanAndWriteBack(Constants.KOTLIN_SERIALIZATION)); + } else { + additionalProperties.put(Constants.KOTLIN_SERIALIZATION, getKotlinSerializationEnabled()); + } + supportingFiles.add(new SupportingFile("AppMain.kt.mustache", packageFolder, "AppMain.kt")); supportingFiles.add(new SupportingFile("Configuration.kt.mustache", packageFolder, "Configuration.kt")); @@ -358,6 +369,7 @@ public static class Constants { public static final String USE_MUTINY_DESC = "Whether to use Mutiny (should not be used with useCoroutines). This option is currently supported only when using jaxrs-spec library."; public static final String OMIT_GRADLE_WRAPPER = "omitGradleWrapper"; public static final String OMIT_GRADLE_WRAPPER_DESC = "Whether to omit Gradle wrapper for creating a sub project."; + public static final String KOTLIN_SERIALIZATION = "Whether Kotlin serialization should be used"; } @Override diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache index 0f8615de28d9..1b4d1fcd7fe8 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache @@ -1,18 +1,32 @@ -import kotlinx.serialization.Serializable +{{#parcelizeModels}} + import android.os.Parcelable + import kotlinx.parcelize.Parcelize +{{/parcelizeModels}} +{{#serializableModel}} + import java.io.Serializable +{{/serializableModel}} +{{#kotlinSerialization}} + import kotlinx.serialization.Serializable +{{/kotlinSerialization}} /** * {{{description}}} {{#vars}} * @param {{{name}}} {{{description}}} {{/vars}} */ +{{#parcelizeModels}} +@Parcelize +{{/parcelizeModels}} +{{#kotlinSerialization}} @Serializable +{{/kotlinSerialization}} {{#hasVars}}data {{/hasVars}}class {{classname}}( {{#requiredVars}} {{>data_class_req_var}}{{^-last}}, {{/-last}}{{/requiredVars}}{{#hasRequired}}{{#hasOptional}}, {{/hasOptional}}{{/hasRequired}}{{#optionalVars}}{{>data_class_opt_var}}{{^-last}}, {{/-last}}{{/optionalVars}} -) +){{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{^parcelizeModels}}{{#serializableModel}}: Serializable {{/serializableModel}}{{/parcelizeModels}}{{#parcelizeModels}}{{#serializableModel}} : Parcelable, Serializable {{/serializableModel}}{{/parcelizeModels}} {{#vendorExtensions.x-has-data-class-body}} { {{/vendorExtensions.x-has-data-class-body}} diff --git a/samples/client/petstore/java/okhttp-gson-3.1/.openapi-generator/FILES b/samples/client/petstore/java/okhttp-gson-3.1/.openapi-generator/FILES index 0f5e9fcaaa55..1db889c4947b 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/.openapi-generator/FILES +++ b/samples/client/petstore/java/okhttp-gson-3.1/.openapi-generator/FILES @@ -5,34 +5,12 @@ README.md api/openapi.yaml build.gradle build.sbt -docs/AllOfSimpleModel.md -docs/Animal.md -docs/AnyTypeTest.md -docs/ArrayOfSameRef.md -docs/Cat.md docs/Category.md -docs/CircularReference1.md -docs/CircularReference2.md -docs/CircularReference3.md -docs/CodesEnum.md -docs/DefaultApi.md -docs/Dog.md -docs/FakeApi.md -docs/FakeWebhooksSourcesDeletedPostRequest.md -docs/FakeWebhooksSourcesDeletedPostRequestEvent.md docs/ModelApiResponse.md -docs/OneOfStringOrInt.md docs/Order.md docs/Pet.md docs/PetApi.md -docs/RefRefToPathLevelParameterOneofRefToOneofParameter.md -docs/RefToRefParameterAnyofRefToAnyofParameter.md -docs/SelfReferenceAdditionalProperties.md -docs/SelfReferenceAnyOf.md -docs/SelfReferenceOneOf.md -docs/SimpleModelWithArrayProperty.md docs/StoreApi.md -docs/StringOrInt.md docs/Tag.md docs/User.md docs/UserApi.md @@ -58,8 +36,6 @@ src/main/java/org/openapitools/client/ProgressResponseBody.java src/main/java/org/openapitools/client/ServerConfiguration.java src/main/java/org/openapitools/client/ServerVariable.java src/main/java/org/openapitools/client/StringUtil.java -src/main/java/org/openapitools/client/api/DefaultApi.java -src/main/java/org/openapitools/client/api/FakeApi.java src/main/java/org/openapitools/client/api/PetApi.java src/main/java/org/openapitools/client/api/StoreApi.java src/main/java/org/openapitools/client/api/UserApi.java @@ -72,29 +48,9 @@ src/main/java/org/openapitools/client/auth/OAuthFlow.java src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java src/main/java/org/openapitools/client/auth/RetryingOAuth.java src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java -src/main/java/org/openapitools/client/model/AllOfSimpleModel.java -src/main/java/org/openapitools/client/model/Animal.java -src/main/java/org/openapitools/client/model/AnyTypeTest.java -src/main/java/org/openapitools/client/model/ArrayOfSameRef.java -src/main/java/org/openapitools/client/model/Cat.java src/main/java/org/openapitools/client/model/Category.java -src/main/java/org/openapitools/client/model/CircularReference1.java -src/main/java/org/openapitools/client/model/CircularReference2.java -src/main/java/org/openapitools/client/model/CircularReference3.java -src/main/java/org/openapitools/client/model/CodesEnum.java -src/main/java/org/openapitools/client/model/Dog.java -src/main/java/org/openapitools/client/model/FakeWebhooksSourcesDeletedPostRequest.java -src/main/java/org/openapitools/client/model/FakeWebhooksSourcesDeletedPostRequestEvent.java src/main/java/org/openapitools/client/model/ModelApiResponse.java -src/main/java/org/openapitools/client/model/OneOfStringOrInt.java src/main/java/org/openapitools/client/model/Order.java src/main/java/org/openapitools/client/model/Pet.java -src/main/java/org/openapitools/client/model/RefRefToPathLevelParameterOneofRefToOneofParameter.java -src/main/java/org/openapitools/client/model/RefToRefParameterAnyofRefToAnyofParameter.java -src/main/java/org/openapitools/client/model/SelfReferenceAdditionalProperties.java -src/main/java/org/openapitools/client/model/SelfReferenceAnyOf.java -src/main/java/org/openapitools/client/model/SelfReferenceOneOf.java -src/main/java/org/openapitools/client/model/SimpleModelWithArrayProperty.java -src/main/java/org/openapitools/client/model/StringOrInt.java src/main/java/org/openapitools/client/model/Tag.java src/main/java/org/openapitools/client/model/User.java diff --git a/samples/client/petstore/java/okhttp-gson-3.1/README.md b/samples/client/petstore/java/okhttp-gson-3.1/README.md index c61811c10ed3..a5b64cc47df3 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/README.md +++ b/samples/client/petstore/java/okhttp-gson-3.1/README.md @@ -83,20 +83,26 @@ Please follow the [installation](#installation) instruction and execute the foll import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; import org.openapitools.client.model.*; -import org.openapitools.client.api.FakeApi; +import org.openapitools.client.api.PetApi; public class Example { public static void main(String[] args) { ApiClient defaultClient = Configuration.getDefaultApiClient(); defaultClient.setBasePath("http://petstore.swagger.io/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - FakeApi apiInstance = new FakeApi(defaultClient); + PetApi apiInstance = new PetApi(defaultClient); + Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store try { - Object result = apiInstance.fakeInlineSchemaAnyofPath1Get(); + Pet result = apiInstance.addPet(pet); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeInlineSchemaAnyofPath1Get"); + System.err.println("Exception when calling PetApi#addPet"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -113,18 +119,6 @@ All URIs are relative to *http://petstore.swagger.io/v2* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*FakeApi* | [**fakeInlineSchemaAnyofPath1Get**](docs/FakeApi.md#fakeInlineSchemaAnyofPath1Get) | **GET** /fake/inline/schema/anyof/path1 | -*FakeApi* | [**fakeInlineSchemaAnyofPath2Get**](docs/FakeApi.md#fakeInlineSchemaAnyofPath2Get) | **GET** /fake/inline/schema/anyof/path2 | -*FakeApi* | [**fakeInlineSchemaAnyofPath3Get**](docs/FakeApi.md#fakeInlineSchemaAnyofPath3Get) | **GET** /fake/inline/schema/anyof/path3 | -*FakeApi* | [**op1**](docs/FakeApi.md#op1) | **POST** /fake/api/changeowner | op1 -*FakeApi* | [**op2**](docs/FakeApi.md#op2) | **POST** /fake/api/changename | op2 -*FakeApi* | [**op3**](docs/FakeApi.md#op3) | **POST** /fake/api/query/enum | op3 -*FakeApi* | [**refToRefParameter**](docs/FakeApi.md#refToRefParameter) | **GET** /ref/ref_to_parameter | -*FakeApi* | [**refToRefParameterAnyof**](docs/FakeApi.md#refToRefParameterAnyof) | **GET** /ref/ref_to_operation_level_parameter_oneof | -*FakeApi* | [**refToRefParameterOneof**](docs/FakeApi.md#refToRefParameterOneof) | **GET** /ref/ref_to_path_level_parameter_oneof | -*FakeApi* | [**responseNoRef**](docs/FakeApi.md#responseNoRef) | **GET** /no_ref | -*FakeApi* | [**responseRefToNoRef**](docs/FakeApi.md#responseRefToNoRef) | **GET** /ref/no_ref | -*FakeApi* | [**responseRefToRef**](docs/FakeApi.md#responseRefToRef) | **GET** /ref/ref | *PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store *PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet *PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status @@ -149,30 +143,10 @@ Class | Method | HTTP request | Description ## Documentation for Models - - [AllOfSimpleModel](docs/AllOfSimpleModel.md) - - [Animal](docs/Animal.md) - - [AnyTypeTest](docs/AnyTypeTest.md) - - [ArrayOfSameRef](docs/ArrayOfSameRef.md) - - [Cat](docs/Cat.md) - [Category](docs/Category.md) - - [CircularReference1](docs/CircularReference1.md) - - [CircularReference2](docs/CircularReference2.md) - - [CircularReference3](docs/CircularReference3.md) - - [CodesEnum](docs/CodesEnum.md) - - [Dog](docs/Dog.md) - - [FakeWebhooksSourcesDeletedPostRequest](docs/FakeWebhooksSourcesDeletedPostRequest.md) - - [FakeWebhooksSourcesDeletedPostRequestEvent](docs/FakeWebhooksSourcesDeletedPostRequestEvent.md) - [ModelApiResponse](docs/ModelApiResponse.md) - - [OneOfStringOrInt](docs/OneOfStringOrInt.md) - [Order](docs/Order.md) - [Pet](docs/Pet.md) - - [RefRefToPathLevelParameterOneofRefToOneofParameter](docs/RefRefToPathLevelParameterOneofRefToOneofParameter.md) - - [RefToRefParameterAnyofRefToAnyofParameter](docs/RefToRefParameterAnyofRefToAnyofParameter.md) - - [SelfReferenceAdditionalProperties](docs/SelfReferenceAdditionalProperties.md) - - [SelfReferenceAnyOf](docs/SelfReferenceAnyOf.md) - - [SelfReferenceOneOf](docs/SelfReferenceOneOf.md) - - [SimpleModelWithArrayProperty](docs/SimpleModelWithArrayProperty.md) - - [StringOrInt](docs/StringOrInt.md) - [Tag](docs/Tag.md) - [User](docs/User.md) diff --git a/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml index 600ba1a18fb9..5167f861249d 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml @@ -639,219 +639,7 @@ paths: x-content-type: application/json x-accepts: - application/json - /no_ref: - get: - operationId: response_no_ref - responses: - "200": - content: - text/plain: - schema: - type: string - description: required to pass validation - tags: - - fake - x-accepts: - - text/plain - /ref/no_ref: - get: - operationId: response_ref_to_no_ref - responses: - "200": - $ref: '#/components/responses/no_ref' - tags: - - fake - x-accepts: - - text/plain - /ref/ref: - get: - operationId: response_ref_to_ref - responses: - "200": - $ref: '#/components/responses/ref' - tags: - - fake - x-accepts: - - text/plain - /ref/ref_to_parameter: - get: - operationId: ref_to_ref_parameter - parameters: - - $ref: '#/components/parameters/ref_to_uuid' - responses: - "200": - $ref: '#/components/responses/ref' - tags: - - fake - x-accepts: - - text/plain - parameters: - - $ref: '#/components/parameters/ref_to_uuid' - /ref/ref_to_path_level_parameter_oneof: - get: - description: to test $ref to path level parameters - operationId: ref_to_ref_parameter_oneof - parameters: - - $ref: '#/components/parameters/ref_to_oneof' - responses: - "200": - description: Successful Response - tags: - - fake - x-accepts: - - application/json - parameters: - - $ref: '#/components/parameters/ref_to_oneof' - /ref/ref_to_operation_level_parameter_oneof: - get: - description: to test $ref to operation level parameters - operationId: ref_to_ref_parameter_anyof - parameters: - - $ref: '#/components/parameters/ref_to_anyof' - responses: - "200": - description: Successful Response - tags: - - fake - x-accepts: - - application/json - /fake/api/changeowner: - post: - operationId: op1 - parameters: [] - responses: - "201": - content: - application/json: - schema: {} - description: Successful Response - "422": - content: - application/json: - schema: - $ref: '#/components/schemas/HTTPValidationError' - description: Validation Error - summary: op1 - tags: - - fake - x-accepts: - - application/json - /fake/api/changename: - post: - operationId: op2 - parameters: [] - responses: - "201": - content: - application/json: - schema: {} - description: Successful Response - "422": - content: - application/json: - schema: - $ref: '#/components/schemas/HTTPValidationError' - description: Validation Error - summary: op2 - tags: - - fake - x-accepts: - - application/json - /fake/api/query/enum: - post: - operationId: op3 - parameters: - - description: query enum test - explode: true - in: query - name: query_enum - required: true - schema: - items: - $ref: '#/components/schemas/CodesEnum' - type: array - style: form - responses: - "200": - description: Successful Response - summary: op3 - tags: - - fake - x-accepts: - - application/json - /fake/inline/schema/anyof/path1: - get: - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/myObject' - description: "" - tags: - - fake - x-accepts: - - application/json - /fake/inline/schema/anyof/path2: - get: - responses: - "200": - content: - application/json: - schema: - $ref: '#/components/schemas/myObject' - description: "" - tags: - - fake - x-accepts: - - application/json - /fake/inline/schema/anyof/path3: - get: - responses: - "200": - content: - application/json: - schema: - items: - $ref: '#/components/schemas/myObject' - nullable: true - type: array - description: "" - tags: - - fake - x-accepts: - - application/json components: - parameters: - ref_to_uuid: - description: to test ref to parameter (uuid) - explode: false - in: header - name: ref_to_uuid - required: true - schema: - example: 61864654-6e6b-4152-a62f-795fdd606bc2 - format: uuid - type: string - style: simple - ref_to_oneof: - description: to test ref to parameter (oneof) - explode: false - in: header - name: ref_to_oneof - required: true - schema: - $ref: '#/components/schemas/_ref_ref_to_path_level_parameter_oneof_ref_to_oneof_parameter' - style: simple - ref_to_anyof: - description: to test ref to parameter (anyof) - explode: false - in: header - name: ref_to_anyof - required: true - schema: - $ref: '#/components/schemas/ref_to_ref_parameter_anyof_ref_to_anyof_parameter' - style: simple requestBodies: UserArray: content: @@ -872,19 +660,6 @@ components: $ref: '#/components/schemas/Pet' description: Pet object that needs to be added to the store required: true - responses: - no_ref: - content: - text/plain: - schema: - type: string - description: required to pass validation - ref: - content: - text/plain: - schema: - $ref: '#/components/schemas/simple_text' - description: required to pass validation schemas: Order: description: An order for a pets from the pet store @@ -1053,129 +828,6 @@ components: message: type: string title: An uploaded response - StringOrInt: - anyOf: - - type: string - - format: int32 - type: integer - description: string or int - OneOfStringOrInt: - description: string or int (onefOf) - oneOf: - - type: string - - type: integer - Dog: - allOf: - - $ref: '#/components/schemas/Animal' - - properties: - breed: - type: string - Cat: - allOf: - - $ref: '#/components/schemas/Animal' - - properties: - declawed: - type: boolean - Animal: - discriminator: - propertyName: className - properties: - className: - type: string - color: - default: red - type: string - required: - - className - simple_text: - type: string - any_type_test: - properties: - any_type_property: {} - array_prop: - description: test array in 3.1 spec - items: - type: string - type: array - ref_array_prefix_items: - description: | - An item that was added to the queue. - items: {} - maxItems: 5 - minItems: 3 - type: array - HTTPValidationError: - properties: {} - title: HTTPValidationError - type: object - ArrayPrefixItems: - description: | - An item that was added to the queue. - items: {} - maxItems: 5 - minItems: 3 - type: array - circular_reference_1: - properties: - prop1: - $ref: '#/components/schemas/circular_reference_2' - circular_reference_2: - properties: - prop1: - $ref: '#/components/schemas/circular_reference_3' - circular_reference_3: - properties: - prop1: - $ref: '#/components/schemas/circular_reference_1' - array_of_same_ref: - properties: - arrayFooOne: - items: - $ref: '#/components/schemas/Tag' - type: array - arrayFooTwo: - items: - $ref: '#/components/schemas/Tag' - type: array - arrayFooThree: - items: - $ref: '#/components/schemas/Tag' - type: array - CodesEnum: - enum: - - Code 1 - - Code 2 - - Code 3 - type: string - SimpleModelWithArrayProperty: - properties: - arrayOfStrings: - items: - type: string - type: array - required: - - arrayOfStrings - AllOfSimpleModel: - allOf: - - $ref: '#/components/schemas/SimpleModelWithArrayProperty' - myObject: - type: object - SelfReference: - items: {} - type: array - SelfReferenceOneOf: - oneOf: - - type: string - - type: boolean - SelfReferenceAnyOf: - anyOf: - - type: string - - type: boolean - SelfReferenceAdditionalProperties: - additionalProperties: {} - properties: - dummy: - type: string updatePetWithForm_request: properties: name: @@ -1193,36 +845,6 @@ components: description: file to upload format: binary type: string - _ref_ref_to_path_level_parameter_oneof_ref_to_oneof_parameter: - oneOf: - - type: string - - type: integer - ref_to_ref_parameter_anyof_ref_to_anyof_parameter: - oneOf: - - type: string - - items: - type: string - type: array - _fake_webhooks_sources_deleted_post_request_event: - properties: - event_id: - type: string - required: - - event_id - _fake_webhooks_sources_deleted_post_request: - description: inline schema in webhooks - properties: - event_timestamp: - format: date-time - type: string - event_type: - type: string - event: - $ref: '#/components/schemas/_fake_webhooks_sources_deleted_post_request_event' - required: - - event - - event_timestamp - - event_type securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java index 70968d44d7c1..f993e935c7aa 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/JSON.java @@ -58,35 +58,6 @@ public class JSON { @SuppressWarnings("unchecked") public static GsonBuilder createGson() { GsonFireBuilder fireBuilder = new GsonFireBuilder() - .registerTypeSelector(org.openapitools.client.model.Animal.class, new TypeSelector() { - @Override - public Class getClassForElement(JsonElement readElement) { - Map classByDiscriminatorValue = new HashMap(); - classByDiscriminatorValue.put("Cat", org.openapitools.client.model.Cat.class); - classByDiscriminatorValue.put("Dog", org.openapitools.client.model.Dog.class); - classByDiscriminatorValue.put("Animal", org.openapitools.client.model.Animal.class); - return getClassByDiscriminator(classByDiscriminatorValue, - getDiscriminatorValue(readElement, "className")); - } - }) - .registerTypeSelector(org.openapitools.client.model.Cat.class, new TypeSelector() { - @Override - public Class getClassForElement(JsonElement readElement) { - Map classByDiscriminatorValue = new HashMap(); - classByDiscriminatorValue.put("Cat", org.openapitools.client.model.Cat.class); - return getClassByDiscriminator(classByDiscriminatorValue, - getDiscriminatorValue(readElement, "className")); - } - }) - .registerTypeSelector(org.openapitools.client.model.Dog.class, new TypeSelector() { - @Override - public Class getClassForElement(JsonElement readElement) { - Map classByDiscriminatorValue = new HashMap(); - classByDiscriminatorValue.put("Dog", org.openapitools.client.model.Dog.class); - return getClassByDiscriminator(classByDiscriminatorValue, - getDiscriminatorValue(readElement, "className")); - } - }) ; GsonBuilder builder = fireBuilder.createGsonBuilder(); return builder; @@ -122,28 +93,10 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri gsonBuilder.registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter); gsonBuilder.registerTypeAdapter(LocalDate.class, localDateTypeAdapter); gsonBuilder.registerTypeAdapter(byte[].class, byteArrayAdapter); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AllOfSimpleModel.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.AnyTypeTest.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfSameRef.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Cat.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Category.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.CircularReference1.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.CircularReference2.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.CircularReference3.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Dog.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.FakeWebhooksSourcesDeletedPostRequest.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.FakeWebhooksSourcesDeletedPostRequestEvent.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ModelApiResponse.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.OneOfStringOrInt.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Order.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pet.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.RefRefToPathLevelParameterOneofRefToOneofParameter.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.RefToRefParameterAnyofRefToAnyofParameter.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.SelfReferenceAdditionalProperties.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.SelfReferenceAnyOf.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.SelfReferenceOneOf.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.SimpleModelWithArrayProperty.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.StringOrInt.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Tag.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.User.CustomTypeAdapterFactory()); gson = gsonBuilder.create(); diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Category.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Category.kt index 82813cdbff3e..b22939b05947 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Category.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Category.kt @@ -12,13 +12,11 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A category for a pet * @param id * @param name */ -@Serializable data class Category( var id: kotlin.Long? = null, var name: kotlin.String? = null diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt index dcc1ed13510b..cd59353be8f0 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt @@ -12,14 +12,12 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * Describes the result of uploading an image resource * @param code * @param type * @param message */ -@Serializable data class ModelApiResponse( var code: kotlin.Int? = null, var type: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Order.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Order.kt index d5a9b56748f7..b06af02aec05 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Order.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Order.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * An order for a pets from the pet store * @param id @@ -22,7 +21,6 @@ import kotlinx.serialization.Serializable * @param status Order Status * @param complete */ -@Serializable data class Order( var id: kotlin.Long? = null, var petId: kotlin.Long? = null, diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Pet.kt index e9095e0a7c60..2fd28652dcd8 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Pet.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Pet.kt @@ -14,7 +14,6 @@ package org.openapitools.server.models import org.openapitools.server.models.Category import org.openapitools.server.models.Tag -import kotlinx.serialization.Serializable /** * A pet for sale in the pet store * @param name @@ -24,7 +23,6 @@ import kotlinx.serialization.Serializable * @param tags * @param status pet status in the store */ -@Serializable data class Pet( var name: kotlin.String, var photoUrls: kotlin.collections.MutableList, diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Tag.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Tag.kt index 26a16d0acc37..4c697bab29ae 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Tag.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/Tag.kt @@ -12,13 +12,11 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A tag for a pet * @param id * @param name */ -@Serializable data class Tag( var id: kotlin.Long? = null, var name: kotlin.String? = null diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/User.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/User.kt index 57f4e607386a..9e2799f69ca9 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/User.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/models/User.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A User who is purchasing from the pet store * @param id @@ -24,7 +23,6 @@ import kotlinx.serialization.Serializable * @param phone * @param userStatus User Status */ -@Serializable data class User( var id: kotlin.Long? = null, var username: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-server-required-and-nullable-properties/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/petstore/kotlin-server-required-and-nullable-properties/src/main/kotlin/org/openapitools/server/models/Pet.kt index 5266d4aaa2f1..072781fb8b9c 100644 --- a/samples/server/petstore/kotlin-server-required-and-nullable-properties/src/main/kotlin/org/openapitools/server/models/Pet.kt +++ b/samples/server/petstore/kotlin-server-required-and-nullable-properties/src/main/kotlin/org/openapitools/server/models/Pet.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * * @param notNullableRequired @@ -20,7 +19,6 @@ import kotlinx.serialization.Serializable * @param nullableNotRequired * @param notNullableNotRequired */ -@Serializable data class Pet( val notNullableRequired: kotlin.String, val nullableRequired: kotlin.String?, diff --git a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Category.kt b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Category.kt index 0c3ccfcfe850..852f443a304c 100644 --- a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Category.kt +++ b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Category.kt @@ -12,13 +12,11 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A category for a pet * @param id * @param name */ -@Serializable data class Category( val id: kotlin.Long? = null, val name: kotlin.String? = null diff --git a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt index 5ecc51991934..94b9ddf7b92e 100644 --- a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt @@ -12,14 +12,12 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * Describes the result of uploading an image resource * @param code * @param type * @param message */ -@Serializable data class ModelApiResponse( val code: kotlin.Int? = null, val type: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Order.kt b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Order.kt index d015eb6b780a..48c1ef32bd34 100644 --- a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Order.kt +++ b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Order.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * An order for a pets from the pet store * @param id @@ -22,7 +21,6 @@ import kotlinx.serialization.Serializable * @param status Order Status * @param complete */ -@Serializable data class Order( val id: kotlin.Long? = null, val petId: kotlin.Long? = null, diff --git a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Pet.kt index 929d729b09bb..0a0c9a010354 100644 --- a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Pet.kt +++ b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Pet.kt @@ -14,7 +14,6 @@ package org.openapitools.server.models import org.openapitools.server.models.Category import org.openapitools.server.models.Tag -import kotlinx.serialization.Serializable /** * A pet for sale in the pet store * @param name @@ -24,7 +23,6 @@ import kotlinx.serialization.Serializable * @param tags * @param status pet status in the store */ -@Serializable data class Pet( val name: kotlin.String, val photoUrls: kotlin.collections.List, diff --git a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Tag.kt b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Tag.kt index 76749aca3f4d..9c0bd1e9aada 100644 --- a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Tag.kt +++ b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/Tag.kt @@ -12,13 +12,11 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A tag for a pet * @param id * @param name */ -@Serializable data class Tag( val id: kotlin.Long? = null, val name: kotlin.String? = null diff --git a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/User.kt b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/User.kt index 26757f921f43..b26d40023f95 100644 --- a/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/User.kt +++ b/samples/server/petstore/kotlin-server/javalin-6/src/main/kotlin/org/openapitools/server/models/User.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A User who is purchasing from the pet store * @param id @@ -24,7 +23,6 @@ import kotlinx.serialization.Serializable * @param phone * @param userStatus User Status */ -@Serializable data class User( val id: kotlin.Long? = null, val username: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Category.kt b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Category.kt index 0c3ccfcfe850..852f443a304c 100644 --- a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Category.kt +++ b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Category.kt @@ -12,13 +12,11 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A category for a pet * @param id * @param name */ -@Serializable data class Category( val id: kotlin.Long? = null, val name: kotlin.String? = null diff --git a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt index 5ecc51991934..94b9ddf7b92e 100644 --- a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt @@ -12,14 +12,12 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * Describes the result of uploading an image resource * @param code * @param type * @param message */ -@Serializable data class ModelApiResponse( val code: kotlin.Int? = null, val type: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Order.kt b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Order.kt index d015eb6b780a..48c1ef32bd34 100644 --- a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Order.kt +++ b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Order.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * An order for a pets from the pet store * @param id @@ -22,7 +21,6 @@ import kotlinx.serialization.Serializable * @param status Order Status * @param complete */ -@Serializable data class Order( val id: kotlin.Long? = null, val petId: kotlin.Long? = null, diff --git a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Pet.kt index 929d729b09bb..0a0c9a010354 100644 --- a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Pet.kt +++ b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Pet.kt @@ -14,7 +14,6 @@ package org.openapitools.server.models import org.openapitools.server.models.Category import org.openapitools.server.models.Tag -import kotlinx.serialization.Serializable /** * A pet for sale in the pet store * @param name @@ -24,7 +23,6 @@ import kotlinx.serialization.Serializable * @param tags * @param status pet status in the store */ -@Serializable data class Pet( val name: kotlin.String, val photoUrls: kotlin.collections.List, diff --git a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Tag.kt b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Tag.kt index 76749aca3f4d..9c0bd1e9aada 100644 --- a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Tag.kt +++ b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/Tag.kt @@ -12,13 +12,11 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A tag for a pet * @param id * @param name */ -@Serializable data class Tag( val id: kotlin.Long? = null, val name: kotlin.String? = null diff --git a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/User.kt b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/User.kt index 26757f921f43..b26d40023f95 100644 --- a/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/User.kt +++ b/samples/server/petstore/kotlin-server/javalin/src/main/kotlin/org/openapitools/server/models/User.kt @@ -12,7 +12,6 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable /** * A User who is purchasing from the pet store * @param id @@ -24,7 +23,6 @@ import kotlinx.serialization.Serializable * @param phone * @param userStatus User Status */ -@Serializable data class User( val id: kotlin.Long? = null, val username: kotlin.String? = null, diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt index 7647c2d227e0..60715998c2a0 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt @@ -12,17 +12,16 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable + import java.io.Serializable /** * A category for a pet * @param id * @param name */ -@Serializable data class Category( val id: kotlin.Long? = null, val name: kotlin.String? = null -) +): Serializable { } diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt index e16d42e86a4e..37fe31a0e035 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ModelApiResponse.kt @@ -12,19 +12,18 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable + import java.io.Serializable /** * Describes the result of uploading an image resource * @param code * @param type * @param message */ -@Serializable data class ModelApiResponse( val code: kotlin.Int? = null, val type: kotlin.String? = null, val message: kotlin.String? = null -) +): Serializable { } diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt index b1a711510fc6..e7b861dee4ec 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt @@ -12,7 +12,7 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable + import java.io.Serializable /** * An order for a pets from the pet store * @param id @@ -22,7 +22,6 @@ import kotlinx.serialization.Serializable * @param status Order Status * @param complete */ -@Serializable data class Order( val id: kotlin.Long? = null, val petId: kotlin.Long? = null, @@ -31,7 +30,7 @@ data class Order( /* Order Status */ val status: Order.Status? = null, val complete: kotlin.Boolean? = false -) +): Serializable { /** * Order Status diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt index 8fe934cc3ff3..2d025bfba231 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt @@ -14,7 +14,7 @@ package org.openapitools.server.models import org.openapitools.server.models.Category import org.openapitools.server.models.Tag -import kotlinx.serialization.Serializable + import java.io.Serializable /** * A pet for sale in the pet store * @param name @@ -24,7 +24,6 @@ import kotlinx.serialization.Serializable * @param tags * @param status pet status in the store */ -@Serializable data class Pet( val name: kotlin.String, val photoUrls: kotlin.collections.List, @@ -33,7 +32,7 @@ data class Pet( val tags: kotlin.collections.List? = null, /* pet status in the store */ val status: Pet.Status? = null -) +): Serializable { /** * pet status in the store diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt index fae4d9d0ba3c..e9d0d7f076bb 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt @@ -12,17 +12,16 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable + import java.io.Serializable /** * A tag for a pet * @param id * @param name */ -@Serializable data class Tag( val id: kotlin.Long? = null, val name: kotlin.String? = null -) +): Serializable { } diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt index af04fd61c1cf..79cb2b3f6ff6 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt @@ -12,7 +12,7 @@ package org.openapitools.server.models -import kotlinx.serialization.Serializable + import java.io.Serializable /** * A User who is purchasing from the pet store * @param id @@ -24,7 +24,6 @@ import kotlinx.serialization.Serializable * @param phone * @param userStatus User Status */ -@Serializable data class User( val id: kotlin.Long? = null, val username: kotlin.String? = null, @@ -35,7 +34,7 @@ data class User( val phone: kotlin.String? = null, /* User Status */ val userStatus: kotlin.Int? = null -) +): Serializable { }