From fd8962529cf242fba093a16e6e9c00e2eb24dbe5 Mon Sep 17 00:00:00 2001
From: Andrew Emery <emery.andrew@gmail.com>
Date: Fri, 20 Sep 2019 10:30:36 +1000
Subject: [PATCH 1/2] Fixes Kotlin client definitions with multiple enums

https://github.com/OpenAPITools/openapi-generator/issues/3917
---
 .../src/main/resources/kotlin-client/data_class.mustache    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index a9f020ff4003..179d3a9be0b7 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -25,8 +25,9 @@ data class {{classname}} (
 {{/hasOptional}}{{/hasRequired}}{{#optionalVars}}{{>data_class_opt_var}}{{^-last}},
 {{/-last}}{{/optionalVars}}
 ){{#parcelizeModels}} : Parcelable{{/parcelizeModels}}
-{{#hasEnums}}{{#vars}}{{#isEnum}}
+{{#hasEnums}}
 {
+{{#vars}}{{#isEnum}}
     /**
     * {{{description}}}
     * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
@@ -41,5 +42,6 @@ data class {{classname}} (
         {{/gson}}
     {{/enumVars}}{{/allowableValues}}
     }
+{{/isEnum}}{{/vars}}
 }
-{{/isEnum}}{{/vars}}{{/hasEnums}}
+{{/hasEnums}}

From 8d7ffd02530d30a4b87f10cc51a022b8866b8b24 Mon Sep 17 00:00:00 2001
From: Andrew Emery <emery.andrew@gmail.com>
Date: Sat, 21 Sep 2019 09:40:50 +1000
Subject: [PATCH 2/2] Updates Kotlin samples

---
 .../main/kotlin/org/openapitools/client/models/ApiResponse.kt | 1 -
 .../main/kotlin/org/openapitools/client/models/Category.kt    | 1 -
 .../src/main/kotlin/org/openapitools/client/models/Order.kt   | 4 ++--
 .../src/main/kotlin/org/openapitools/client/models/Pet.kt     | 4 ++--
 .../src/main/kotlin/org/openapitools/client/models/Tag.kt     | 1 -
 .../src/main/kotlin/org/openapitools/client/models/User.kt    | 1 -
 .../main/kotlin/org/openapitools/client/models/ApiResponse.kt | 1 -
 .../main/kotlin/org/openapitools/client/models/Category.kt    | 1 -
 .../src/main/kotlin/org/openapitools/client/models/Order.kt   | 4 ++--
 .../src/main/kotlin/org/openapitools/client/models/Pet.kt     | 4 ++--
 .../src/main/kotlin/org/openapitools/client/models/Tag.kt     | 1 -
 .../src/main/kotlin/org/openapitools/client/models/User.kt    | 1 -
 .../main/kotlin/org/openapitools/client/models/ApiResponse.kt | 1 -
 .../main/kotlin/org/openapitools/client/models/Category.kt    | 1 -
 .../src/main/kotlin/org/openapitools/client/models/Order.kt   | 4 ++--
 .../src/main/kotlin/org/openapitools/client/models/Pet.kt     | 4 ++--
 .../src/main/kotlin/org/openapitools/client/models/Tag.kt     | 1 -
 .../src/main/kotlin/org/openapitools/client/models/User.kt    | 1 -
 18 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index b8b15769853e..9895a7af8423 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -28,4 +28,3 @@ data class ApiResponse (
     val message: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index 2cb38b9fba51..c60579922ef3 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -25,4 +25,3 @@ data class Category (
     val name: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index d979b8b691a4..fc8eeefcc2ab 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -37,8 +37,8 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 )
-
 {
+
     /**
     * Order Status
     * Values: placed,approved,delivered
@@ -52,6 +52,6 @@ data class Order (
         @Json(name = "delivered") delivered("delivered");
     
     }
-}
 
+}
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 9ee00ac631e4..602fc870dbe8 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -39,8 +39,8 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 )
-
 {
+
     /**
     * pet status in the store
     * Values: available,pending,sold
@@ -54,6 +54,6 @@ data class Pet (
         @Json(name = "sold") sold("sold");
     
     }
-}
 
+}
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 475acce8a0a9..b1e5a7bda1e7 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -25,4 +25,3 @@ data class Tag (
     val name: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
index 0cc681309b45..2c3f77dfe733 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -44,4 +44,3 @@ data class User (
     val userStatus: kotlin.Int? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index b8b15769853e..9895a7af8423 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -28,4 +28,3 @@ data class ApiResponse (
     val message: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
index 2cb38b9fba51..c60579922ef3 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -25,4 +25,3 @@ data class Category (
     val name: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
index 6f1657150d81..2c0976950cb2 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -37,8 +37,8 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 )
-
 {
+
     /**
     * Order Status
     * Values: placed,approved,delivered
@@ -52,6 +52,6 @@ data class Order (
         @Json(name = "delivered") delivered("delivered");
     
     }
-}
 
+}
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 9ee00ac631e4..602fc870dbe8 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -39,8 +39,8 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 )
-
 {
+
     /**
     * pet status in the store
     * Values: available,pending,sold
@@ -54,6 +54,6 @@ data class Pet (
         @Json(name = "sold") sold("sold");
     
     }
-}
 
+}
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 475acce8a0a9..b1e5a7bda1e7 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -25,4 +25,3 @@ data class Tag (
     val name: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
index 0cc681309b45..2c3f77dfe733 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -44,4 +44,3 @@ data class User (
     val userStatus: kotlin.Int? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index b8b15769853e..9895a7af8423 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -28,4 +28,3 @@ data class ApiResponse (
     val message: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index 2cb38b9fba51..c60579922ef3 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -25,4 +25,3 @@ data class Category (
     val name: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index e77abd68d517..5b947f2a69d2 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -37,8 +37,8 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 )
-
 {
+
     /**
     * Order Status
     * Values: placed,approved,delivered
@@ -52,6 +52,6 @@ data class Order (
         @Json(name = "delivered") delivered("delivered");
     
     }
-}
 
+}
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 9ee00ac631e4..602fc870dbe8 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -39,8 +39,8 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 )
-
 {
+
     /**
     * pet status in the store
     * Values: available,pending,sold
@@ -54,6 +54,6 @@ data class Pet (
         @Json(name = "sold") sold("sold");
     
     }
-}
 
+}
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 475acce8a0a9..b1e5a7bda1e7 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -25,4 +25,3 @@ data class Tag (
     val name: kotlin.String? = null
 )
 
-
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index 0cc681309b45..2c3f77dfe733 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -44,4 +44,3 @@ data class User (
     val userStatus: kotlin.Int? = null
 )
 
-