From f6b535f18cd132f5979a55deceb157f97dfd69e0 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 21 Sep 2019 22:03:00 +0800
Subject: [PATCH 1/5] minor enhancement to kotlin multi platform client
---
.gitignore | 1 +
README.md | 1 +
bin/utils/ensure-up-to-date | 1 +
.../libraries/multiplatform/api.mustache | 26 ++++++++---
pom.xml | 1 +
.../petstore/kotlin-multiplatform/pom.xml | 46 +++++++++++++++++++
.../org/openapitools/client/apis/PetApi.kt | 27 ++---------
.../org/openapitools/client/apis/StoreApi.kt | 9 ----
.../org/openapitools/client/apis/UserApi.kt | 22 ---------
.../openapitools/client/models/ApiResponse.kt | 1 -
.../openapitools/client/models/Category.kt | 1 -
.../org/openapitools/client/models/Order.kt | 4 +-
.../org/openapitools/client/models/Pet.kt | 4 +-
.../org/openapitools/client/models/Tag.kt | 1 -
.../org/openapitools/client/models/User.kt | 1 -
15 files changed, 76 insertions(+), 70 deletions(-)
create mode 100644 samples/client/petstore/kotlin-multiplatform/pom.xml
diff --git a/.gitignore b/.gitignore
index 56cc80cae68..8aee57b0b87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,6 +186,7 @@ samples/client/petstore/kotlin-string/build
samples/openapi3/client/petstore/kotlin/build
samples/server/petstore/kotlin-server/ktor/build
samples/server/petstore/kotlin-springboot/build
+samples/client/petstore/kotlin-multiplatform/build/
\?
# haskell
diff --git a/README.md b/README.md
index 82c23df3972..c74d2e1993f 100644
--- a/README.md
+++ b/README.md
@@ -701,6 +701,7 @@ Here is a list of template creators:
* Javascript (Flow types) @jaypea
* JMeter: @davidkiss
* Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
+ * Kotlin (MultiPlatform): @andrewemery
* Lua: @daurnimator
* Nim: @hokamoto
* OCaml: @cgensoul
diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date
index e8716d8020f..c5671fe6653 100755
--- a/bin/utils/ensure-up-to-date
+++ b/bin/utils/ensure-up-to-date
@@ -21,6 +21,7 @@ declare -a scripts=(
"./bin/openapi3/jaxrs-jersey-petstore.sh"
"./bin/spring-all-petstore.sh"
"./bin/javascript-petstore-all.sh"
+"./bin/kotlin-client-petstore-multiplatform.sh"
"./bin/kotlin-client-petstore.sh"
"./bin/kotlin-client-string.sh"
"./bin/kotlin-client-threetenbp.sh"
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
index 232c77d5fda..e4acc8f0fdc 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
@@ -40,25 +40,37 @@ class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
suspend fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : HttpResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}> {
val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{operationIdCamelCase}}Request({{paramName}}.asList()){{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}{{operationIdCamelCase}}Request({{paramName}}){{/isMapContainer}}{{^isMapContainer}}{{paramName}}{{/isMapContainer}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}}
- {{^hasBodyParam}}{{#hasFormParams}}{{#isMultipart}}formData {
+ {{^hasBodyParam}}
+ {{#hasFormParams}}
+ {{#isMultipart}}
+ formData {
{{#formParams}}
{{paramName}}?.apply { append("{{{baseName}}}", {{paramName}}) }
{{/formParams}}
- }{{/isMultipart}}{{^isMultipart}}ParametersBuilder().also {
+ }
+ {{/isMultipart}}
+ {{^isMultipart}}
+ ParametersBuilder().also {
{{#formParams}}
{{paramName}}?.apply { it.append("{{{baseName}}}", {{paramName}}.toString()) }
{{/formParams}}
- }.build(){{/isMultipart}}{{/hasFormParams}}{{^hasFormParams}}io.ktor.client.utils.EmptyContent{{/hasFormParams}}{{/hasBodyParam}}
+ }.build()
+ {{/isMultipart}}
+ {{/hasFormParams}}
+ {{^hasFormParams}}
+ io.ktor.client.utils.EmptyContent
+ {{/hasFormParams}}
+ {{/hasBodyParam}}
val localVariableQuery = mutableMapOf<String, List<String>>()
- {{#hasQueryParams}}{{#queryParams}}
+ {{#queryParams}}
{{paramName}}?.apply { localVariableQuery["{{baseName}}"] = {{#isContainer}}toMultiValue(this, "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf("${{paramName}}"){{/isContainer}} }
- {{/queryParams}}{{/hasQueryParams}}
+ {{/queryParams}}
val localVariableHeaders = mutableMapOf<String, String>()
- {{#hasHeaderParams}}{{#headerParams}}
+ {{#headerParams}}
{{paramName}}?.apply { localVariableHeaders["{{baseName}}"] = {{#isContainer}}this.joinToString(separator = collectionDelimiter("{{collectionFormat}}")){{/isContainer}}{{^isContainer}}this.toString(){{/isContainer}} }
- {{/headerParams}}{{/hasHeaderParams}}
+ {{/headerParams}}
val localVariableConfig = RequestConfig(
RequestMethod.{{httpMethod}},
diff --git a/pom.xml b/pom.xml
index 74e5a30947b..18f9b1dd04f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1244,6 +1244,7 @@
<module>samples/client/petstore/elixir</module>
<module>samples/client/petstore/erlang-client</module>
<module>samples/client/petstore/erlang-proper</module>
+ <module>samples/client/petstore/kotlin-multiplatform</module>
<module>samples/client/petstore/kotlin/</module>
<module>samples/client/petstore/kotlin-threetenbp/</module>
<module>samples/client/petstore/kotlin-string/</module>
diff --git a/samples/client/petstore/kotlin-multiplatform/pom.xml b/samples/client/petstore/kotlin-multiplatform/pom.xml
new file mode 100644
index 00000000000..cee5bc99e83
--- /dev/null
+++ b/samples/client/petstore/kotlin-multiplatform/pom.xml
@@ -0,0 +1,46 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>io.swagger</groupId>
+ <artifactId>KotlinMultiPlatformClientTests</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Kotlin MultiPlatform Petstore Client</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>bundle-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>gradle</executable>
+ <arguments>
+ <argument>test</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
index be06c23d33c..4fa6a1111f8 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -47,13 +47,10 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun addPet(body: Pet) : HttpResponse<Unit> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -84,12 +81,9 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -120,12 +114,9 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
status?.apply { localVariableQuery["status"] = toMultiValue(this, "csv") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -165,12 +156,9 @@ private class FindPetsByStatusResponse(val value: List<Pet>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
tags?.apply { localVariableQuery["tags"] = toMultiValue(this, "csv") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -210,10 +198,8 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -240,13 +226,10 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
suspend fun updatePet(body: Pet) : HttpResponse<Unit> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
@@ -276,15 +259,13 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
val localVariableBody =
ParametersBuilder().also {
- name?.apply { it.append("name", name) }
- status?.apply { it.append("status", status) }
- }.build()
+ name?.apply { it.append("name", name.toString()) }
+ status?.apply { it.append("status", status.toString()) }
+ }.build()
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -320,10 +301,8 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
}
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index e7ff3358d8b..3b30979b1f0 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -49,10 +49,8 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -82,10 +80,8 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -125,10 +121,8 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -156,13 +150,10 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
suspend fun placeOrder(body: Order) : HttpResponse<Order> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
index 96e7031c296..6fd7a9a1a0e 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -46,13 +46,10 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun createUser(body: User) : HttpResponse<Unit> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -79,13 +76,10 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun createUsersWithArrayInput(body: kotlin.Array<User>) : HttpResponse<Unit> {
val localVariableBody = CreateUsersWithArrayInputRequest(body.asList())
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -121,13 +115,10 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
suspend fun createUsersWithListInput(body: kotlin.Array<User>) : HttpResponse<Unit> {
val localVariableBody = CreateUsersWithListInputRequest(body.asList())
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -166,10 +157,8 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -200,10 +189,8 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -235,14 +222,10 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
username?.apply { localVariableQuery["username"] = listOf("$username") }
-
password?.apply { localVariableQuery["password"] = listOf("$password") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -271,10 +254,8 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -302,13 +283,10 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
suspend fun updateUser(username: kotlin.String, body: User) : HttpResponse<Unit> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
index c57290ce102..51ab6ed9398 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -27,4 +27,3 @@ data class ApiResponse (
@SerialName(value = "message") val message: kotlin.String? = null
)
-
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
index fbf598b4f9e..96432c658ad 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
@@ -25,4 +25,3 @@ data class Category (
@SerialName(value = "name") val name: kotlin.String? = null
)
-
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
index a487bc27e2c..e949395ce4e 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
@@ -33,8 +33,8 @@ data class Order (
@SerialName(value = "status") val status: Order.Status? = null,
@SerialName(value = "complete") val complete: kotlin.Boolean? = null
)
-
{
+
/**
* Order Status
* Values: placed,approved,delivered
@@ -51,6 +51,6 @@ data class Order (
object Serializer : CommonEnumSerializer<Status>("Status", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
index 4406842eeb5..dc2f8b0b0ef 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
@@ -35,8 +35,8 @@ data class Pet (
/* pet status in the store */
@SerialName(value = "status") val status: Pet.Status? = null
)
-
{
+
/**
* pet status in the store
* Values: available,pending,sold
@@ -53,6 +53,6 @@ data class Pet (
object Serializer : CommonEnumSerializer<Status>("Status", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
index b99b06e8bcd..b21e51bf8d3 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
@@ -25,4 +25,3 @@ data class Tag (
@SerialName(value = "name") val name: kotlin.String? = null
)
-
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
index 1950a140de6..7d52e737d49 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
@@ -38,4 +38,3 @@ data class User (
@SerialName(value = "userStatus") val userStatus: kotlin.Int? = null
)
-
--
GitLab
From 6ade8d5abacd3ee1eb2075f041757845aad8d504 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 21 Sep 2019 22:22:25 +0800
Subject: [PATCH 2/5] better code format
---
.../libraries/multiplatform/api.mustache | 34 ++++++++++++----
.../org/openapitools/client/apis/PetApi.kt | 40 ++++---------------
.../org/openapitools/client/apis/StoreApi.kt | 20 ++--------
.../org/openapitools/client/apis/UserApi.kt | 40 ++++---------------
4 files changed, 47 insertions(+), 87 deletions(-)
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
index e4acc8f0fdc..bab78f865b0 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache
@@ -35,8 +35,10 @@ class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
* {{notes}}
{{#allParams}}* @param {{paramName}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
{{/allParams}}* @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
- */{{#returnType}}
- @Suppress("UNCHECKED_CAST"){{/returnType}}
+ */
+ {{#returnType}}
+ @Suppress("UNCHECKED_CAST")
+ {{/returnType}}
suspend fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : HttpResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Unit{{/returnType}}> {
val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{operationIdCamelCase}}Request({{paramName}}.asList()){{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}{{operationIdCamelCase}}Request({{paramName}}){{/isMapContainer}}{{^isMapContainer}}{{paramName}}{{/isMapContainer}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}}
@@ -79,22 +81,40 @@ class {{classname}} @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return {{#hasBodyParam}}jsonRequest{{/hasBodyParam}}{{^hasBodyParam}}{{#hasFormParams}}{{#isMultipart}}multipartFormRequest{{/isMultipart}}{{^isMultipart}}urlEncodedFormRequest{{/isMultipart}}{{/hasFormParams}}{{^hasFormParams}}request{{/hasFormParams}}{{/hasBodyParam}}(
+ return {{#hasBodyParam}}jsonRequest{{/hasBodyParam}}{{^hasBodyParam}}{{#hasFormParams}}{{#isMultipart}}multipartFormRequest{{/isMultipart}}{{^isMultipart}}urlEncodedFormRequest{{/isMultipart}}{{/hasFormParams}}{{^hasFormParams}}request{{/hasFormParams}}{{/hasBodyParam}}(
localVariableConfig,
localVariableBody
).{{#isListContainer}}wrap<{{operationIdCamelCase}}Response>().map { value.toTypedArray() }{{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMapContainer}}{{^isMapContainer}}wrap(){{/isMapContainer}}{{/isListContainer}}
}
- {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMapContainer}}{{>serial_wrapper_request_map}}{{/isMapContainer}}{{/bodyParam}}{{/hasBodyParam}}
- {{#isListContainer}}{{>serial_wrapper_response_list}}{{/isListContainer}}{{#isMapContainer}}{{>serial_wrapper_response_map}}{{/isMapContainer}}
+ {{#hasBodyParam}}
+ {{#bodyParam}}
+ {{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMapContainer}}{{>serial_wrapper_request_map}}{{/isMapContainer}}
+ {{/bodyParam}}
+ {{/hasBodyParam}}
+ {{#isListContainer}}
+ {{>serial_wrapper_response_list}}
+ {{/isListContainer}}
+ {{#isMapContainer}}
+ {{>serial_wrapper_response_map}}
+ {{/isMapContainer}}
{{/operation}}
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
{{#operation}}
- {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isListContainer}}{{#isMapContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isMapContainer}}{{/bodyParam}}{{/hasBodyParam}}
- {{#isListContainer}}serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer()){{/isListContainer}}{{#isMapContainer}}serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer()){{/isMapContainer}}
+ {{#hasBodyParam}}
+ {{#bodyParam}}
+ {{#isListContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isListContainer}}{{#isMapContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isMapContainer}}
+ {{/bodyParam}}
+ {{/hasBodyParam}}
+ {{#isListContainer}}
+ serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer())
+ {{/isListContainer}}
+ {{#isMapContainer}}
+ serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer())
+ {{/isMapContainer}}
{{/operation}}
}
}
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
index 4fa6a1111f8..59c49b3efdf 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -59,14 +59,13 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Deletes a pet
@@ -92,14 +91,12 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Finds Pets by status
@@ -125,13 +122,12 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap<FindPetsByStatusResponse>().map { value.toTypedArray() }
}
-
@Serializable
private class FindPetsByStatusResponse(val value: List<Pet>) {
@Serializer(FindPetsByStatusResponse::class)
@@ -167,13 +163,12 @@ private class FindPetsByStatusResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap<FindPetsByTagsResponse>().map { value.toTypedArray() }
}
-
@Serializable
private class FindPetsByTagsResponse(val value: List<Pet>) {
@Serializer(FindPetsByTagsResponse::class)
@@ -208,14 +203,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Update an existing pet
@@ -238,14 +231,13 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Updates a pet in the store with form data
@@ -274,14 +266,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return urlEncodedFormRequest(
+ return urlEncodedFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* uploads an image
@@ -311,34 +301,20 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return multipartFormRequest(
+ return multipartFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
-
-
-
serializer.setMapper(FindPetsByStatusResponse::class, FindPetsByStatusResponse.serializer())
-
serializer.setMapper(FindPetsByTagsResponse::class, FindPetsByTagsResponse.serializer())
-
-
-
-
-
-
-
}
}
}
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index 3b30979b1f0..86f32c9f978 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -59,14 +59,12 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Returns pet inventories by status
@@ -90,13 +88,12 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap<GetInventoryResponse>().map { value }
}
-
@Serializable
private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
@Serializer(GetInventoryResponse::class)
@@ -131,14 +128,12 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Place an order for a pet
@@ -162,26 +157,19 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
-
-
serializer.setMapper(GetInventoryResponse::class, GetInventoryResponse.serializer())
-
-
-
}
}
}
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
index 6fd7a9a1a0e..1977979c1d9 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -58,14 +58,13 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Creates list of users with given input array
@@ -88,7 +87,7 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
@@ -104,7 +103,6 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
override fun deserialize(decoder: Decoder) = CreateUsersWithArrayInputRequest(serializer.deserialize(decoder))
}
}
-
/**
* Creates list of users with given input array
@@ -127,7 +125,7 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
@@ -143,7 +141,6 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
override fun deserialize(decoder: Decoder) = CreateUsersWithListInputRequest(serializer.deserialize(decoder))
}
}
-
/**
* Delete user
@@ -167,14 +164,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Get user by user name
@@ -199,14 +194,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Logs user into the system
@@ -234,14 +227,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Logs out current logged in user session
@@ -264,14 +255,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Updated user
@@ -295,34 +284,21 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
serializer.setMapper(CreateUsersWithArrayInputRequest::class, CreateUsersWithArrayInputRequest.serializer())
-
serializer.setMapper(CreateUsersWithListInputRequest::class, CreateUsersWithListInputRequest.serializer())
-
-
-
-
-
-
-
-
-
-
}
}
}
--
GitLab
From 42766b6e1bcce52453a93443ffa112fbe9e3e84a Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 21 Sep 2019 23:39:59 +0800
Subject: [PATCH 3/5] fix kotlin test
---
samples/client/petstore/kotlin-multiplatform/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/samples/client/petstore/kotlin-multiplatform/pom.xml b/samples/client/petstore/kotlin-multiplatform/pom.xml
index cee5bc99e83..5422b930acc 100644
--- a/samples/client/petstore/kotlin-multiplatform/pom.xml
+++ b/samples/client/petstore/kotlin-multiplatform/pom.xml
@@ -33,8 +33,9 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>gradle</executable>
+ <executable>/bin/bash</executable>
<arguments>
+ <argument>gradlew</argument>
<argument>test</argument>
</arguments>
</configuration>
--
GitLab
From a57aa93775ca23519a28cee254d6df9de8736222 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sun, 22 Sep 2019 00:02:02 +0800
Subject: [PATCH 4/5] use build
---
samples/client/petstore/kotlin-multiplatform/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/client/petstore/kotlin-multiplatform/pom.xml b/samples/client/petstore/kotlin-multiplatform/pom.xml
index 5422b930acc..bf62ae66e66 100644
--- a/samples/client/petstore/kotlin-multiplatform/pom.xml
+++ b/samples/client/petstore/kotlin-multiplatform/pom.xml
@@ -36,7 +36,7 @@
<executable>/bin/bash</executable>
<arguments>
<argument>gradlew</argument>
- <argument>test</argument>
+ <argument>build</argument>
</arguments>
</configuration>
</execution>
--
GitLab
From 4407df34c5baaabe106c674a022d29d936cf5b1f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sun, 22 Sep 2019 00:46:38 +0800
Subject: [PATCH 5/5] update kotlin openapi3 sample
---
.../docs/FileSchemaTestClass.md | 4 +-
.../kotlin-multiplatform/docs/FormatTest.md | 2 +-
...dPropertiesAndAdditionalPropertiesClass.md | 2 +-
.../client/apis/AnotherFakeApi.kt | 7 +-
.../openapitools/client/apis/DefaultApi.kt | 8 +-
.../org/openapitools/client/apis/FakeApi.kt | 128 +++---------------
.../client/apis/FakeClassnameTags123Api.kt | 7 +-
.../org/openapitools/client/apis/PetApi.kt | 71 ++--------
.../org/openapitools/client/apis/StoreApi.kt | 29 +---
.../org/openapitools/client/apis/UserApi.kt | 62 ++-------
.../models/AdditionalPropertiesClass.kt | 1 -
.../org/openapitools/client/models/Animal.kt | 1 -
.../openapitools/client/models/ApiResponse.kt | 1 -
.../client/models/ArrayOfArrayOfNumberOnly.kt | 1 -
.../client/models/ArrayOfNumberOnly.kt | 1 -
.../openapitools/client/models/ArrayTest.kt | 1 -
.../client/models/Capitalization.kt | 1 -
.../org/openapitools/client/models/Cat.kt | 1 -
.../openapitools/client/models/CatAllOf.kt | 1 -
.../openapitools/client/models/Category.kt | 1 -
.../openapitools/client/models/ClassModel.kt | 1 -
.../org/openapitools/client/models/Client.kt | 1 -
.../org/openapitools/client/models/Dog.kt | 1 -
.../openapitools/client/models/DogAllOf.kt | 1 -
.../openapitools/client/models/EnumArrays.kt | 6 +-
.../openapitools/client/models/EnumTest.kt | 10 +-
.../client/models/FileSchemaTestClass.kt | 5 +-
.../org/openapitools/client/models/Foo.kt | 1 -
.../openapitools/client/models/FormatTest.kt | 3 +-
.../client/models/HasOnlyReadOnly.kt | 1 -
.../client/models/HealthCheckResult.kt | 1 -
.../client/models/InlineObject.kt | 1 -
.../client/models/InlineObject1.kt | 1 -
.../client/models/InlineObject2.kt | 6 +-
.../client/models/InlineObject3.kt | 1 -
.../client/models/InlineObject4.kt | 1 -
.../client/models/InlineObject5.kt | 1 -
.../client/models/InlineResponseDefault.kt | 1 -
.../org/openapitools/client/models/List.kt | 1 -
.../org/openapitools/client/models/MapTest.kt | 4 +-
...dPropertiesAndAdditionalPropertiesClass.kt | 3 +-
.../client/models/Model200Response.kt | 1 -
.../org/openapitools/client/models/Name.kt | 1 -
.../client/models/NullableClass.kt | 1 -
.../openapitools/client/models/NumberOnly.kt | 1 -
.../org/openapitools/client/models/Order.kt | 4 +-
.../client/models/OuterComposite.kt | 1 -
.../org/openapitools/client/models/Pet.kt | 4 +-
.../client/models/ReadOnlyFirst.kt | 1 -
.../org/openapitools/client/models/Return.kt | 1 -
.../client/models/SpecialModelname.kt | 1 -
.../org/openapitools/client/models/Tag.kt | 1 -
.../org/openapitools/client/models/User.kt | 1 -
53 files changed, 62 insertions(+), 337 deletions(-)
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md
index 089e61862c2..86b89d253d6 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FileSchemaTestClass.md
@@ -4,8 +4,8 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**file** | [**java.io.File**](java.io.File.md) | | [optional]
-**files** | [**kotlin.Array<java.io.File>**](java.io.File.md) | | [optional]
+**file** | [**io.ktor.client.request.forms.InputProvider**](io.ktor.client.request.forms.InputProvider.md) | | [optional]
+**files** | [**kotlin.Array<io.ktor.client.request.forms.InputProvider>**](io.ktor.client.request.forms.InputProvider.md) | | [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FormatTest.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FormatTest.md
index b37c9f5f549..f973a49e095 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FormatTest.md
@@ -15,7 +15,7 @@ Name | Type | Description | Notes
**binary** | [**io.ktor.client.request.forms.InputProvider**](io.ktor.client.request.forms.InputProvider.md) | | [optional]
**date** | **kotlin.String** | |
**dateTime** | **kotlin.String** | | [optional]
-**uuid** | [**java.util.UUID**](java.util.UUID.md) | | [optional]
+**uuid** | **kotlin.String** | | [optional]
**password** | **kotlin.String** | |
**patternWithDigits** | **kotlin.String** | A string that is a 10 digit number. Can have leading zeros. | [optional]
**patternWithDigitsAndDelimiter** | **kotlin.String** | A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. | [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 9a08c9385c5..f597e44437b 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,7 +4,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-**uuid** | [**java.util.UUID**](java.util.UUID.md) | | [optional]
+**uuid** | **kotlin.String** | | [optional]
**dateTime** | **kotlin.String** | | [optional]
**map** | [**kotlin.collections.Map<kotlin.String, Animal>**](Animal.md) | | [optional]
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
index 9a828f015f7..7d72ccb712b 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
@@ -47,13 +47,10 @@ class AnotherFakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun call123testSpecialTags(client: Client) : HttpResponse<Client> {
val localVariableBody = client
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PATCH,
@@ -62,20 +59,18 @@ class AnotherFakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
index 41a5c5b7697..49da05cc1e5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
@@ -49,10 +49,8 @@ class DefaultApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -61,20 +59,16 @@ class DefaultApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
index e2fdd4fb8c3..e7a28b7e291 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -53,10 +53,8 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -65,14 +63,12 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
*
@@ -84,13 +80,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun fakeOuterBooleanSerialize(body: kotlin.Boolean?) : HttpResponse<kotlin.Boolean> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -99,14 +92,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
*
@@ -118,13 +110,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun fakeOuterCompositeSerialize(outerComposite: OuterComposite?) : HttpResponse<OuterComposite> {
val localVariableBody = outerComposite
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -133,14 +122,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
*
@@ -152,13 +140,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun fakeOuterNumberSerialize(body: kotlin.Double?) : HttpResponse<kotlin.Double> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -167,14 +152,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
*
@@ -186,13 +170,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun fakeOuterStringSerialize(body: kotlin.String?) : HttpResponse<kotlin.String> {
val localVariableBody = body
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -201,14 +182,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
*
@@ -219,13 +199,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun testBodyWithFileSchema(fileSchemaTestClass: FileSchemaTestClass) : HttpResponse<Unit> {
val localVariableBody = fileSchemaTestClass
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
@@ -234,14 +211,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
*
@@ -253,15 +229,11 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun testBodyWithQueryParams(query: kotlin.String, user: User) : HttpResponse<Unit> {
val localVariableBody = user
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
query?.apply { localVariableQuery["query"] = listOf("$query") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
@@ -270,14 +242,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* To test \"client\" model
@@ -289,13 +260,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun testClientModel(client: Client) : HttpResponse<Client> {
val localVariableBody = client
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PATCH,
@@ -304,14 +272,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Fake endpoint for testing various parameters å‡ç«¯é»ž å½ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆ 가짜 엔드 í¬ì¸íŠ¸
@@ -350,13 +317,11 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
dateTime?.apply { it.append("dateTime", dateTime.toString()) }
password?.apply { it.append("password", password.toString()) }
paramCallback?.apply { it.append("callback", paramCallback.toString()) }
- }.build()
+ }.build()
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -365,14 +330,12 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return urlEncodedFormRequest(
+ return urlEncodedFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* To test enum parameters
@@ -393,25 +356,17 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
ParametersBuilder().also {
enumFormStringArray?.apply { it.append("enum_form_string_array", enumFormStringArray.toString()) }
enumFormString?.apply { it.append("enum_form_string", enumFormString.toString()) }
- }.build()
+ }.build()
val localVariableQuery = mutableMapOf<String, List<String>>()
-
enumQueryStringArray?.apply { localVariableQuery["enum_query_string_array"] = toMultiValue(this, "multi") }
-
enumQueryString?.apply { localVariableQuery["enum_query_string"] = listOf("$enumQueryString") }
-
enumQueryInteger?.apply { localVariableQuery["enum_query_integer"] = listOf("$enumQueryInteger") }
-
enumQueryDouble?.apply { localVariableQuery["enum_query_double"] = listOf("$enumQueryDouble") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
enumHeaderStringArray?.apply { localVariableHeaders["enum_header_string_array"] = this.joinToString(separator = collectionDelimiter("csv")) }
-
enumHeaderString?.apply { localVariableHeaders["enum_header_string"] = this.toString() }
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -420,14 +375,12 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return urlEncodedFormRequest(
+ return urlEncodedFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Fake endpoint to test group parameters (optional)
@@ -446,22 +399,14 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
requiredStringGroup?.apply { localVariableQuery["required_string_group"] = listOf("$requiredStringGroup") }
-
requiredInt64Group?.apply { localVariableQuery["required_int64_group"] = listOf("$requiredInt64Group") }
-
stringGroup?.apply { localVariableQuery["string_group"] = listOf("$stringGroup") }
-
int64Group?.apply { localVariableQuery["int64_group"] = listOf("$int64Group") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
requiredBooleanGroup?.apply { localVariableHeaders["required_boolean_group"] = this.toString() }
-
booleanGroup?.apply { localVariableHeaders["boolean_group"] = this.toString() }
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -470,14 +415,12 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* test inline additionalProperties
@@ -488,13 +431,10 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun testInlineAdditionalProperties(requestBody: kotlin.collections.Map<kotlin.String, kotlin.String>) : HttpResponse<Unit> {
val localVariableBody = TestInlineAdditionalPropertiesRequest(requestBody)
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -503,7 +443,7 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
@@ -519,7 +459,6 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
override fun deserialize(decoder: Decoder) = TestInlineAdditionalPropertiesRequest(serializer.deserialize(decoder))
}
}
-
/**
* test json serialization of form data
@@ -534,13 +473,11 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
ParametersBuilder().also {
param?.apply { it.append("param", param.toString()) }
param2?.apply { it.append("param2", param2.toString()) }
- }.build()
+ }.build()
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -549,14 +486,12 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
headers = localVariableHeaders
)
- return urlEncodedFormRequest(
+ return urlEncodedFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
*
@@ -574,20 +509,13 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
pipe?.apply { localVariableQuery["pipe"] = toMultiValue(this, "multi") }
-
ioutil?.apply { localVariableQuery["ioutil"] = toMultiValue(this, "csv") }
-
http?.apply { localVariableQuery["http"] = toMultiValue(this, "space") }
-
url?.apply { localVariableQuery["url"] = toMultiValue(this, "csv") }
-
context?.apply { localVariableQuery["context"] = toMultiValue(this, "multi") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
@@ -596,34 +524,17 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -631,11 +542,6 @@ private class TestInlineAdditionalPropertiesRequest(val value: Map<kotlin.String
serializer.setMapper(TestInlineAdditionalPropertiesRequest::class, TestInlineAdditionalPropertiesRequest.serializer())
-
-
-
-
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
index 33efbbe086c..f90f98786ef 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
@@ -47,13 +47,10 @@ class FakeClassnameTags123Api @UseExperimental(UnstableDefault::class) construct
suspend fun testClassname(client: Client) : HttpResponse<Client> {
val localVariableBody = client
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PATCH,
@@ -62,20 +59,18 @@ class FakeClassnameTags123Api @UseExperimental(UnstableDefault::class) construct
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
index b0bb39f630d..dd85a10282c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -47,13 +47,10 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun addPet(pet: Pet) : HttpResponse<Unit> {
val localVariableBody = pet
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -62,14 +59,13 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Deletes a pet
@@ -84,12 +80,9 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -98,14 +91,12 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Finds Pets by status
@@ -120,12 +111,9 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
status?.apply { localVariableQuery["status"] = toMultiValue(this, "csv") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -134,13 +122,12 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap<FindPetsByStatusResponse>().map { value.toTypedArray() }
}
-
@Serializable
private class FindPetsByStatusResponse(val value: List<Pet>) {
@Serializer(FindPetsByStatusResponse::class)
@@ -165,12 +152,9 @@ private class FindPetsByStatusResponse(val value: List<Pet>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
tags?.apply { localVariableQuery["tags"] = toMultiValue(this, "csv") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -179,13 +163,12 @@ private class FindPetsByStatusResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap<FindPetsByTagsResponse>().map { value.toTypedArray() }
}
-
@Serializable
private class FindPetsByTagsResponse(val value: List<Pet>) {
@Serializer(FindPetsByTagsResponse::class)
@@ -210,10 +193,8 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -222,14 +203,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Update an existing pet
@@ -240,13 +219,10 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
suspend fun updatePet(pet: Pet) : HttpResponse<Unit> {
val localVariableBody = pet
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
@@ -255,14 +231,13 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Updates a pet in the store with form data
@@ -278,13 +253,11 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
ParametersBuilder().also {
name?.apply { it.append("name", name.toString()) }
status?.apply { it.append("status", status.toString()) }
- }.build()
+ }.build()
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -293,14 +266,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return urlEncodedFormRequest(
+ return urlEncodedFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* uploads an image
@@ -320,10 +291,8 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
}
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -332,14 +301,12 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return multipartFormRequest(
+ return multipartFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* uploads an image (required)
@@ -359,10 +326,8 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
}
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -371,36 +336,20 @@ private class FindPetsByTagsResponse(val value: List<Pet>) {
headers = localVariableHeaders
)
- return multipartFormRequest(
+ return multipartFormRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
-
-
-
serializer.setMapper(FindPetsByStatusResponse::class, FindPetsByStatusResponse.serializer())
-
serializer.setMapper(FindPetsByTagsResponse::class, FindPetsByTagsResponse.serializer())
-
-
-
-
-
-
-
-
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index 5edfea034c6..734883da99d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -49,10 +49,8 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -61,14 +59,12 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Returns pet inventories by status
@@ -82,10 +78,8 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -94,13 +88,12 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap<GetInventoryResponse>().map { value }
}
-
@Serializable
private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
@Serializer(GetInventoryResponse::class)
@@ -125,10 +118,8 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -137,14 +128,12 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Place an order for a pet
@@ -156,13 +145,10 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
suspend fun placeOrder(order: Order) : HttpResponse<Order> {
val localVariableBody = order
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -171,26 +157,19 @@ private class GetInventoryResponse(val value: Map<kotlin.String, kotlin.Int>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
-
-
serializer.setMapper(GetInventoryResponse::class, GetInventoryResponse.serializer())
-
-
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
index 439d09a2b5f..266689874c9 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -46,13 +46,10 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun createUser(user: User) : HttpResponse<Unit> {
val localVariableBody = user
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -61,14 +58,13 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
/**
* Creates list of users with given input array
@@ -79,13 +75,10 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
suspend fun createUsersWithArrayInput(user: kotlin.Array<User>) : HttpResponse<Unit> {
val localVariableBody = CreateUsersWithArrayInputRequest(user.asList())
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -94,7 +87,7 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor(
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
@@ -110,7 +103,6 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
override fun deserialize(decoder: Decoder) = CreateUsersWithArrayInputRequest(serializer.deserialize(decoder))
}
}
-
/**
* Creates list of users with given input array
@@ -121,13 +113,10 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
suspend fun createUsersWithListInput(user: kotlin.Array<User>) : HttpResponse<Unit> {
val localVariableBody = CreateUsersWithListInputRequest(user.asList())
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.POST,
@@ -136,7 +125,7 @@ private class CreateUsersWithArrayInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
@@ -152,7 +141,6 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
override fun deserialize(decoder: Decoder) = CreateUsersWithListInputRequest(serializer.deserialize(decoder))
}
}
-
/**
* Delete user
@@ -166,10 +154,8 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.DELETE,
@@ -178,14 +164,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Get user by user name
@@ -200,10 +184,8 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -212,14 +194,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Logs user into the system
@@ -235,14 +215,10 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
username?.apply { localVariableQuery["username"] = listOf("$username") }
-
password?.apply { localVariableQuery["password"] = listOf("$password") }
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -251,14 +227,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Logs out current logged in user session
@@ -271,10 +245,8 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
io.ktor.client.utils.EmptyContent
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.GET,
@@ -283,14 +255,12 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return request(
+ return request(
localVariableConfig,
localVariableBody
).wrap()
}
-
-
/**
* Updated user
@@ -302,13 +272,10 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
suspend fun updateUser(username: kotlin.String, user: User) : HttpResponse<Unit> {
val localVariableBody = user
-
val localVariableQuery = mutableMapOf<String, List<String>>()
-
val localVariableHeaders = mutableMapOf<String, String>()
-
val localVariableConfig = RequestConfig(
RequestMethod.PUT,
@@ -317,34 +284,21 @@ private class CreateUsersWithListInputRequest(val value: List<User>) {
headers = localVariableHeaders
)
- return jsonRequest(
+ return jsonRequest(
localVariableConfig,
localVariableBody
).wrap()
}
-
companion object {
internal fun setMappers(serializer: KotlinxSerializer) {
-
serializer.setMapper(CreateUsersWithArrayInputRequest::class, CreateUsersWithArrayInputRequest.serializer())
-
serializer.setMapper(CreateUsersWithListInputRequest::class, CreateUsersWithListInputRequest.serializer())
-
-
-
-
-
-
-
-
-
-
}
}
}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index d64bb86cf67..5aaa7a106de 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -25,4 +25,3 @@ data class AdditionalPropertiesClass (
@SerialName(value = "mapOfMapProperty") val mapOfMapProperty: kotlin.collections.Map<kotlin.String, kotlin.collections.Map<kotlin.String, kotlin.String>>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
index cd0ad3923ce..5e9cd111633 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
@@ -25,4 +25,3 @@ data class Animal (
@SerialName(value = "color") val color: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
index 40d7935e64b..805244a3762 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -27,4 +27,3 @@ data class ApiResponse (
@SerialName(value = "message") val message: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 900776f3917..df7774515f4 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -23,4 +23,3 @@ data class ArrayOfArrayOfNumberOnly (
@SerialName(value = "arrayArrayNumber") val arrayArrayNumber: kotlin.Array<kotlin.Array<kotlin.Double>>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index c86e32ea404..36f32d28a2c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -23,4 +23,3 @@ data class ArrayOfNumberOnly (
@SerialName(value = "arrayNumber") val arrayNumber: kotlin.Array<kotlin.Double>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
index be4852526be..6c142356cc7 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -28,4 +28,3 @@ data class ArrayTest (
@SerialName(value = "arrayArrayOfModel") val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
index 615dde676ff..2f28e4dcabb 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -34,4 +34,3 @@ data class Capitalization (
@SerialName(value = "ATT_NAME") val ATT_NAME: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
index 9cd22bae0ed..99b024d1ce1 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
@@ -27,4 +27,3 @@ data class Cat (
@SerialName(value = "color") val color: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
index 741ea5fe78c..d7a72badbcd 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -23,4 +23,3 @@ data class CatAllOf (
@SerialName(value = "declawed") val declawed: kotlin.Boolean? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
index 679dc2ee2e9..da08e8cca65 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
@@ -25,4 +25,3 @@ data class Category (
@SerialName(value = "id") val id: kotlin.Long? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
index 50b08153c2c..dff4f30ec63 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -23,4 +23,3 @@ data class ClassModel (
@SerialName(value = "propertyClass") val propertyClass: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt
index aec9b147f17..30d316bd706 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Client.kt
@@ -23,4 +23,3 @@ data class Client (
@SerialName(value = "client") val client: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
index 1a3daca006c..e7e905cf434 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
@@ -27,4 +27,3 @@ data class Dog (
@SerialName(value = "color") val color: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
index b9061237b07..6e18a5729e2 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -23,4 +23,3 @@ data class DogAllOf (
@SerialName(value = "breed") val breed: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
index 8e8c9d871c1..b3e8f49905f 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -24,8 +24,8 @@ data class EnumArrays (
@SerialName(value = "justSymbol") val justSymbol: EnumArrays.JustSymbol? = null,
@SerialName(value = "arrayEnum") val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
)
-
{
+
/**
*
* Values: greaterThanEqual,dollar
@@ -40,9 +40,7 @@ data class EnumArrays (
object Serializer : CommonEnumSerializer<JustSymbol>("JustSymbol", values(), values().map { it.value }.toTypedArray())
}
-}
-{
/**
*
* Values: fish,crab
@@ -57,6 +55,6 @@ data class EnumArrays (
object Serializer : CommonEnumSerializer<ArrayEnum>("ArrayEnum", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
index 0760f498b14..9490d63cafc 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -40,8 +40,8 @@ data class EnumTest (
@SerialName(value = "outerEnumDefaultValue") val outerEnumDefaultValue: OuterEnumDefaultValue? = null,
@SerialName(value = "outerEnumIntegerDefaultValue") val outerEnumIntegerDefaultValue: OuterEnumIntegerDefaultValue? = null
)
-
{
+
/**
*
* Values: uPPER,lower,eMPTY
@@ -58,9 +58,7 @@ data class EnumTest (
object Serializer : CommonEnumSerializer<EnumString>("EnumString", values(), values().map { it.value }.toTypedArray())
}
-}
-{
/**
*
* Values: uPPER,lower,eMPTY
@@ -77,9 +75,7 @@ data class EnumTest (
object Serializer : CommonEnumSerializer<EnumStringRequired>("EnumStringRequired", values(), values().map { it.value }.toTypedArray())
}
-}
-{
/**
*
* Values: _1,minus1
@@ -94,9 +90,7 @@ data class EnumTest (
object Serializer : CommonEnumSerializer<EnumInteger>("EnumInteger", values(), values().map { it.value }.toTypedArray())
}
-}
-{
/**
*
* Values: _1period1,minus1Period2
@@ -111,6 +105,6 @@ data class EnumTest (
object Serializer : CommonEnumSerializer<EnumNumber>("EnumNumber", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index f735a16ff67..3ec73e7f41b 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -21,8 +21,7 @@ import kotlinx.serialization.internal.CommonEnumSerializer
*/
@Serializable
data class FileSchemaTestClass (
- @SerialName(value = "file") val file: java.io.File? = null,
- @SerialName(value = "files") val files: kotlin.Array<java.io.File>? = null
+ @SerialName(value = "file") val file: io.ktor.client.request.forms.InputProvider? = null,
+ @SerialName(value = "files") val files: kotlin.Array<io.ktor.client.request.forms.InputProvider>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
index c80d542c9ee..f208e3add1d 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
@@ -23,4 +23,3 @@ data class Foo (
@SerialName(value = "bar") val bar: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
index 688c8fd9a11..8f1d98714aa 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -46,11 +46,10 @@ data class FormatTest (
@SerialName(value = "string") val string: kotlin.String? = null,
@SerialName(value = "binary") val binary: io.ktor.client.request.forms.InputProvider? = null,
@SerialName(value = "dateTime") val dateTime: kotlin.String? = null,
- @SerialName(value = "uuid") val uuid: java.util.UUID? = null,
+ @SerialName(value = "uuid") val uuid: kotlin.String? = null,
/* A string that is a 10 digit number. Can have leading zeros. */
@SerialName(value = "patternWithDigits") val patternWithDigits: kotlin.String? = null,
/* A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01. */
@SerialName(value = "patternWithDigitsAndDelimiter") val patternWithDigitsAndDelimiter: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index 481b222ed96..617c8a98b84 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -25,4 +25,3 @@ data class HasOnlyReadOnly (
@SerialName(value = "foo") val foo: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 2b83b05c136..9b9298c87a3 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -23,4 +23,3 @@ data class HealthCheckResult (
@SerialName(value = "nullableMessage") val nullableMessage: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
index f0b61ce6f35..787f859549f 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -27,4 +27,3 @@ data class InlineObject (
@SerialName(value = "status") val status: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
index 144ac2e51ec..b56396d37e5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -27,4 +27,3 @@ data class InlineObject1 (
@SerialName(value = "file") val file: io.ktor.client.request.forms.InputProvider? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
index 4a0d1ab7a23..887c7456ee5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -26,8 +26,8 @@ data class InlineObject2 (
/* Form parameter enum test (string) */
@SerialName(value = "enumFormString") val enumFormString: InlineObject2.EnumFormString? = null
)
-
{
+
/**
* Form parameter enum test (string array)
* Values: greaterThan,dollar
@@ -42,9 +42,7 @@ data class InlineObject2 (
object Serializer : CommonEnumSerializer<EnumFormStringArray>("EnumFormStringArray", values(), values().map { it.value }.toTypedArray())
}
-}
-{
/**
* Form parameter enum test (string)
* Values: abc,minusEfg,leftParenthesisXyzRightParenthesis
@@ -61,6 +59,6 @@ data class InlineObject2 (
object Serializer : CommonEnumSerializer<EnumFormString>("EnumFormString", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
index feb084ffeba..a67b8dc50c0 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -63,4 +63,3 @@ data class InlineObject3 (
@SerialName(value = "callback") val callback: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
index a696b8c90e3..4a1f2f2ecc5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -27,4 +27,3 @@ data class InlineObject4 (
@SerialName(value = "param2") @Required val param2: kotlin.String
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
index 146ab1a8879..238d357f26a 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -27,4 +27,3 @@ data class InlineObject5 (
@SerialName(value = "additionalMetadata") val additionalMetadata: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index fd5b6600278..42564057946 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -24,4 +24,3 @@ data class InlineResponseDefault (
@SerialName(value = "string") val string: Foo? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt
index d0d3e59f102..915b5d25acb 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/List.kt
@@ -23,4 +23,3 @@ data class List (
@SerialName(value = "`123minusList`") val ``123minusList``: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
index ab3bc869a6d..f66127a71db 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
@@ -28,8 +28,8 @@ data class MapTest (
@SerialName(value = "directMap") val directMap: kotlin.collections.Map<kotlin.String, kotlin.Boolean>? = null,
@SerialName(value = "indirectMap") val indirectMap: kotlin.collections.Map<kotlin.String, kotlin.Boolean>? = null
)
-
{
+
/**
*
* Values: uPPER,lower
@@ -44,6 +44,6 @@ data class MapTest (
object Serializer : CommonEnumSerializer<MapOfEnumString>("MapOfEnumString", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index 022359bc92a..73b632b52a6 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -23,9 +23,8 @@ import kotlinx.serialization.internal.CommonEnumSerializer
*/
@Serializable
data class MixedPropertiesAndAdditionalPropertiesClass (
- @SerialName(value = "uuid") val uuid: java.util.UUID? = null,
+ @SerialName(value = "uuid") val uuid: kotlin.String? = null,
@SerialName(value = "dateTime") val dateTime: kotlin.String? = null,
@SerialName(value = "map") val map: kotlin.collections.Map<kotlin.String, Animal>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
index 9acea028946..235b9ddfa15 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -25,4 +25,3 @@ data class Model200Response (
@SerialName(value = "propertyClass") val propertyClass: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt
index e4fc149660a..ff47fb3d80b 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Name.kt
@@ -29,4 +29,3 @@ data class Name (
@SerialName(value = "`123number`") val ``123number``: kotlin.Int? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
index cc0b5d3599f..35c112aad32 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -45,4 +45,3 @@ data class NullableClass (
@SerialName(value = "objectItemsNullable") val objectItemsNullable: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
index cb3d58233a5..2fea0a41fae 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -23,4 +23,3 @@ data class NumberOnly (
@SerialName(value = "justNumber") val justNumber: kotlin.Double? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
index a3f24b72035..77175821789 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
@@ -33,8 +33,8 @@ data class Order (
@SerialName(value = "status") val status: Order.Status? = null,
@SerialName(value = "complete") val complete: kotlin.Boolean? = null
)
-
{
+
/**
* Order Status
* Values: placed,approved,delivered
@@ -51,6 +51,6 @@ data class Order (
object Serializer : CommonEnumSerializer<Status>("Status", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
index c4430f07e08..ddd95c1837c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -27,4 +27,3 @@ data class OuterComposite (
@SerialName(value = "myBoolean") val myBoolean: kotlin.Boolean? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
index 84c0f8daf9d..5dc530bb7c4 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
@@ -35,8 +35,8 @@ data class Pet (
/* pet status in the store */
@SerialName(value = "status") val status: Pet.Status? = null
)
-
{
+
/**
* pet status in the store
* Values: available,pending,sold
@@ -53,6 +53,6 @@ data class Pet (
object Serializer : CommonEnumSerializer<Status>("Status", values(), values().map { it.value }.toTypedArray())
}
-}
+}
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 9adbc159af1..4d99ea7a9a2 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -25,4 +25,3 @@ data class ReadOnlyFirst (
@SerialName(value = "baz") val baz: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt
index 1ab847c2a16..f1b7a03573c 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Return.kt
@@ -23,4 +23,3 @@ data class Return (
@SerialName(value = "`return`") val ``return``: kotlin.Int? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
index 515ceca44ae..185cc542abf 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -23,4 +23,3 @@ data class SpecialModelname (
@SerialName(value = "dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket") val dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket: kotlin.Long? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
index 8249ebd41bb..0b3f202ad51 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
@@ -25,4 +25,3 @@ data class Tag (
@SerialName(value = "name") val name: kotlin.String? = null
)
-
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
index fb882946719..47ad0a9f282 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
@@ -38,4 +38,3 @@ data class User (
@SerialName(value = "userStatus") val userStatus: kotlin.Int? = null
)
-
--
GitLab