Merge remote-tracking branch 'origin/master' into 6.0.x

samples/client/petstore/kotlin-json-request-string/build.gradle

@@ -18,6 +18,7 @@ buildscript {
 }
 
 apply plugin: 'kotlin'
+apply plugin: 'kotlin-parcelize'
 
 repositories {
     maven { url "https://repo1.maven.org/maven2" }

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt

@@ -13,6 +13,8 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * Describes the result of uploading an image resource
@@ -20,6 +22,7 @@ import com.squareup.moshi.Json
  * @param type 
  * @param message 
  */
+@Parcelize
 
 data class ApiResponse (
     @Json(name = "code")
@@ -28,5 +31,5 @@ data class ApiResponse (
     val type: kotlin.String? = null,
     @Json(name = "message")
     val message: kotlin.String? = null
-)
+) : Parcelable
 

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt

@@ -13,17 +13,20 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * A category for a pet
  * @param id 
  * @param name 
  */
+@Parcelize
 
 data class Category (
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "name")
     val name: kotlin.String? = null
-)
+) : Parcelable
 

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt

@@ -13,6 +13,8 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * An order for a pets from the pet store
@@ -23,6 +25,7 @@ import com.squareup.moshi.Json
  * @param status Order Status
  * @param complete 
  */
+@Parcelize
 
 data class Order (
     @Json(name = "id")
@@ -38,7 +41,7 @@ data class Order (
     val status: Order.Status? = null,
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
-) {
+) : Parcelable {
 
     /**
      * Order Status

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt

@@ -15,6 +15,8 @@ import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * A pet for sale in the pet store
@@ -25,6 +27,7 @@ import com.squareup.moshi.Json
  * @param tags 
  * @param status pet status in the store
  */
+@Parcelize
 
 data class Pet (
     @Json(name = "name")
@@ -40,7 +43,7 @@ data class Pet (
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
-) {
+) : Parcelable {
 
     /**
      * pet status in the store

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt

@@ -13,17 +13,20 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * A tag for a pet
  * @param id 
  * @param name 
  */
+@Parcelize
 
 data class Tag (
     @Json(name = "id")
     val id: kotlin.Long? = null,
     @Json(name = "name")
     val name: kotlin.String? = null
-)
+) : Parcelable
 

samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt

@@ -13,6 +13,8 @@ package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 /**
  * A User who is purchasing from the pet store
@@ -25,6 +27,7 @@ import com.squareup.moshi.Json
  * @param phone 
  * @param userStatus User Status
  */
+@Parcelize
 
 data class User (
     @Json(name = "id")
@@ -44,5 +47,5 @@ data class User (
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
-)
+) : Parcelable