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

Author: dynabic-billing-team

AsposeWordsCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AsposeWordsCloud'
-  s.version          = '23.8'
+  s.version          = '23.9'
   s.summary          = 'Aspose Words for Cloud.'
   s.homepage         = 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

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 23.9
+
+- Support for class inheritance in responses from the server.
+
+
 ## Enhancements in Version 23.6
 
 - Fix XMLHttpRequest in web applications.
@@ -283,7 +288,7 @@ Add link to this repository as dependency to your Package.swift:
 
 dependencies: [
     // Dependencies declare other packages that this package depends on.
-    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "23.8"),
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift", from: "23.9"),
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -301,7 +306,7 @@ targets: [
 Add link to git repository as dependency to your Podfile:
 
 ```ruby
-pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '23.8'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '23.9'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/ApiInvoker.swift

@@ -258,7 +258,7 @@ public class ApiInvoker {
                 var newAccessToken : String? = nil;
                 if (response.errorCode == self.httpStatusCodeOK) {
                     do {
-                        let result = try ObjectSerializer.deserialize(type: AccessTokenResult.self, from: response.data!);
+                        let result = try ObjectSerializer.deserializeInternal(type: AccessTokenResult.self, from: response.data!);
                         if (result.access_token != nil) {
                             newAccessToken = "Bearer " + result.access_token!;
                         }

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -188,6 +188,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "23.8";
+        return "23.9";
     }
 }

Sources/AsposeWordsCloud/Api/ObjectSerializer.swift

@@ -32,6 +32,7 @@ public enum WordsApiError : LocalizedError {
     case requestError(errorCode: Int, message: String?)
     case requiredArgumentError(argumentName: String)
     case invalidTypeSerialization(typeName: String)
+    case invalidTypeDeserialization(typeName: String)
     case invalidMultipartResponse(message: String)
     case badHostAddress(hostName: String)
     case notSupportedMethod(methodName: String)
@@ -44,6 +45,8 @@ public enum WordsApiError : LocalizedError {
                 return "Required argument \(argumentName) not present.";
             case let .invalidTypeSerialization(typeName):
                 return "Failed to serialize type '\(typeName)'.";
+            case let .invalidTypeDeserialization(typeName):
+                return "Failed to deserialize type '\(typeName)'.";
             case let .invalidMultipartResponse(message):
                 return "Failed to parse multipart response: \(message).";
             case let .badHostAddress(hostName):

Sources/AsposeWordsCloud/Api/WordsApiError.swift

@@ -30,5 +30,6 @@ import Foundation
 // General protocol for all models.
 @available(macOS 10.12, iOS 10.3, watchOS 3.3, tvOS 12.0, *)
 public protocol WordsApiModel {
+    init(from json: [String: Any]) throws;
     func collectFilesContent(_ resultFilesContent : inout [FileReference]);
 }

Sources/AsposeWordsCloud/Api/WordsApiModel.swift

@@ -102,6 +102,20 @@ public class ApiError : Codable, WordsApiModel {
     public init() {
     }
 
+    public required init(from json: [String: Any]) throws {
+        self.code = json["Code"] as? String;
+        if let raw_dateTime = json["DateTime"] as? String {
+            self.dateTime = ObjectSerializer.customIso8601.date(from: raw_dateTime);
+        }
+
+        self.description = json["Description"] as? String;
+        if let raw_innerError = json["InnerError"] as? [String: Any] {
+            self.innerError = try ObjectSerializer.deserialize(type: ApiError.self, from: raw_innerError);
+        }
+
+        self.message = json["Message"] as? String;
+    }
+
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self);
         self.code = try container.decodeIfPresent(String.self, forKey: .code);

Sources/AsposeWordsCloud/Model/ApiError.swift

@@ -77,6 +77,43 @@ public class AvailableFontsResponse : WordsResponse {
         super.init();
     }
 
+    public required init(from json: [String: Any]) throws {
+        try super.init(from: json);
+        if let raw_additionalFonts = json["AdditionalFonts"] as? [Any] {
+            self.additionalFonts = try raw_additionalFonts.map {
+                if let element_additionalFonts = $0 as? [String: Any] {
+                    return try ObjectSerializer.deserialize(type: FontInfo.self, from: element_additionalFonts);
+                }
+                else {
+                    throw WordsApiError.invalidTypeDeserialization(typeName: "FontInfo");
+                }
+            };
+        }
+
+        if let raw_customFonts = json["CustomFonts"] as? [Any] {
+            self.customFonts = try raw_customFonts.map {
+                if let element_customFonts = $0 as? [String: Any] {
+                    return try ObjectSerializer.deserialize(type: FontInfo.self, from: element_customFonts);
+                }
+                else {
+                    throw WordsApiError.invalidTypeDeserialization(typeName: "FontInfo");
+                }
+            };
+        }
+
+        if let raw_systemFonts = json["SystemFonts"] as? [Any] {
+            self.systemFonts = try raw_systemFonts.map {
+                if let element_systemFonts = $0 as? [String: Any] {
+                    return try ObjectSerializer.deserialize(type: FontInfo.self, from: element_systemFonts);
+                }
+                else {
+                    throw WordsApiError.invalidTypeDeserialization(typeName: "FontInfo");
+                }
+            };
+        }
+
+    }
+
     public required init(from decoder: Decoder) throws {
         try super.init(from: decoder);
         let container = try decoder.container(keyedBy: CodingKeys.self);

Sources/AsposeWordsCloud/Model/AvailableFontsResponse.swift

@@ -50,6 +50,13 @@ public class BaseEntry : Codable, WordsApiModel {
     internal init() {
     }
 
+    public required init(from json: [String: Any]) throws {
+        if let raw_fileReference = json["FileReference"] as? [String: Any] {
+            self.fileReference = try ObjectSerializer.deserialize(type: FileReference.self, from: raw_fileReference);
+        }
+
+    }
+
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self);
         self.fileReference = try container.decodeIfPresent(FileReference.self, forKey: .fileReference);