From eb60aabd0bb7d5ce00c4ad4916ea3e9eeb0ab648 Mon Sep 17 00:00:00 2001
From: Davide Maestroni <davide.maestroni@gmail.com>
Date: Tue, 24 Sep 2019 15:20:42 +0200
Subject: [PATCH 1/3] fixed Feign template

---
 .../main/resources/Java/libraries/feign/EncodingUtils.mustache  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/EncodingUtils.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/EncodingUtils.mustache
index 6bf2a0e4bfb..705eb6aa9d3 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/EncodingUtils.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/EncodingUtils.mustache
@@ -77,7 +77,7 @@ public final class EncodingUtils {
       return null;
     }
     try {
-      return URLEncoder.encode(parameter.toString(), "UTF-8");
+      return URLEncoder.encode(parameter.toString(), "UTF-8").replaceAll("\\+", "%20");
     } catch (UnsupportedEncodingException e) {
       // Should never happen, UTF-8 is always supported
       throw new RuntimeException(e);
-- 
GitLab


From 227244531894e3b323a2b81eedd9f2cdaa0ca8d8 Mon Sep 17 00:00:00 2001
From: Davide Maestroni <davide.maestroni@gmail.com>
Date: Tue, 24 Sep 2019 15:24:29 +0200
Subject: [PATCH 2/3] regenerated Feign example

---
 .../src/main/java/org/openapitools/client/EncodingUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java
index 1b061a1972f..c5a76a97857 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/EncodingUtils.java
@@ -77,7 +77,7 @@ public final class EncodingUtils {
       return null;
     }
     try {
-      return URLEncoder.encode(parameter.toString(), "UTF-8");
+      return URLEncoder.encode(parameter.toString(), "UTF-8").replaceAll("\\+", "%20");
     } catch (UnsupportedEncodingException e) {
       // Should never happen, UTF-8 is always supported
       throw new RuntimeException(e);
-- 
GitLab


From 70c7580992fa90640600e9abc831acf9a91cbc8a Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 25 Sep 2019 18:17:20 +0800
Subject: [PATCH 3/3] update java feign petstore sample

---
 .../src/main/java/org/openapitools/client/EncodingUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java
index 1b061a1972f..c5a76a97857 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/EncodingUtils.java
@@ -77,7 +77,7 @@ public final class EncodingUtils {
       return null;
     }
     try {
-      return URLEncoder.encode(parameter.toString(), "UTF-8");
+      return URLEncoder.encode(parameter.toString(), "UTF-8").replaceAll("\\+", "%20");
     } catch (UnsupportedEncodingException e) {
       // Should never happen, UTF-8 is always supported
       throw new RuntimeException(e);
-- 
GitLab