From afc1cb1b4a7f2d8b21239d621735b163e237b9a2 Mon Sep 17 00:00:00 2001
From: Adam Gray <adam.gray@moneyandco.com>
Date: Wed, 16 Sep 2020 13:46:22 +0100
Subject: [PATCH 1/2] #7431 fix sttp enum generation

---
 .../src/main/resources/scala-sttp/model.mustache   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
index f2cf27962348..0a77853646e3 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
@@ -15,6 +15,7 @@ import {{import}}
 {{{description}}}
 {{/javadocRenderer}}
 {{/description}}
+{{^isEnum}}
 case class {{classname}}(
   {{#vars}}
   {{#description}}
@@ -23,6 +24,19 @@ case class {{classname}}(
   {{{name}}}: {{^required}}Option[{{/required}}{{^isEnum}}{{dataType}}{{/isEnum}}{{#isEnum}}{{classname}}Enums.{{datatypeWithEnum}}{{/isEnum}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
   {{/vars}}
 )
+{{/isEnum}}
+
+{{#isEnum}}
+
+object {{classname}} extends Enumeration {
+    type {{classname}} = {{classname}}.Value
+{{#allowableValues}}
+    {{#values}}
+    val {{#fnEnumEntry}}{{.}}{{/fnEnumEntry}} = Value("{{.}}")
+    {{/values}}
+{{/allowableValues}}
+}
+{{/isEnum}}
 
 {{#hasEnums}}
 object {{classname}}Enums {

From 29cf971792c6b3685bef5c7851e87a4b63c2dd74 Mon Sep 17 00:00:00 2001
From: Adam Gray <adam.gray@moneyandco.com>
Date: Wed, 16 Sep 2020 13:54:37 +0100
Subject: [PATCH 2/2] avoid unnecessary sample changes

---
 .../src/main/resources/scala-sttp/model.mustache                | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
index 0a77853646e3..5a5237ee3021 100644
--- a/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-sttp/model.mustache
@@ -27,7 +27,6 @@ case class {{classname}}(
 {{/isEnum}}
 
 {{#isEnum}}
-
 object {{classname}} extends Enumeration {
     type {{classname}} = {{classname}}.Value
 {{#allowableValues}}
@@ -37,7 +36,6 @@ object {{classname}} extends Enumeration {
 {{/allowableValues}}
 }
 {{/isEnum}}
-
 {{#hasEnums}}
 object {{classname}}Enums {