Skip to content

Commit 8435761

Browse files
adam-singeradam-singer
committed
Automated update
1 parent 5f43e7c commit 8435761

File tree

13 files changed

+100
-119
lines changed

13 files changed

+100
-119
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
packages/
1+
packages
22
pubspec.lock

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"0kaFfN0xfjZjASExv-gUnrWhdto/Rq5ZUxOQv3EpPxhPSvrsthtH0_4"
1+
"En7cEMgwoRpiAhsdND8UOnBCEDA/Rq5ZUxOQv3EpPxhPSvrsthtH0_4"

‎lib/src/browser/browserclient.dart‎ renamed to ‎lib/src/browser/browser_client.dart‎

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ abstract class BrowserClient extends Client {
2222
}
2323

2424
js.scoped((){
25-
js.context.handleClientLoad = new js.Callback.once(() {
25+
js.context["handleClientLoad"] = new js.Callback.once(() {
2626
_jsClientLoaded = true;
2727
completer.complete(true);
2828
});
@@ -59,7 +59,7 @@ abstract class BrowserClient extends Client {
5959
}
6060

6161
js.scoped(() {
62-
var request = js.context.gapi.client.request(js.map(requestData));
62+
var request = js.context["gapi"]["client"]["request"](js.map(requestData));
6363
var callback = new js.Callback.once((jsonResp, rawResp) {
6464
if (jsonResp == null || (jsonResp is core.bool && jsonResp == false)) {
6565
var raw = JSON.parse(rawResp);
@@ -69,7 +69,7 @@ abstract class BrowserClient extends Client {
6969
completer.complete({});
7070
}
7171
} else {
72-
completer.complete(js.context.JSON.stringify(jsonResp));
72+
completer.complete(js.context["JSON"]["stringify"](jsonResp));
7373
}
7474
});
7575
request.execute(callback);
@@ -102,53 +102,59 @@ abstract class BrowserClient extends Client {
102102
}
103103
var url = new oauth.UrlPattern(path).generate(urlParams, queryParams);
104104

105-
request.onLoadEnd.listen((_) {
105+
void handleError() {
106+
if (request.status == 0) {
107+
_loadJsClient().then((v) {
108+
if (requestUrl.substring(0,1) == "/") {
109+
path = requestUrl;
110+
} else {
111+
path ="$basePath$requestUrl";
112+
}
113+
url = new oauth.UrlPattern(path).generate(urlParams, {});
114+
_makeJsClientRequest(url, method, body: body, contentType: contentType, queryParams: queryParams)
115+
.then((response) {
116+
var data = JSON.parse(response);
117+
completer.complete(data);
118+
})
119+
.catchError((e) {
120+
completer.completeError(e);
121+
return true;
122+
});
123+
});
124+
} else {
125+
var error = "";
126+
if (request.responseText != null) {
127+
var errorJson;
128+
try {
129+
errorJson = JSON.parse(request.responseText);
130+
} on core.FormatException {
131+
errorJson = null;
132+
}
133+
if (errorJson != null && errorJson.containsKey("error")) {
134+
error = "${errorJson["error"]["code"]} ${errorJson["error"]["message"]}";
135+
}
136+
}
137+
if (error == "") {
138+
error = "${request.status} ${request.statusText}";
139+
}
140+
completer.completeError(new APIRequestException(error));
141+
}
142+
}
143+
144+
request.onLoad.listen((_) {
106145
if (request.status > 0 && request.status < 400) {
107146
var data = {};
108147
if (!request.responseText.isEmpty) {
109148
data = JSON.parse(request.responseText);
110149
}
111150
completer.complete(data);
112151
} else {
113-
if (request.status == 0) {
114-
_loadJsClient().then((v) {
115-
if (requestUrl.substring(0,1) == "/") {
116-
path = requestUrl;
117-
} else {
118-
path ="$basePath$requestUrl";
119-
}
120-
url = new oauth.UrlPattern(path).generate(urlParams, {});
121-
_makeJsClientRequest(url, method, body: body, contentType: contentType, queryParams: queryParams)
122-
.then((response) {
123-
var data = JSON.parse(response);
124-
completer.complete(data);
125-
})
126-
.catchError((e) {
127-
completer.completeError(e);
128-
return true;
129-
});
130-
});
131-
} else {
132-
var error = "";
133-
if (request.responseText != null) {
134-
var errorJson;
135-
try {
136-
errorJson = JSON.parse(request.responseText);
137-
} on core.FormatException {
138-
errorJson = null;
139-
}
140-
if (errorJson != null && errorJson.containsKey("error")) {
141-
error = "${errorJson["error"]["code"]} ${errorJson["error"]["message"]}";
142-
}
143-
}
144-
if (error == "") {
145-
error = "${request.status} ${request.statusText}";
146-
}
147-
completer.completeError(new APIRequestException(error));
148-
}
152+
handleError();
149153
}
150154
});
151155

156+
request.onError.listen((_) => handleError());
157+
152158
request.open(method, url);
153159
request.setRequestHeader("Content-Type", contentType);
154160
if (makeAuthRequests && _auth != null) {

‎lib/src/common/client.dart‎ renamed to ‎lib/src/client/client.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ abstract class Client {
5151
/// Base-class for all API Resources
5252
abstract class Resource {
5353
/// The [Client] to be used for all requests
54-
Client _client;
54+
final Client _client;
5555

5656
/// Create a new Resource, using the specified [Client] for requests
5757
Resource(Client this._client);

‎lib/src/common/resources.dart‎ renamed to ‎lib/src/client/resources.dart‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class TaskqueuesResource_ extends Resource {
1717
* [optParams] - Additional query parameters
1818
*/
1919
async.Future<TaskQueue> get(core.String project, core.String taskqueue, {core.bool getStats, core.Map optParams}) {
20-
var completer = new async.Completer();
2120
var url = "{project}/taskqueues/{taskqueue}";
2221
var urlParams = new core.Map();
2322
var queryParams = new core.Map();
@@ -37,16 +36,13 @@ class TaskqueuesResource_ extends Resource {
3736
}
3837

3938
if (!paramErrors.isEmpty) {
40-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
41-
return completer.future;
39+
throw new core.ArgumentError(paramErrors.join(" / "));
4240
}
4341

4442
var response;
4543
response = _client.request(url, "GET", urlParams: urlParams, queryParams: queryParams);
46-
response
47-
.then((data) => completer.complete(new TaskQueue.fromJson(data)))
48-
.catchError((e) { completer.completeError(e); return true; });
49-
return completer.future;
44+
return response
45+
.then((data) => new TaskQueue.fromJson(data));
5046
}
5147
}
5248

@@ -67,7 +63,6 @@ class TasksResource_ extends Resource {
6763
* [optParams] - Additional query parameters
6864
*/
6965
async.Future<core.Map> delete(core.String project, core.String taskqueue, core.String task, {core.Map optParams}) {
70-
var completer = new async.Completer();
7166
var url = "{project}/taskqueues/{taskqueue}/tasks/{task}";
7267
var urlParams = new core.Map();
7368
var queryParams = new core.Map();
@@ -88,16 +83,12 @@ class TasksResource_ extends Resource {
8883
}
8984

9085
if (!paramErrors.isEmpty) {
91-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
92-
return completer.future;
86+
throw new core.ArgumentError(paramErrors.join(" / "));
9387
}
9488

9589
var response;
9690
response = _client.request(url, "DELETE", urlParams: urlParams, queryParams: queryParams);
97-
response
98-
.then((data) => completer.complete(data))
99-
.catchError((e) { completer.completeError(e); return true; });
100-
return completer.future;
91+
return response;
10192
}
10293

10394
/**
@@ -112,7 +103,6 @@ class TasksResource_ extends Resource {
112103
* [optParams] - Additional query parameters
113104
*/
114105
async.Future<Task> get(core.String project, core.String taskqueue, core.String task, {core.Map optParams}) {
115-
var completer = new async.Completer();
116106
var url = "{project}/taskqueues/{taskqueue}/tasks/{task}";
117107
var urlParams = new core.Map();
118108
var queryParams = new core.Map();
@@ -133,16 +123,13 @@ class TasksResource_ extends Resource {
133123
}
134124

135125
if (!paramErrors.isEmpty) {
136-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
137-
return completer.future;
126+
throw new core.ArgumentError(paramErrors.join(" / "));
138127
}
139128

140129
var response;
141130
response = _client.request(url, "GET", urlParams: urlParams, queryParams: queryParams);
142-
response
143-
.then((data) => completer.complete(new Task.fromJson(data)))
144-
.catchError((e) { completer.completeError(e); return true; });
145-
return completer.future;
131+
return response
132+
.then((data) => new Task.fromJson(data));
146133
}
147134

148135
/**
@@ -159,7 +146,6 @@ class TasksResource_ extends Resource {
159146
* [optParams] - Additional query parameters
160147
*/
161148
async.Future<Tasks> lease(core.String project, core.String taskqueue, core.int numTasks, core.int leaseSecs, {core.Map optParams}) {
162-
var completer = new async.Completer();
163149
var url = "{project}/taskqueues/{taskqueue}/tasks/lease";
164150
var urlParams = new core.Map();
165151
var queryParams = new core.Map();
@@ -182,16 +168,13 @@ class TasksResource_ extends Resource {
182168
}
183169

184170
if (!paramErrors.isEmpty) {
185-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
186-
return completer.future;
171+
throw new core.ArgumentError(paramErrors.join(" / "));
187172
}
188173

189174
var response;
190175
response = _client.request(url, "POST", urlParams: urlParams, queryParams: queryParams);
191-
response
192-
.then((data) => completer.complete(new Tasks.fromJson(data)))
193-
.catchError((e) { completer.completeError(e); return true; });
194-
return completer.future;
176+
return response
177+
.then((data) => new Tasks.fromJson(data));
195178
}
196179

197180
/**
@@ -204,7 +187,6 @@ class TasksResource_ extends Resource {
204187
* [optParams] - Additional query parameters
205188
*/
206189
async.Future<Tasks2> list(core.String project, core.String taskqueue, {core.Map optParams}) {
207-
var completer = new async.Completer();
208190
var url = "{project}/taskqueues/{taskqueue}/tasks";
209191
var urlParams = new core.Map();
210192
var queryParams = new core.Map();
@@ -223,16 +205,13 @@ class TasksResource_ extends Resource {
223205
}
224206

225207
if (!paramErrors.isEmpty) {
226-
completer.completeError(new core.ArgumentError(paramErrors.join(" / ")));
227-
return completer.future;
208+
throw new core.ArgumentError(paramErrors.join(" / "));
228209
}
229210

230211
var response;
231212
response = _client.request(url, "GET", urlParams: urlParams, queryParams: queryParams);
232-
response
233-
.then((data) => completer.complete(new Tasks2.fromJson(data)))
234-
.catchError((e) { completer.completeError(e); return true; });
235-
return completer.future;
213+
return response
214+
.then((data) => new Tasks2.fromJson(data));
236215
}
237216
}
238217

‎lib/src/common/schemas.dart‎ renamed to ‎lib/src/client/schemas.dart‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ class Task {
2323
/** Create new Task from JSON data */
2424
Task.fromJson(core.Map json) {
2525
if (json.containsKey("enqueueTimestamp")) {
26-
enqueueTimestamp = json["enqueueTimestamp"];
26+
if(json["enqueueTimestamp"] is core.String){
27+
enqueueTimestamp = core.int.parse(json["enqueueTimestamp"]);
28+
}else{
29+
enqueueTimestamp = json["enqueueTimestamp"];
30+
}
2731
}
2832
if (json.containsKey("id")) {
2933
id = json["id"];
@@ -32,7 +36,11 @@ class Task {
3236
kind = json["kind"];
3337
}
3438
if (json.containsKey("leaseTimestamp")) {
35-
leaseTimestamp = json["leaseTimestamp"];
39+
if(json["leaseTimestamp"] is core.String){
40+
leaseTimestamp = core.int.parse(json["leaseTimestamp"]);
41+
}else{
42+
leaseTimestamp = json["leaseTimestamp"];
43+
}
3644
}
3745
if (json.containsKey("payloadBase64")) {
3846
payloadBase64 = json["payloadBase64"];
@@ -220,13 +228,25 @@ class TaskQueueStats {
220228
/** Create new TaskQueueStats from JSON data */
221229
TaskQueueStats.fromJson(core.Map json) {
222230
if (json.containsKey("leasedLastHour")) {
223-
leasedLastHour = json["leasedLastHour"];
231+
if(json["leasedLastHour"] is core.String){
232+
leasedLastHour = core.int.parse(json["leasedLastHour"]);
233+
}else{
234+
leasedLastHour = json["leasedLastHour"];
235+
}
224236
}
225237
if (json.containsKey("leasedLastMinute")) {
226-
leasedLastMinute = json["leasedLastMinute"];
238+
if(json["leasedLastMinute"] is core.String){
239+
leasedLastMinute = core.int.parse(json["leasedLastMinute"]);
240+
}else{
241+
leasedLastMinute = json["leasedLastMinute"];
242+
}
227243
}
228244
if (json.containsKey("oldestTask")) {
229-
oldestTask = json["oldestTask"];
245+
if(json["oldestTask"] is core.String){
246+
oldestTask = core.int.parse(json["oldestTask"]);
247+
}else{
248+
oldestTask = json["oldestTask"];
249+
}
230250
}
231251
if (json.containsKey("totalTasks")) {
232252
totalTasks = json["totalTasks"];

‎lib/src/console/consoleclient.dart‎ renamed to ‎lib/src/console/console_client.dart‎

File renamed without changes.

‎lib/taskqueue_v1beta1_api_browser.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ import "dart:json" as JSON;
1010
import "package:js/js.dart" as js;
1111
import "package:google_oauth2_client/google_oauth2_browser.dart" as oauth;
1212

13-
part "src/browser/browserclient.dart";
13+
part "src/browser/browser_client.dart";
1414
part "src/browser/taskqueue.dart";
15-

‎lib/taskqueue_v1beta1_api_client.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import "dart:core" as core;
44
import "dart:async" as async;
55
import "dart:json" as JSON;
66

7-
part "src/common/client.dart";
8-
part "src/common/schemas.dart";
9-
part "src/common/resources.dart";
10-
7+
part "src/client/client.dart";
8+
part "src/client/schemas.dart";
9+
part "src/client/resources.dart";

‎lib/taskqueue_v1beta1_api_console.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ import "dart:json" as JSON;
1010
import "package:http/http.dart" as http;
1111
import "package:google_oauth2_client/google_oauth2_console.dart" as oauth2;
1212

13-
part "src/console/consoleclient.dart";
13+
part "src/console/console_client.dart";
1414
part "src/console/taskqueue.dart";
15-

0 commit comments

Comments
 (0)