Skip to content

[Java][Native] Fix the Content-Type and Accept headers that were forced to application/json #11303

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

Merged
wing328 merged 2 commits into from
Jan 15, 2022
Merged

[Java][Native] Fix the Content-Type and Accept headers that were forced to application/json #11303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c2347c
[Java][Native] Fix the Content-Type and Accept headers that were forc…
Paul-Etienne Jan 13, 2022
c5807e8
Update the generated samples after fixing issue no. 6779
Paul-Etienne Jan 13, 2022
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
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,9 @@ public class {{classname}} {
}
{{/headerParams}}
{{#bodyParam}}
localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Content-Type", "{{#hasConsumes}}{{#consumes}}{{#-first}}{{mediaType}}{{/-first}}{{/consumes}}{{/hasConsumes}}{{#hasConsumes}}{{^consumes}}application/json{{/consumes}}{{/hasConsumes}}{{^hasConsumes}}application/json{{/hasConsumes}}");
{{/bodyParam}}
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "{{#hasProduces}}{{#produces}}{{mediaType}}{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}}{{#hasProduces}}{{^produces}}application/json{{/produces}}{{/hasProduces}}{{^hasProduces}}application/json{{/hasProduces}}");

{{#bodyParam}}
try {
Expand Down
10 changes: 5 additions & 5 deletions .../client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private HttpRequest.Builder createXmlItemRequestBuilder(XmlItem xmlItem) throws

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Content-Type", "application/xml");
localVarRequestBuilder.header("Accept", "application/json");

try {
Expand Down Expand Up @@ -241,7 +241,7 @@ private HttpRequest.Builder fakeOuterBooleanSerializeRequestBuilder(Boolean body
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down Expand Up @@ -333,7 +333,7 @@ private HttpRequest.Builder fakeOuterCompositeSerializeRequestBuilder(OuterCompo
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down Expand Up @@ -425,7 +425,7 @@ private HttpRequest.Builder fakeOuterNumberSerializeRequestBuilder(BigDecimal bo
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down Expand Up @@ -517,7 +517,7 @@ private HttpRequest.Builder fakeOuterStringSerializeRequestBuilder(String body)
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down
6 changes: 3 additions & 3 deletions ...s/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ private HttpRequest.Builder findPetsByStatusRequestBuilder(List<String> status)
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
}

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -433,7 +433,7 @@ private HttpRequest.Builder findPetsByTagsRequestBuilder(Set<String> tags) throw
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
}

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -524,7 +524,7 @@ private HttpRequest.Builder getPetByIdRequestBuilder(Long petId) throws ApiExcep

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ private HttpRequest.Builder getOrderByIdRequestBuilder(Long orderId) throws ApiE

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -407,7 +407,7 @@ private HttpRequest.Builder placeOrderRequestBuilder(Order body) throws ApiExcep
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down
4 changes: 2 additions & 2 deletions .../client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ private HttpRequest.Builder getUserByNameRequestBuilder(String username) throws

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -585,7 +585,7 @@ private HttpRequest.Builder loginUserRequestBuilder(String username, String pass
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
}

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private HttpRequest.Builder createXmlItemRequestBuilder(XmlItem xmlItem) throws

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Content-Type", "application/xml");
localVarRequestBuilder.header("Accept", "application/json");

try {
Expand Down Expand Up @@ -221,7 +221,7 @@ private HttpRequest.Builder fakeOuterBooleanSerializeRequestBuilder(Boolean body
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down Expand Up @@ -295,7 +295,7 @@ private HttpRequest.Builder fakeOuterCompositeSerializeRequestBuilder(OuterCompo
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down Expand Up @@ -369,7 +369,7 @@ private HttpRequest.Builder fakeOuterNumberSerializeRequestBuilder(BigDecimal bo
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down Expand Up @@ -443,7 +443,7 @@ private HttpRequest.Builder fakeOuterStringSerializeRequestBuilder(String body)
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "*/*");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ private HttpRequest.Builder findPetsByStatusRequestBuilder(List<String> status)
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
}

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -394,7 +394,7 @@ private HttpRequest.Builder findPetsByTagsRequestBuilder(Set<String> tags) throw
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
}

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -467,7 +467,7 @@ private HttpRequest.Builder getPetByIdRequestBuilder(Long petId) throws ApiExcep

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private HttpRequest.Builder getOrderByIdRequestBuilder(Long orderId) throws ApiE

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -351,7 +351,7 @@ private HttpRequest.Builder placeOrderRequestBuilder(Order body) throws ApiExcep
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ private HttpRequest.Builder getUserByNameRequestBuilder(String username) throws

localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down Expand Up @@ -544,7 +544,7 @@ private HttpRequest.Builder loginUserRequestBuilder(String username, String pass
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
}

localVarRequestBuilder.header("Accept", "application/json");
localVarRequestBuilder.header("Accept", "application/xml, application/json");

localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) {
Expand Down