Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java Jersey] Update ApiClient.mustache Jersey doesn't allow entities in method DELETE #19530

Merged
merged 25 commits into from
Sep 16, 2024
Merged

[Java Jersey] Update ApiClient.mustache Jersey doesn't allow entities in method DELETE #19530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
65ade98
Update ApiClient.mustache
eric-rolli Sep 4, 2024
fb5c63e
Update ApiClient.mustache
eric-rolli Sep 5, 2024
19c4bca
Update ApiClient.java
eric-rolli Sep 5, 2024
39ac44b
Update ApiClient.java
eric-rolli Sep 5, 2024
213d962
Update ApiClient.java
eric-rolli Sep 5, 2024
54cce49
Update ApiClient.java
eric-rolli Sep 5, 2024
1f51703
Update ApiClient.java
eric-rolli Sep 5, 2024
44c2c2c
Update ApiClient.java
eric-rolli Sep 5, 2024
7dad680
Update ApiClient.java
eric-rolli Sep 5, 2024
656ad62
Update ApiClient.java
eric-rolli Sep 5, 2024
b4ffd7f
Update ApiClient.java
eric-rolli Sep 5, 2024
3a1bdc0
Update ApiClient.java
eric-rolli Sep 5, 2024
86a6b0e
Merge branch 'OpenAPITools:master' into eric-rolli-patch-1
eric-rolli Sep 13, 2024
7f6001b
jersey ApiClient.mustache invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
ce54ae1
jersey ApiClient.mustache invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
afe603d
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
22d73e8
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
80a92f9
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
edc1e2a
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
4835223
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
73338c5
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
e89eb3a
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
09cbef0
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
a9897c1
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
627856e
jersey ApiClient invoke DELETE without entity if empty
eric-rolli Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...ient/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...ore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...s/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...ava/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion ...3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading