Skip to content

Commit 7cb2203

Browse files
SDK regenerated by CI server [ci skip]
1 parent c31d473 commit 7cb2203

File tree

11 files changed

+195
-150
lines changed

11 files changed

+195
-150
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [21.10.0] - Aspose Words Cloud for Dart 21.10 Release Notes
2+
3+
- Removed 'GraphicsQualityOptions' image save option as it no longer supported.
4+
- Added query parameter 'displayIntermediateResults' for batch requests. If 'false', the last response in batch will be returned only. Default is 'true'
5+
6+
17
## [21.8.0] - Aspose Words Cloud for Dart 21.8 Release Notes
28

39
- Added new api methods to get, insert, update or delete custom xml parts from documents.

lib/src/api_client.dart

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -414,32 +414,29 @@ class ApiClient {
414414
return request.deserializeResponse(this, response);
415415
}
416416

417-
Future< List<dynamic> > callBatch(final List<BatchRequest> requests) async {
417+
Future< List<dynamic> > callBatch(final List<BatchRequest> requests, final bool displayIntermediateResults) async {
418418
var bodyParts = <ApiRequestPart>[];
419419
for (final request in requests) {
420420
bodyParts.add(serializeBatchPart(await request.createRequestData(this)));
421421
}
422422
var boundary = Uuid().v4();
423-
var batchUrl = '${configuration.getApiRootUrl()}/words/batch';
423+
var batchUrl = '${configuration.getApiRootUrl()}/words/batch?displayIntermediateResults=$displayIntermediateResults';
424424
var batchHeaders = <String, String>{};
425425
var batchBody = serializeMultipart(bodyParts, boundary);
426426
batchHeaders['Content-Type'] = 'multipart/form-data; boundary="$boundary"';
427427

428428
var batchRequestData = ApiRequestData('PUT', batchUrl, batchHeaders, batchBody);
429429
var response = await _callWithChecks(batchRequestData);
430430
var responseParts = deserializeMultipartBatch(response);
431-
if (responseParts.length != requests.length) {
432-
throw ApiException(400, 'Response and request parts mismatch.');
433-
}
434-
435-
var result = List<dynamic>.filled(requests.length, null);
436-
for (var i = 0; i < requests.length; i++) {
437-
if (!responseParts.containsKey(requests[i].getRequestId())) {
431+
var result = <dynamic>[];
432+
responseParts.forEach((key, value) {
433+
var request = requests.firstWhere((element) => element.getRequestId() == key);
434+
if (request == null) {
438435
throw ApiException(400, 'Failed to deserialize batch multipart response.');
439436
}
440437

441-
result[i] = deserializeBatchPart(requests[i].getRequest(), responseParts[requests[i].getRequestId()]);
442-
}
438+
result.add(deserializeBatchPart(request.getRequest(), value));
439+
});
443440

444441
return result;
445442
}

lib/src/words_api.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ class WordsApi {
15761576
}
15771577

15781578
// Batch request
1579-
Future< List<dynamic> > batch(final List<BatchRequest> requests) async {
1580-
return await _apiClient.callBatch(requests);
1579+
Future< List<dynamic> > batch(final List<BatchRequest> requests, {final bool displayIntermediateResults = true}) async {
1580+
return await _apiClient.callBatch(requests, displayIntermediateResults);
15811581
}
15821582
}

test/aspose_words_cloud_tests.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ void main() {
106106

107107
group('Batch', () {
108108
test('TestBatch1', () async => await BatchTests(testContext).testBatch1());
109+
test('TestBatch2', () async => await BatchTests(testContext).testBatch2());
109110
});
110111

111112
group('Bookmark', () {

test/batch_tests.dart

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,45 @@ class BatchTests
107107
expect(actual[3], isNull); // DeleteParagraph
108108
expect(actual[4] is ByteData, isTrue); // BuildReportOnline
109109
}
110+
111+
/// Test for batch request.
112+
Future<void> testBatch2() async
113+
{
114+
var remoteFileName = 'TestBatchDocument.docx';
115+
116+
await context.uploadFile(
117+
localFile,
118+
'$remoteDataFolder/$remoteFileName'
119+
);
120+
121+
var request1 = BatchRequest(GetParagraphsRequest(
122+
remoteFileName,
123+
nodePath: 'sections/0',
124+
folder: remoteDataFolder
125+
));
126+
127+
var request2 = BatchRequest(GetParagraphRequest(
128+
remoteFileName,
129+
0,
130+
nodePath: 'sections/0',
131+
folder: remoteDataFolder
132+
));
133+
134+
var localDataFile = await context.loadTextFile(reportingFolder + '/ReportData.json');
135+
136+
var request3 = BatchRequest(BuildReportOnlineRequest(
137+
request2.resultOf(),
138+
localDataFile,
139+
ReportEngineSettings()
140+
..dataSourceType = ReportEngineSettings_DataSourceTypeEnum.json
141+
..dataSourceName = 'persons'
142+
));
143+
144+
request3.setDependsOn(request2);
145+
request2.setDependsOn(request1);
146+
147+
var actual = await context.getApi().batch([request1, request2, request3], displayIntermediateResults: false);
148+
expect(actual.length, 1);
149+
expect(actual[0] is ByteData, isTrue); // BuildReportOnline
150+
}
110151
}
18 KB
Binary file not shown.
3.36 MB
Binary file not shown.
Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Orders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="OrdersSchema.xsd">
3-
<Order>
4-
<Address>
5-
<Number>23</Number>
6-
<Street>Nelson Street</Street>
7-
<Suburb>Howick</Suburb>
8-
<City>Auckland</City>
9-
</Address>
10-
<PhoneNumber>543 1234</PhoneNumber>
11-
<Date>03/01/2010</Date>
12-
<Total>14.00</Total>
13-
<Item>
14-
<Name>BBQ Chicken Pizza</Name>
15-
<Price>6.00</Price>
16-
<Quantity>1</Quantity>
17-
<ItemTotal>6.00</ItemTotal>
18-
</Item>
19-
<Item>
20-
<Name>1.5 Litre Coke</Name>
21-
<Price>4.00</Price>
22-
<Quantity>2</Quantity>
23-
<ItemTotal>8.00</ItemTotal>
24-
</Item>
25-
</Order>
26-
<Order>
27-
<Address>
28-
<Number>10</Number>
29-
<Street>Parkville Avenue</Street>
30-
<Suburb>Pakuranga</Suburb>
31-
<City>Auckland</City>
32-
</Address>
33-
<PhoneNumber>548 7342</PhoneNumber>
34-
<Date>05/03/2010</Date>
35-
<Total>6.00</Total>
36-
<Item>
37-
<Name>Hawaiian Pizza</Name>
38-
<Price>4.00</Price>
39-
<Quantity>1</Quantity>
40-
<ItemTotal>4.00</ItemTotal>
41-
</Item>
42-
<Item>
43-
<Name>Fries</Name>
44-
<Price>1.00</Price>
45-
<Quantity>2</Quantity>
46-
<ItemTotal>2.00</ItemTotal>
47-
</Item>
48-
</Order>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Orders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="OrdersSchema.xsd">
3+
<Order>
4+
<Address>
5+
<Number>23</Number>
6+
<Street>Nelson Street</Street>
7+
<Suburb>Howick</Suburb>
8+
<City>Auckland</City>
9+
</Address>
10+
<PhoneNumber>543 1234</PhoneNumber>
11+
<Date>03/01/2010</Date>
12+
<Total>14.00</Total>
13+
<Item>
14+
<Name>BBQ Chicken Pizza</Name>
15+
<Price>6.00</Price>
16+
<Quantity>1</Quantity>
17+
<ItemTotal>6.00</ItemTotal>
18+
</Item>
19+
<Item>
20+
<Name>1.5 Litre Coke</Name>
21+
<Price>4.00</Price>
22+
<Quantity>2</Quantity>
23+
<ItemTotal>8.00</ItemTotal>
24+
</Item>
25+
</Order>
26+
<Order>
27+
<Address>
28+
<Number>10</Number>
29+
<Street>Parkville Avenue</Street>
30+
<Suburb>Pakuranga</Suburb>
31+
<City>Auckland</City>
32+
</Address>
33+
<PhoneNumber>548 7342</PhoneNumber>
34+
<Date>05/03/2010</Date>
35+
<Total>6.00</Total>
36+
<Item>
37+
<Name>Hawaiian Pizza</Name>
38+
<Price>4.00</Price>
39+
<Quantity>1</Quantity>
40+
<ItemTotal>4.00</ItemTotal>
41+
</Item>
42+
<Item>
43+
<Name>Fries</Name>
44+
<Price>1.00</Price>
45+
<Quantity>2</Quantity>
46+
<ItemTotal>2.00</ItemTotal>
47+
</Item>
48+
</Order>
4949
</Orders>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Fields>
2-
<FullName>Farooq Sheikh</FullName>
3-
<Company>Aspose Pty Ltd</Company>
4-
<Address>Suite 163</Address>
5-
<Address2>79 Longueville Road</Address2>
6-
<City>Lane Cove</City>
1+
<Fields>
2+
<FullName>Farooq Sheikh</FullName>
3+
<Company>Aspose Pty Ltd</Company>
4+
<Address>Suite 163</Address>
5+
<Address2>79 Longueville Road</Address2>
6+
<City>Lane Cove</City>
77
</Fields>
Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Orders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="OrdersSchema.xsd">
3-
<Order>
4-
<Address>
5-
<Number>23</Number>
6-
<Street>Nelson Street</Street>
7-
<Suburb>Howick</Suburb>
8-
<City>Auckland</City>
9-
</Address>
10-
<PhoneNumber>543 1234</PhoneNumber>
11-
<Date>03/01/2010</Date>
12-
<Total>14.00</Total>
13-
<Item>
14-
<Name>BBQ Chicken Pizza</Name>
15-
<Price>6.00</Price>
16-
<Quantity>1</Quantity>
17-
<ItemTotal>6.00</ItemTotal>
18-
</Item>
19-
<Item>
20-
<Name>1.5 Litre Coke</Name>
21-
<Price>4.00</Price>
22-
<Quantity>2</Quantity>
23-
<ItemTotal>8.00</ItemTotal>
24-
</Item>
25-
</Order>
26-
<Order>
27-
<Address>
28-
<Number>10</Number>
29-
<Street>Parkville Avenue</Street>
30-
<Suburb>Pakuranga</Suburb>
31-
<City>Auckland</City>
32-
</Address>
33-
<PhoneNumber>548 7342</PhoneNumber>
34-
<Date>05/03/2010</Date>
35-
<Total>6.00</Total>
36-
<Item>
37-
<Name>Hawaiian Pizza</Name>
38-
<Price>4.00</Price>
39-
<Quantity>1</Quantity>
40-
<ItemTotal>4.00</ItemTotal>
41-
</Item>
42-
<Item>
43-
<Name>Fries</Name>
44-
<Price>1.00</Price>
45-
<Quantity>2</Quantity>
46-
<ItemTotal>2.00</ItemTotal>
47-
</Item>
48-
</Order>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Orders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="OrdersSchema.xsd">
3+
<Order>
4+
<Address>
5+
<Number>23</Number>
6+
<Street>Nelson Street</Street>
7+
<Suburb>Howick</Suburb>
8+
<City>Auckland</City>
9+
</Address>
10+
<PhoneNumber>543 1234</PhoneNumber>
11+
<Date>03/01/2010</Date>
12+
<Total>14.00</Total>
13+
<Item>
14+
<Name>BBQ Chicken Pizza</Name>
15+
<Price>6.00</Price>
16+
<Quantity>1</Quantity>
17+
<ItemTotal>6.00</ItemTotal>
18+
</Item>
19+
<Item>
20+
<Name>1.5 Litre Coke</Name>
21+
<Price>4.00</Price>
22+
<Quantity>2</Quantity>
23+
<ItemTotal>8.00</ItemTotal>
24+
</Item>
25+
</Order>
26+
<Order>
27+
<Address>
28+
<Number>10</Number>
29+
<Street>Parkville Avenue</Street>
30+
<Suburb>Pakuranga</Suburb>
31+
<City>Auckland</City>
32+
</Address>
33+
<PhoneNumber>548 7342</PhoneNumber>
34+
<Date>05/03/2010</Date>
35+
<Total>6.00</Total>
36+
<Item>
37+
<Name>Hawaiian Pizza</Name>
38+
<Price>4.00</Price>
39+
<Quantity>1</Quantity>
40+
<ItemTotal>4.00</ItemTotal>
41+
</Item>
42+
<Item>
43+
<Name>Fries</Name>
44+
<Price>1.00</Price>
45+
<Quantity>2</Quantity>
46+
<ItemTotal>2.00</ItemTotal>
47+
</Item>
48+
</Order>
4949
</Orders>

0 commit comments

Comments
 (0)