loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

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

Browse Source 
* [Java][Native] Fix the Content-Type and Accept headers that were forced to application/json

* Update the generated samples after fixing issue no. 6779
This commit is contained in:
Paul-Etienne François 2022-01-15 17:51:40 +01:00 committed by GitHub
parent 1b6d0f8746
commit 249968e397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache vendored
View File

@ -341,9 +341,9 @@ public class {{classname}} {
} }
{{/headerParams}} {{/headerParams}}
{{#bodyParam}} {{#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}} {{/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}} {{#bodyParam}}
try { try {

10
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -148,7 +148,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/xml");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/json");
try { try {
@ -241,7 +241,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
@ -333,7 +333,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
@ -425,7 +425,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
@ -517,7 +517,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -330,7 +330,7 @@ public class PetApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
} }
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -433,7 +433,7 @@ public class PetApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
} }
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -524,7 +524,7 @@ public class PetApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -316,7 +316,7 @@ public class StoreApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -407,7 +407,7 @@ public class StoreApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -479,7 +479,7 @@ public class UserApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -585,7 +585,7 @@ public class UserApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
} }
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {

10
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -146,7 +146,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/xml");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/json");
try { try {
@ -221,7 +221,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
@ -295,7 +295,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
@ -369,7 +369,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
@ -443,7 +443,7 @@ public class FakeApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "*/*");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);

6
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -309,7 +309,7 @@ public class PetApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
} }
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -394,7 +394,7 @@ public class PetApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
} }
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -467,7 +467,7 @@ public class PetApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {

4
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -278,7 +278,7 @@ public class StoreApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -351,7 +351,7 @@ public class StoreApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Content-Type", "application/json"); localVarRequestBuilder.header("Content-Type", "application/json");
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
try { try {
byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body); byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);

4
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -456,7 +456,7 @@ public class UserApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {
@ -544,7 +544,7 @@ public class UserApi {
localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath)); localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
} }
localVarRequestBuilder.header("Accept", "application/json"); localVarRequestBuilder.header("Accept", "application/xml, application/json");
localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody()); localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
if (memberVarReadTimeout != null) { if (memberVarReadTimeout != null) {