Merge remote-tracking branch 'origin/master' into release

dynabic-billing-team · dynabic-billing-team · commit 8f6acf941df0 · 2024-04-10T11:10:46.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [24.4.0] - Aspose Words Cloud for Dart 24.4 Release Notes
+
+- Added the 'MergeWithNext' method to merge a section with the next one.
+
+
 ## [24.3.0] - Aspose Words Cloud for Dart 24.3 Release Notes
 
 - Added support for 'RemoveEmptyCells' option for the 'Cleanup' parameter in the insert 'MailMerge' API method.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,7 +37,7 @@ node('words-linux') {
             }
             
             if (packageTesting) {
-                docker.image('dart:2.19.4').inside {
+                docker.image('dart:stable').inside {
                     stage('prepare'){
                         sh "rm -rf lib"
                         sh "cp ./pubspec_package_testing.yaml ./pubspec.yaml"
@@ -61,7 +61,7 @@ node('words-linux') {
                 } 
             }
             else if (needToBuild) {
-                docker.image('dart:2.19.4').inside {
+                docker.image('dart:stable').inside {
                     stage('prepare'){
                         sh "dart pub get"
                         sh "dart pub global activate junitreport"
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Add this dependency to your *pubspec.yaml*:
 
 ```yaml
 dependencies:
-  aspose_words_cloud: 24.3.0
+  aspose_words_cloud: 24.4.0
 ```
 
 ## Getting Started
diff --git a/lib/aspose_words_cloud.dart b/lib/aspose_words_cloud.dart
@@ -565,6 +565,8 @@ export 'src/requests/insert_watermark_text_online_request.dart';
 export 'src/requests/insert_watermark_text_request.dart';
 export 'src/requests/link_header_footers_to_previous_request.dart';
 export 'src/requests/load_web_document_request.dart';
+export 'src/requests/merge_with_next_online_request.dart';
+export 'src/requests/merge_with_next_request.dart';
 export 'src/requests/move_file_request.dart';
 export 'src/requests/move_folder_request.dart';
 export 'src/requests/optimize_document_online_request.dart';
diff --git a/lib/src/api_client.dart b/lib/src/api_client.dart
@@ -503,7 +503,7 @@ class ApiClient {
 
     var httpRequest = http.Request(requestData.method, Uri.parse(requestData.url));
     httpRequest.headers['x-aspose-client'] = 'dart sdk';
-    httpRequest.headers['x-aspose-client-version'] = '24.3';
+    httpRequest.headers['x-aspose-client-version'] = '24.4';
     httpRequest.headers['Authorization'] = await _getAuthToken();
     httpRequest.headers.addAll(requestData.headers);
 
diff --git a/lib/src/models/drawing_object_insert.dart b/lib/src/models/drawing_object_insert.dart
@@ -87,6 +87,13 @@ class DrawingObjectInsert implements ModelBase {
   set wrapType(DrawingObjectInsert_WrapTypeEnum? val) => _wrapType = val;
 
 
+  /// Gets or sets a value indicating whether AspectRatioLocked option on or off.
+  bool? _aspectRatioLocked;
+
+  bool? get aspectRatioLocked => _aspectRatioLocked;
+  set aspectRatioLocked(bool? val) => _aspectRatioLocked = val;
+
+
   @override
   void deserialize(Map<String, dynamic>? json) {
     if (json == null) {
@@ -171,6 +178,12 @@ class DrawingObjectInsert implements ModelBase {
     } else {
       wrapType = null;
     }
+
+    if (json.containsKey('AspectRatioLocked')) {
+      aspectRatioLocked = json['AspectRatioLocked'] as bool;
+    } else {
+      aspectRatioLocked = null;
+    }
   }
 
   @override
@@ -238,6 +251,10 @@ class DrawingObjectInsert implements ModelBase {
         default: break;
       }
     }
+
+    if (aspectRatioLocked != null) {
+      _result['AspectRatioLocked'] = aspectRatioLocked!;
+    }
     return _result;
   }
 
@@ -285,6 +302,7 @@ class DrawingObjectInsert implements ModelBase {
 
 
 
+
   }
 }
 
diff --git a/lib/src/models/drawing_object_update.dart b/lib/src/models/drawing_object_update.dart
@@ -80,6 +80,13 @@ class DrawingObjectUpdate implements ModelBase {
   set wrapType(DrawingObjectUpdate_WrapTypeEnum? val) => _wrapType = val;
 
 
+  /// Gets or sets a value indicating whether AspectRatioLocked option on or off.
+  bool? _aspectRatioLocked;
+
+  bool? get aspectRatioLocked => _aspectRatioLocked;
+  set aspectRatioLocked(bool? val) => _aspectRatioLocked = val;
+
+
   @override
   void deserialize(Map<String, dynamic>? json) {
     if (json == null) {
@@ -158,6 +165,12 @@ class DrawingObjectUpdate implements ModelBase {
     } else {
       wrapType = null;
     }
+
+    if (json.containsKey('AspectRatioLocked')) {
+      aspectRatioLocked = json['AspectRatioLocked'] as bool;
+    } else {
+      aspectRatioLocked = null;
+    }
   }
 
   @override
@@ -221,6 +234,10 @@ class DrawingObjectUpdate implements ModelBase {
         default: break;
       }
     }
+
+    if (aspectRatioLocked != null) {
+      _result['AspectRatioLocked'] = aspectRatioLocked!;
+    }
     return _result;
   }
 
diff --git a/lib/src/models/structured_document_tag.dart b/lib/src/models/structured_document_tag.dart
@@ -82,8 +82,8 @@ class StructuredDocumentTag extends StructuredDocumentTagBase {
 
     if (json.containsKey('Appearance')) {
       switch (json['Appearance'] as String) {
-        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'BoundingBox': appearance = StructuredDocumentTagBase_AppearanceEnum.boundingBox; break;
+        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'Tags': appearance = StructuredDocumentTagBase_AppearanceEnum.tags; break;
         case 'Hidden': appearance = StructuredDocumentTagBase_AppearanceEnum.hidden; break;
         default: appearance = null; break;
diff --git a/lib/src/models/structured_document_tag_base.dart b/lib/src/models/structured_document_tag_base.dart
@@ -254,8 +254,8 @@ abstract class StructuredDocumentTagBase extends NodeLink {
 
     if (json.containsKey('Appearance')) {
       switch (json['Appearance'] as String) {
-        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'BoundingBox': appearance = StructuredDocumentTagBase_AppearanceEnum.boundingBox; break;
+        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'Tags': appearance = StructuredDocumentTagBase_AppearanceEnum.tags; break;
         case 'Hidden': appearance = StructuredDocumentTagBase_AppearanceEnum.hidden; break;
         default: appearance = null; break;
@@ -410,8 +410,8 @@ abstract class StructuredDocumentTagBase extends NodeLink {
 
     if (appearance != null) {
       switch (appearance!) {
-        case StructuredDocumentTagBase_AppearanceEnum.defaultValue: _result['Appearance'] = 'Default'; break;
         case StructuredDocumentTagBase_AppearanceEnum.boundingBox: _result['Appearance'] = 'BoundingBox'; break;
+        case StructuredDocumentTagBase_AppearanceEnum.defaultValue: _result['Appearance'] = 'Default'; break;
         case StructuredDocumentTagBase_AppearanceEnum.tags: _result['Appearance'] = 'Tags'; break;
         case StructuredDocumentTagBase_AppearanceEnum.hidden: _result['Appearance'] = 'Hidden'; break;
         default: break;
@@ -562,8 +562,8 @@ abstract class StructuredDocumentTagBase extends NodeLink {
 /// Gets or sets the appearance of a structured document tag.
 enum StructuredDocumentTagBase_AppearanceEnum
 { 
-  defaultValue,
   boundingBox,
+  defaultValue,
   tags,
   hidden
 }
diff --git a/lib/src/models/structured_document_tag_insert.dart b/lib/src/models/structured_document_tag_insert.dart
@@ -89,8 +89,8 @@ class StructuredDocumentTagInsert extends StructuredDocumentTagBase {
 
     if (json.containsKey('Appearance')) {
       switch (json['Appearance'] as String) {
-        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'BoundingBox': appearance = StructuredDocumentTagBase_AppearanceEnum.boundingBox; break;
+        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'Tags': appearance = StructuredDocumentTagBase_AppearanceEnum.tags; break;
         case 'Hidden': appearance = StructuredDocumentTagBase_AppearanceEnum.hidden; break;
         default: appearance = null; break;
diff --git a/lib/src/models/structured_document_tag_update.dart b/lib/src/models/structured_document_tag_update.dart
@@ -69,8 +69,8 @@ class StructuredDocumentTagUpdate extends StructuredDocumentTag {
 
     if (json.containsKey('Appearance')) {
       switch (json['Appearance'] as String) {
-        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'BoundingBox': appearance = StructuredDocumentTagBase_AppearanceEnum.boundingBox; break;
+        case 'Default': appearance = StructuredDocumentTagBase_AppearanceEnum.defaultValue; break;
         case 'Tags': appearance = StructuredDocumentTagBase_AppearanceEnum.tags; break;
         case 'Hidden': appearance = StructuredDocumentTagBase_AppearanceEnum.hidden; break;
         default: appearance = null; break;
diff --git a/lib/src/models/table_properties.dart b/lib/src/models/table_properties.dart
@@ -616,8 +616,8 @@ class TableProperties extends LinkElement {
 
     if (json.containsKey('TextWrapping')) {
       switch (json['TextWrapping'] as String) {
-        case 'Default': textWrapping = TableProperties_TextWrappingEnum.defaultValue; break;
         case 'None': textWrapping = TableProperties_TextWrappingEnum.none; break;
+        case 'Default': textWrapping = TableProperties_TextWrappingEnum.defaultValue; break;
         case 'Around': textWrapping = TableProperties_TextWrappingEnum.around; break;
         default: textWrapping = null; break;
       }
@@ -1082,8 +1082,8 @@ class TableProperties extends LinkElement {
 
     if (textWrapping != null) {
       switch (textWrapping!) {
-        case TableProperties_TextWrappingEnum.defaultValue: _result['TextWrapping'] = 'Default'; break;
         case TableProperties_TextWrappingEnum.none: _result['TextWrapping'] = 'None'; break;
+        case TableProperties_TextWrappingEnum.defaultValue: _result['TextWrapping'] = 'Default'; break;
         case TableProperties_TextWrappingEnum.around: _result['TextWrapping'] = 'Around'; break;
         default: break;
       }
@@ -1523,8 +1523,8 @@ enum TableProperties_StyleOptionsEnum
 /// Gets or sets the option that controls text wrapping for the table.
 enum TableProperties_TextWrappingEnum
 { 
-  defaultValue,
   none,
+  defaultValue,
   around
 }
 
diff --git a/lib/src/requests/merge_with_next_online_request.dart b/lib/src/requests/merge_with_next_online_request.dart
@@ -0,0 +1,130 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="merge_with_next_online_request.dart">
+ *   Copyright (c) 2024 Aspose.Words for Cloud
+ * </copyright>
+ * <summary>
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ * </summary>
+ * --------------------------------------------------------------------------------
+ */
+
+library aspose_words_cloud;
+
+import 'dart:typed_data';
+import '../../aspose_words_cloud.dart';
+import '../api_client.dart';
+import '../api_request_data.dart';
+import '../api_request_part.dart';
+import '../body_part_data.dart';
+
+/// Request model for MergeWithNextOnline operation.
+class MergeWithNextOnlineRequest implements RequestBase {
+  /// The document.
+  final ByteData? document;
+
+  /// The index of the section.
+  final int? sectionIndex;
+
+  /// Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
+  final String? loadEncoding;
+
+  /// Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.
+  final String? password;
+
+  /// Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.
+  final String? encryptedPassword;
+
+  /// Result path of the document after the operation. If this parameter is omitted then result of the operation will be saved as the source document.
+  final String? destFileName;
+
+  /// Initials of the author to use for revisions.If you set this parameter and then make some changes to the document programmatically, save the document and later open the document in MS Word you will see these changes as revisions.
+  final String? revisionAuthor;
+
+  /// The date and time to use for revisions.
+  final String? revisionDateTime;
+
+  MergeWithNextOnlineRequest(this.document, this.sectionIndex, {this.loadEncoding, this.password, this.encryptedPassword, this.destFileName, this.revisionAuthor, this.revisionDateTime});
+
+  @override
+  Future<ApiRequestData> createRequestData(final ApiClient _apiClient) async {
+    var _path = '/words/online/put/merge/sections/{sectionIndex}';
+    var _queryParams = <String, String>{};
+    var _headers = <String, String>{};
+    var _bodyParts = <ApiRequestPart>[];
+    var _fileContentParts = <FileReference>[];
+    if (sectionIndex == null) {
+      throw ApiException(400, 'Parameter sectionIndex is required.');
+    }
+    _path = _path.replaceAll('{sectionIndex}', _apiClient.serializeToString(sectionIndex) ?? "");
+    if (loadEncoding != null) {
+      _queryParams['loadEncoding'] = _apiClient.serializeToString(loadEncoding) ?? "";
+    }
+
+    if (password != null) {
+      _queryParams['encryptedPassword'] = await _apiClient.encryptPassword(password!);
+    }
+
+    if (encryptedPassword != null) {
+      _queryParams['encryptedPassword'] = _apiClient.serializeToString(encryptedPassword) ?? "";
+    }
+
+    if (destFileName != null) {
+      _queryParams['destFileName'] = _apiClient.serializeToString(destFileName) ?? "";
+    }
+
+    if (revisionAuthor != null) {
+      _queryParams['revisionAuthor'] = _apiClient.serializeToString(revisionAuthor) ?? "";
+    }
+
+    if (revisionDateTime != null) {
+      _queryParams['revisionDateTime'] = _apiClient.serializeToString(revisionDateTime) ?? "";
+    }
+
+    if (document != null) {
+
+      var _formBody = _apiClient.serializeBody(document, 'Document');
+      if (_formBody != null) {
+        _bodyParts.add(_formBody);
+      }
+    }
+    else {
+      throw ApiException(400, 'Parameter document is required.');
+    }
+
+    for (final _fileContentPart in _fileContentParts) {
+        _fileContentPart.encryptPassword(_apiClient);
+        if (_fileContentPart.source == 'Request') {
+            _bodyParts.add(ApiRequestPart(_fileContentPart.content!, 'application/octet-stream', name: _fileContentPart.reference));
+        }
+    }
+    var _url = _apiClient.configuration.getApiRootUrl() + _apiClient.applyQueryParams(_path, _queryParams).replaceAll('//', '/');
+    var _body = _apiClient.serializeBodyParts(_bodyParts, _headers);
+    return ApiRequestData('PUT', _url, _headers, _body);
+  }
+
+  @override
+  dynamic deserializeResponse(final ApiClient _apiClient, final Map<String, String> _headers, final ByteData? _body) {
+    if (_body == null) {
+        return ApiException(400, "Nullable response body is not allowed for this operation type.");
+    }
+
+    return _apiClient.deserializeFilesCollection(BodyPartData(_headers['content-type'], _headers['filename'], _body));
+  }
+}
diff --git a/lib/src/requests/merge_with_next_request.dart b/lib/src/requests/merge_with_next_request.dart
diff --git a/lib/src/words_api.dart b/lib/src/words_api.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
diff --git a/test/aspose_words_cloud_tests.dart b/test/aspose_words_cloud_tests.dart
diff --git a/test/sections/section_tests.dart b/test/sections/section_tests.dart

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ node('words-linux') {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (packageTesting) {`
`40`		`- docker.image('dart:2.19.4').inside {`
	`40`	`+ docker.image('dart:stable').inside {`
`41`	`41`	`stage('prepare'){`
`42`	`42`	`sh "rm -rf lib"`
`43`	`43`	`sh "cp ./pubspec_package_testing.yaml ./pubspec.yaml"`
`@@ -61,7 +61,7 @@ node('words-linux') {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`else if (needToBuild) {`
`64`		`- docker.image('dart:2.19.4').inside {`
	`64`	`+ docker.image('dart:stable').inside {`
`65`	`65`	`stage('prepare'){`
`66`	`66`	`sh "dart pub get"`
`67`	`67`	`sh "dart pub global activate junitreport"`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,13 @@ class DrawingObjectInsert implements ModelBase {`
`87`	`87`	`set wrapType(DrawingObjectInsert_WrapTypeEnum? val) => _wrapType = val;`
`88`	`88`
`89`	`89`
	`90`	`+ /// Gets or sets a value indicating whether AspectRatioLocked option on or off.`
	`91`	`+ bool? _aspectRatioLocked;`
	`92`	`+`
	`93`	`+ bool? get aspectRatioLocked => _aspectRatioLocked;`
	`94`	`+ set aspectRatioLocked(bool? val) => _aspectRatioLocked = val;`
	`95`	`+`
	`96`	`+`
`90`	`97`	`@override`
`91`	`98`	`void deserialize(Map<String, dynamic>? json) {`
`92`	`99`	`if (json == null) {`
`@@ -171,6 +178,12 @@ class DrawingObjectInsert implements ModelBase {`
`171`	`178`	`} else {`
`172`	`179`	`wrapType = null;`
`173`	`180`	`}`
	`181`	`+`
	`182`	`+ if (json.containsKey('AspectRatioLocked')) {`
	`183`	`+ aspectRatioLocked = json['AspectRatioLocked'] as bool;`
	`184`	`+ } else {`
	`185`	`+ aspectRatioLocked = null;`
	`186`	`+ }`
`174`	`187`	`}`
`175`	`188`
`176`	`189`	`@override`
`@@ -238,6 +251,10 @@ class DrawingObjectInsert implements ModelBase {`
`238`	`251`	`default: break;`
`239`	`252`	`}`
`240`	`253`	`}`
	`254`	`+`
	`255`	`+ if (aspectRatioLocked != null) {`
	`256`	`+ _result['AspectRatioLocked'] = aspectRatioLocked!;`
	`257`	`+ }`
`241`	`258`	`return _result;`
`242`	`259`	`}`
`243`	`260`
`@@ -285,6 +302,7 @@ class DrawingObjectInsert implements ModelBase {`
`285`	`302`
`286`	`303`
`287`	`304`
	`305`	`+`
`288`	`306`	`}`
`289`	`307`	`}`
`290`	`308`