[Dart] query arguments of requests are now url encoded#2250

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 3 commits into from
Mar 7, 2019
Merged

[Dart] query arguments of requests are now url encoded #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c79cc5
[DART2]: fix encoding query args
d3v-cl Feb 26, 2019
1e7ef00
[DART]fix: url encode query arguments
d3v-cl Feb 26, 2019
f56abd6
[DART][DART2]feat: rebuild petstore
d3v-cl Feb 26, 2019
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
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/dart/api_client.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

_updateParamsForAuth(authNames, queryParams, headerParams);

var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
var ps = queryParams
.where((p) => p.value != null)
.map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

String queryString = ps.isNotEmpty ?
'?' + ps.join('&') :
'';
Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/dart2/api_client.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

_updateParamsForAuth(authNames, queryParams, headerParams);

var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
var ps = queryParams
.where((p) => p.value != null)
.map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

String queryString = ps.isNotEmpty ?
'?' + ps.join('&') :
'';
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/dart-jaguar/openapi/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

_updateParamsForAuth(authNames, queryParams, headerParams);

var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
var ps = queryParams
.where((p) => p.value != null)
.map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

String queryString = ps.isNotEmpty ?
'?' + ps.join('&') :
'';
Expand Down
24 changes: 12 additions & 12 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
} else {
return null;
}
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
} else {
return null;
}
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
return apiClient.deserialize(response.body, 'Pet') as Pet;
} else {
return null;
}
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
} else {
return null;
}
Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
;
} else {
return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
return apiClient.deserialize(response.body, 'Order') as Order;
} else {
return null;
}
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
return apiClient.deserialize(response.body, 'Order') as Order;
} else {
return null;
}
Expand Down
20 changes: 10 additions & 10 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
return apiClient.deserialize(response.body, 'User') as User;
} else {
return null;
}
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
return apiClient.deserialize(response.body, 'String') as String;
} else {
return null;
}
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
authNames);

if(response.statusCode >= 400) {
throw new ApiException(response.statusCode, _decodeBodyBytes(response));
throw new ApiException(response.statusCode, response.body);
} else if(response.body != null) {
} else {
return;
Expand Down
12 changes: 0 additions & 12 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
return value.toString();
}
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
var contentType = response.headers['content-type'];
if (contentType != null && contentType.contains("application/json")) {
return utf8.decode(response.bodyBytes);
} else {
return response.body;
}
}
6 changes: 3 additions & 3 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
if (json['code'] == null) {
code = null;
} else {
code = json['code'];
code = json['code'];
}
if (json['type'] == null) {
type = null;
} else {
type = json['type'];
type = json['type'];
}
if (json['message'] == null) {
message = null;
} else {
message = json['message'];
message = json['message'];
}
}

Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
if (json['id'] == null) {
id = null;
} else {
id = json['id'];
id = json['id'];
}
if (json['name'] == null) {
name = null;
} else {
name = json['name'];
name = json['name'];
}
}

Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
if (json['id'] == null) {
id = null;
} else {
id = json['id'];
id = json['id'];
}
if (json['petId'] == null) {
petId = null;
} else {
petId = json['petId'];
petId = json['petId'];
}
if (json['quantity'] == null) {
quantity = null;
} else {
quantity = json['quantity'];
quantity = json['quantity'];
}
if (json['shipDate'] == null) {
shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
if (json['status'] == null) {
status = null;
} else {
status = json['status'];
status = json['status'];
}
if (json['complete'] == null) {
complete = null;
} else {
complete = json['complete'];
complete = json['complete'];
}
}

Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
if (json['id'] == null) {
id = null;
} else {
id = json['id'];
id = json['id'];
}
if (json['category'] == null) {
category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
if (json['name'] == null) {
name = null;
} else {
name = json['name'];
name = json['name'];
}
if (json['photoUrls'] == null) {
photoUrls = null;
} else {
photoUrls = (json['photoUrls'] as List).cast<String>();
photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
}
if (json['tags'] == null) {
tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
if (json['status'] == null) {
status = null;
} else {
status = json['status'];
status = json['status'];
}
}

Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
if (json['id'] == null) {
id = null;
} else {
id = json['id'];
id = json['id'];
}
if (json['name'] == null) {
name = null;
} else {
name = json['name'];
name = json['name'];
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Dart] query arguments of requests are now url encoded#2250

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 3 commits into

from

Mar 7, 2019
 Merged


[Dart] query arguments of requests are now url encoded
#2250
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
5c79cc5

[DART2]: fix encoding query args


d3v-cl Feb 26, 2019
1e7ef00

[DART]fix: url encode query arguments


d3v-cl Feb 26, 2019
f56abd6

[DART][DART2]feat: rebuild petstore


d3v-cl Feb 26, 2019

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


5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/resources/dart2/api_client.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:06.224333+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

2 changes: 1 addition & 1 deletion
samples/client/petstore/dart-jaguar/openapi/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:

- API version: 1.0.0
- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
- Build date: 2019-02-26T17:35:04.597991+01:00[Europe/Vienna]
- Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen

## Requirements
Expand Down

5 changes: 4 additions & 1 deletion
samples/client/petstore/dart/flutter_petstore/openapi/lib/api_client.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,10 @@ class ApiClient {

 _updateParamsForAuth(authNames, queryParams, headerParams);

 var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
 var ps = queryParams
 .where((p) => p.value != null)
 .map((p) => '${p.name}=${Uri.encodeQueryComponent(p.value)}');

 String queryString = ps.isNotEmpty ?
 '?' + ps.join('&') :
 '';
Expand Down

24 changes: 12 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -100,7 +100,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -150,9 +150,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -201,9 +201,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
 return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
 } else {
 return null;
 }
Expand DownExpand Up@@ -251,9 +251,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
 return apiClient.deserialize(response.body, 'Pet') as Pet;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,7 +301,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -362,7 +362,7 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -422,9 +422,9 @@ class PetApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
 return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
 } else {
 return null;
 }
Expand Down

14 changes: 7 additions & 7 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -96,9 +96,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
 return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
 ;
 } else {
 return null;
Expand DownExpand Up@@ -147,9 +147,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand DownExpand Up@@ -197,9 +197,9 @@ class StoreApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
 return apiClient.deserialize(response.body, 'Order') as Order;
 } else {
 return null;
 }
Expand Down

20 changes: 10 additions & 10 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -99,7 +99,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -148,7 +148,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -197,7 +197,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -246,9 +246,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
 return apiClient.deserialize(response.body, 'User') as User;
 } else {
 return null;
 }
Expand DownExpand Up@@ -301,9 +301,9 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
 return apiClient.deserialize(response.body, 'String') as String;
 } else {
 return null;
 }
Expand DownExpand Up@@ -348,7 +348,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand DownExpand Up@@ -400,7 +400,7 @@ class UserApi {
 authNames);

 if(response.statusCode >= 400) {
 throw new ApiException(response.statusCode, _decodeBodyBytes(response));
 throw new ApiException(response.statusCode, response.body);
 } else if(response.body != null) {
 } else {
 return;
Expand Down

12 changes: 0 additions & 12 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,15 +42,3 @@ String parameterToString(dynamic value) {
 return value.toString();
 }
}

/// Returns the decoded body by utf-8 if application/json with the given headers.
/// Else, returns the decoded body by default algorithm of dart:http.
/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
String _decodeBodyBytes(Response response) {
 var contentType = response.headers['content-type'];
 if (contentType != null && contentType.contains("application/json")) {
 return utf8.decode(response.bodyBytes);
 } else {
 return response.body;
 }
}

6 changes: 3 additions & 3 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,17 +19,17 @@ class ApiResponse {
 if (json['code'] == null) {
 code = null;
 } else {
code = json['code'];
 code = json['code'];
 }
 if (json['type'] == null) {
 type = null;
 } else {
type = json['type'];
 type = json['type'];
 }
 if (json['message'] == null) {
 message = null;
 } else {
message = json['message'];
 message = json['message'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Category {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down

10 changes: 5 additions & 5 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,17 +26,17 @@ class Order {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['petId'] == null) {
 petId = null;
 } else {
petId = json['petId'];
 petId = json['petId'];
 }
 if (json['quantity'] == null) {
 quantity = null;
 } else {
quantity = json['quantity'];
 quantity = json['quantity'];
 }
 if (json['shipDate'] == null) {
 shipDate = null;
Expand All@@ -46,12 +46,12 @@ class Order {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 if (json['complete'] == null) {
 complete = null;
 } else {
complete = json['complete'];
 complete = json['complete'];
 }
 }

Expand Down

8 changes: 4 additions & 4 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ class Pet {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['category'] == null) {
 category = null;
Expand All@@ -36,12 +36,12 @@ class Pet {
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 if (json['photoUrls'] == null) {
 photoUrls = null;
 } else {
 photoUrls = (json['photoUrls'] as List).cast<String>();
 photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
 }
 if (json['tags'] == null) {
 tags = null;
Expand All@@ -51,7 +51,7 @@ class Pet {
 if (json['status'] == null) {
 status = null;
 } else {
status = json['status'];
 status = json['status'];
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,12 +17,12 @@ class Tag {
 if (json['id'] == null) {
 id = null;
 } else {
id = json['id'];
 id = json['id'];
 }
 if (json['name'] == null) {
 name = null;
 } else {
name = json['name'];
 name = json['name'];
 }
 }

Expand Down
Loading