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

Author: ivan-kishchenko-aspose

README.md

@@ -13,6 +13,11 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 24.4
+
+- Added the 'MergeWithNext' method to merge a section with the next one.
+
+
 ## Enhancements in Version 24.3
 
 - Added support for 'RemoveEmptyCells' option for the 'Cleanup' parameter in the insert 'MailMerge' API method.

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -89,7 +89,7 @@ public class ApiInvoker {
     }
 
     // Internal function for prepare files content list
-    public func prepareFilesContent(_ requestFilesContent : inout [FileReference]) {
+    public func prepareFilesContent(_ requestFilesContent : inout [FileReference]) throws {
 #if os(Linux)
         // Encryption of passwords not supported on linux
 #else

Sources/AsposeWordsCloud/Api/WordsAPI.swift

@@ -13391,6 +13391,101 @@ public class WordsAPI : Encryptor {
         return responseObject!;
     }
 
+    // Async representation of mergeWithNext method
+    // Merge the section with the next one.
+    public func mergeWithNext(request : MergeWithNextRequest, callback : @escaping (_ error : Error?) -> ()) {
+        do {
+            if (self.apiInvoker == nil) {
+    #if os(Linux)
+                self.apiInvoker = ApiInvoker(configuration: configuration);
+    #else
+                self.apiInvoker = ApiInvoker(configuration: configuration, encryptor: self);
+    #endif
+            }
+
+            apiInvoker!.invoke(
+                apiRequestData: try request.createApiRequestData(apiInvoker: self.apiInvoker!, configuration: self.configuration),
+                callback: { response, headers, error in
+                    callback(error);
+                }
+            );
+        }
+        catch let error {
+            callback(error);
+        }
+    }
+
+    // Sync representation of mergeWithNext method
+    // Merge the section with the next one.
+    public func mergeWithNext(request : MergeWithNextRequest) throws {
+        let semaphore = DispatchSemaphore(value: 0);
+        var responseError : Error? = nil;
+        self.mergeWithNext(request : request, callback: { error in
+            responseError = error;
+            semaphore.signal();
+        });
+
+        _ = semaphore.wait();
+
+        if (responseError != nil) {
+            throw responseError!;
+        }
+    }
+
+    // Async representation of mergeWithNextOnline method
+    // Merge the section with the next one.
+    public func mergeWithNextOnline(request : MergeWithNextOnlineRequest, callback : @escaping (_ response : [String: Data]?, _ error : Error?) -> ()) {
+        do {
+            if (self.apiInvoker == nil) {
+    #if os(Linux)
+                self.apiInvoker = ApiInvoker(configuration: configuration);
+    #else
+                self.apiInvoker = ApiInvoker(configuration: configuration, encryptor: self);
+    #endif
+            }
+
+            apiInvoker!.invoke(
+                apiRequestData: try request.createApiRequestData(apiInvoker: self.apiInvoker!, configuration: self.configuration),
+                callback: { response, headers, error in
+                    if (error != nil) {
+                        callback(nil, error);
+                    }
+                    else {
+                        do {
+                            callback(try request.deserializeResponse(data: response!, headers: headers) as? [String: Data], nil);
+                        }
+                        catch let deserializeError {
+                            callback(nil, deserializeError);
+                        }
+                    }
+                }
+            );
+        }
+        catch let error {
+            callback(nil, error);
+        }
+    }
+
+    // Sync representation of mergeWithNextOnline method
+    // Merge the section with the next one.
+    public func mergeWithNextOnline(request : MergeWithNextOnlineRequest) throws -> [String: Data] {
+        let semaphore = DispatchSemaphore(value: 0);
+        var responseObject : [String: Data]? = nil;
+        var responseError : Error? = nil;
+        self.mergeWithNextOnline(request : request, callback: { response, error in
+            responseObject = response;
+            responseError = error;
+            semaphore.signal();
+        });
+
+        _ = semaphore.wait();
+
+        if (responseError != nil) {
+            throw responseError!;
+        }
+        return responseObject!;
+    }
+
     // Async representation of moveFile method
     // Move file.
     public func moveFile(request : MoveFileRequest, callback : @escaping (_ error : Error?) -> ()) {

Sources/AsposeWordsCloud/Model/Requests/AcceptAllRevisionsOnlineRequest.swift

@@ -141,7 +141,7 @@ public class AcceptAllRevisionsOnlineRequest : WordsApiRequest {
          var requestFilesContent = [FileReference]();
          formParams.append(RequestFormParam(name: "document", body: try ObjectSerializer.serializeFile(value: self.getDocument()), contentType: "application/octet-stream"));
 
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));

Sources/AsposeWordsCloud/Model/Requests/AcceptAllRevisionsRequest.swift

@@ -181,7 +181,7 @@ public class AcceptAllRevisionsRequest : WordsApiRequest {
          }
          var formParams = [RequestFormParam]();
          var requestFilesContent = [FileReference]();
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));

Sources/AsposeWordsCloud/Model/Requests/AppendDocumentOnlineRequest.swift

@@ -193,7 +193,7 @@ public class AppendDocumentOnlineRequest : WordsApiRequest {
          self.getDocumentList().collectFilesContent(&requestFilesContent);
          try self.getDocumentList().validate();
 
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));

Sources/AsposeWordsCloud/Model/Requests/AppendDocumentRequest.swift

@@ -233,7 +233,7 @@ public class AppendDocumentRequest : WordsApiRequest {
          self.getDocumentList().collectFilesContent(&requestFilesContent);
          try self.getDocumentList().validate();
 
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));

Sources/AsposeWordsCloud/Model/Requests/ApplyStyleToDocumentElementOnlineRequest.swift

@@ -203,7 +203,7 @@ public class ApplyStyleToDocumentElementOnlineRequest : WordsApiRequest {
          self.getStyleApply().collectFilesContent(&requestFilesContent);
          try self.getStyleApply().validate();
 
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));

Sources/AsposeWordsCloud/Model/Requests/ApplyStyleToDocumentElementRequest.swift

@@ -243,7 +243,7 @@ public class ApplyStyleToDocumentElementRequest : WordsApiRequest {
          self.getStyleApply().collectFilesContent(&requestFilesContent);
          try self.getStyleApply().validate();
 
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));

Sources/AsposeWordsCloud/Model/Requests/BuildReportOnlineRequest.swift

@@ -103,7 +103,7 @@ public class BuildReportOnlineRequest : WordsApiRequest {
          self.getReportEngineSettings().collectFilesContent(&requestFilesContent);
          try self.getReportEngineSettings().validate();
 
-         apiInvoker.prepareFilesContent(&requestFilesContent);
+         try apiInvoker.prepareFilesContent(&requestFilesContent);
          for requestFileReference in requestFilesContent {
              if (requestFileReference.source == "Request") {
                  formParams.append(RequestFormParam(name: requestFileReference.reference, body: try ObjectSerializer.serializeFile(value: requestFileReference.content), contentType: "application/octet-stream"));