Skip to content

[BUG][dart-dio-next] Fixes content-type prioritization #9454

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.

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

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public class DartDioNextClientCodegen extends AbstractDartCodegen {

private static final String CLIENT_NAME = "clientName";

private static final List<String> SUPPORTED_CONTENT_TYPES = Arrays.asList("application/json", "application/x-www-form-urlencoded", "multipart/form-data");

private String dateLibrary;

private String clientName;
Expand Down Expand Up @@ -314,20 +316,32 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o

for (CodegenOperation op : operationList) {
op.httpMethod = op.httpMethod.toLowerCase(Locale.ROOT);
boolean isJson = true; //default to JSON
boolean isForm = false;
boolean isMultipart = false;
if (op.consumes != null) {
String contentType = null;
String firstContentType = null;
if (op.consumes != null && !op.consumes.isEmpty()) {
for (Map<String, String> consume : op.consumes) {
if (consume.containsKey("mediaType")) {
String type = consume.get("mediaType");
isJson = type.equalsIgnoreCase("application/json");
isForm = type.equalsIgnoreCase("application/x-www-form-urlencoded");
isMultipart = type.equalsIgnoreCase("multipart/form-data");
break;
if (firstContentType == null) {
firstContentType = type;
}
for (String supportedContentType : SUPPORTED_CONTENT_TYPES) {
if (type.equalsIgnoreCase(supportedContentType)) {
contentType = supportedContentType;
break;
}
}
}
}
if (contentType == null) {
contentType = firstContentType;
}
}
if (contentType == null) {
contentType = "application/json";
}

boolean isMultipart = contentType.equalsIgnoreCase("multipart/form-data");

for (CodegenParameter param : op.bodyParams) {
if (param.baseType != null && param.baseType.equalsIgnoreCase("Uint8List") && isMultipart) {
Expand All @@ -344,9 +358,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
}
}

op.vendorExtensions.put("x-is-json", isJson);
op.vendorExtensions.put("x-is-form", isForm);
op.vendorExtensions.put("x-is-multipart", isMultipart);
op.vendorExtensions.put("x-content-type", contentType);

resultImports.addAll(rewriteImports(op.imports));
if (op.getHasFormParams()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ class {{classname}} {
],{{/hasAuthMethods}}
...?extra,
},
contentType: [{{^hasConsumes}}
'application/json',{{/hasConsumes}}{{#hasConsumes}}{{#consumes}}
'{{{mediaType}}}',{{/consumes}}{{/hasConsumes}}
].first,
contentType: {{#vendorExtensions}}'{{x-content-type}}'{{/vendorExtensions}},
validateStatus: validateStatus,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ class AnotherFakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ class DefaultApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -126,10 +124,7 @@ class FakeApi {
],
...?extra,
},
contentType: [
'application/json',
'application/xml',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -190,9 +185,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -274,9 +267,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -363,9 +354,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -447,9 +436,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -531,9 +518,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -620,9 +605,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -683,9 +666,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -746,9 +727,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -853,9 +832,7 @@ class FakeApi {
],
...?extra,
},
contentType: [
'application/x-www-form-urlencoded',
].first,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -938,9 +915,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/x-www-form-urlencoded',
].first,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -1018,9 +993,7 @@ class FakeApi {
],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -1065,9 +1038,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -1128,9 +1099,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/x-www-form-urlencoded',
].first,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -1196,9 +1165,7 @@ class FakeApi {
'secure': <Map<String, String>>[],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ class FakeClassnameTags123Api {
],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/json',
'application/xml',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -118,9 +115,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -166,9 +161,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -242,9 +235,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -320,9 +311,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/json',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -395,10 +384,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/json',
'application/xml',
].first,
contentType: 'application/json',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -465,9 +451,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'application/x-www-form-urlencoded',
].first,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -536,9 +520,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'multipart/form-data',
].first,
contentType: 'multipart/form-data',
validateStatus: validateStatus,
);

Expand Down Expand Up @@ -634,9 +616,7 @@ class PetApi {
],
...?extra,
},
contentType: [
'multipart/form-data',
].first,
contentType: 'multipart/form-data',
validateStatus: validateStatus,
);

Expand Down
Loading