[Java Jersey] Update ApiClient.mustache Jersey doesn't allow entities…

… in method DELETE (OpenAPITools#19530) * Update ApiClient.mustache * Update ApiClient.mustache Jersey doesn't allow request entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * Update ApiClient.java Jersey doesn't allow entities in method DELETE * jersey ApiClient.mustache invoke DELETE without entity if empty * jersey ApiClient.mustache invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty * jersey ApiClient invoke DELETE without entity if empty
gcatanese · Sep 16, 2024 · bbafeae · bbafeae
1 parent cf9de0b
commit bbafeae
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 12 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -1356,7 +1356,11 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
@@ -1356,7 +1356,11 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...ient/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java b/...ient/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java
@@ -1112,7 +1112,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java b/...others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java
@@ -1112,7 +1112,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...ore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java b/...ore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
@@ -1269,7 +1269,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -1269,7 +1269,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java
@@ -1351,7 +1351,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...s/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/...s/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -1161,7 +1161,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...ava/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java b/...ava/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
@@ -1112,7 +1112,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/...petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
@@ -1253,7 +1253,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/...petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -1253,7 +1253,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {

diff --git a/...3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/...3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -1351,7 +1351,11 @@ private Response sendRequest(String method, Invocation.Builder invocationBuilder
     } else if ("PUT".equals(method)) {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
+      if ("".equals(entity.getEntity())) {
+        response = invocationBuilder.method("DELETE");
+      } else {
+        response = invocationBuilder.method("DELETE", entity);
+      }
     } else if ("PATCH".equals(method)) {
       response = invocationBuilder.method("PATCH", entity);
     } else {