From c08b7e9d6aadf0e20b458a9ba5c7accd9e040f86 Mon Sep 17 00:00:00 2001
From: Shajahan Palayil <shajahan.pts@gmail.com>
Date: Thu, 31 Mar 2022 17:41:45 +0200
Subject: [PATCH] Fix: Send content-type header even when payload does not
 exist

---
 modules/swagger-codegen-cli/pom.xml                    |  2 +-
 modules/swagger-codegen-maven-plugin/pom.xml           |  2 +-
 modules/swagger-codegen/pom.xml                        |  2 +-
 .../src/main/resources/scala/apiInvoker.mustache       | 10 +++++-----
 modules/swagger-generator/pom.xml                      |  2 +-
 pom.xml                                                |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index 8cc978d408a..78502158647 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.10-elastic-cloud</version>
+        <version>2.2.11-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml
index 6c6d4b27ccf..1a9e9e5b1ff 100644
--- a/modules/swagger-codegen-maven-plugin/pom.xml
+++ b/modules/swagger-codegen-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.10-elastic-cloud</version>
+        <version>2.2.11-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 93fd1f26542..ab0282de7fd 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.10-elastic-cloud</version>
+        <version>2.2.11-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
index 1eda6ad58c3..259c1ca751e 100644
--- a/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache
@@ -173,13 +173,13 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
           builder.post(classOf[ClientResponse], form)
         }
         else {
-          if(body == null) builder.post(classOf[ClientResponse], serialize(body))
+          if(body == null) builder.`type`(contentType).post(classOf[ClientResponse], serialize(body))
           else builder.`type`(contentType).post(classOf[ClientResponse], serialize(body))
         }
       }
       case "PUT" => {
-        if(formData != null) builder.post(classOf[ClientResponse], formData)
-        else if(body == null) builder.put(classOf[ClientResponse], null)
+        if(formData != null) builder.`type`(contentType).post(classOf[ClientResponse], formData)
+        else if(body == null) builder.`type`(contentType).put(classOf[ClientResponse], null)
         else builder.`type`(contentType).put(classOf[ClientResponse], serialize(body))
       }
       case "DELETE" => {
@@ -187,8 +187,8 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
         else builder.`type`(contentType).delete(classOf[ClientResponse], serialize(body))
       }
       case "PATCH" => {
-        if(formData != null) builder.header("X-HTTP-Method-Override", "PATCH").post(classOf[ClientResponse], formData)
-        else if(body == null) builder.header("X-HTTP-Method-Override", "PATCH").post(classOf[ClientResponse], null)
+        if(formData != null) builder.header("X-HTTP-Method-Override", "PATCH").`type`(contentType).post(classOf[ClientResponse], formData)
+        else if(body == null) builder.header("X-HTTP-Method-Override", "PATCH").`type`(contentType).post(classOf[ClientResponse], null)
         else builder.header("X-HTTP-Method-Override", "PATCH").`type`(contentType).post(classOf[ClientResponse], serialize(body))
       }
       case _ => null
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index dada38402ae..bbd65483cca 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.10-elastic-cloud</version>
+        <version>2.2.11-elastic-cloud</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>
diff --git a/pom.xml b/pom.xml
index b8022d78421..a2611909e69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>2.2.10-elastic-cloud</version>
+    <version>2.2.11-elastic-cloud</version>
     <url>https://github.com/elastic/swagger-codegen</url>
     <scm>
         <connection>scm:git:git@github.com:elastic/swagger-codegen.git</connection>