From 046b73044646e72846f19d87cd366367576513d0 Mon Sep 17 00:00:00 2001
From: Kyle Cacciatore <kcacciatore@hotmail.com>
Date: Tue, 16 May 2017 09:07:21 -0400
Subject: [PATCH] Upgraded connexion to 1.1.9 - required change to encoder as
 connexion is isolating implementation specific code (#5645)

---
 .../src/main/resources/flaskConnexion/encoder.mustache     | 7 +++----
 .../main/resources/flaskConnexion/requirements.mustache    | 2 +-
 samples/server/petstore/flaskConnexion/requirements.txt    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/encoder.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/encoder.mustache
index 2f2c5416708..996d74f21e7 100644
--- a/modules/swagger-codegen/src/main/resources/flaskConnexion/encoder.mustache
+++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/encoder.mustache
@@ -1,9 +1,8 @@
-from connexion.decorators import produces
 from six import iteritems
 from {{modelPackage}}.base_model_ import Model
+from connexion.apps.flask_app import FlaskJSONEncoder
 
-
-class JSONEncoder(produces.JSONEncoder):
+class JSONEncoder(FlaskJSONEncoder):
     include_nulls = False
 
     def default(self, o):
@@ -16,4 +15,4 @@ class JSONEncoder(produces.JSONEncoder):
                 attr = o.attribute_map[attr]
                 dikt[attr] = value
             return dikt
-        return produces.JSONEncoder.default(self, o)
\ No newline at end of file
+        return FlaskJSONEncoder.default(self, o)
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/flaskConnexion/requirements.mustache b/modules/swagger-codegen/src/main/resources/flaskConnexion/requirements.mustache
index b36f4a65b57..30ec45ba153 100644
--- a/modules/swagger-codegen/src/main/resources/flaskConnexion/requirements.mustache
+++ b/modules/swagger-codegen/src/main/resources/flaskConnexion/requirements.mustache
@@ -1,4 +1,4 @@
-connexion == 1.0.129
+connexion == 1.1.9
 python_dateutil == 2.6.0
 {{#supportPython2}}
 typing == 3.5.2.2
diff --git a/samples/server/petstore/flaskConnexion/requirements.txt b/samples/server/petstore/flaskConnexion/requirements.txt
index 995dc64d655..80359d3357e 100644
--- a/samples/server/petstore/flaskConnexion/requirements.txt
+++ b/samples/server/petstore/flaskConnexion/requirements.txt
@@ -1,3 +1,3 @@
-connexion == 1.0.129
+connexion == 1.1.9
 python_dateutil == 2.6.0
 setuptools >= 21.0.0