Merge branch 'develop' into master

Author: Marat-Gumerov

README.md

@@ -23,36 +23,12 @@ Aspose.Email Cloud is a REST API for creating email applications that work with
 - Email configuration discovery.
 - Disposable email address detection.
 
-## Enhancements in Version 20.12
+## Enhancements in Version 21.3
 
-Aspose.Email Cloud 20.12.0 comes with SDK breaking changes:
-- AppKey renamed to ClientSecret.
-- AppSID renamed to ClientId.
+- IMAP native threads support added to the built-in Email client.
+- New field ClientThreadMoveRequest.SourceFolder added to specify a folder to move a thread from.
 
-Some [SDK reference documentation](https://docs.aspose.cloud/email/reference-api/) improvements were made.
-
-## Enhancements in Version 20.10
-
-- All SDK functions are divided into groups (Email, Calendar, Contact, Client, Ai, Mapi, etc.).
-- Unified file API provided for supported file types (Save, Get, Convert, AsFile, FromFile, AsMapi/AsDto).
-- HierarchicalObject based API is removed.
-- All models are stored in one folder/namespace.
-- The request models are simplified
-
-## Enhancements in Version 20.9
-- Lets developers manipulate different emails' formats such as Outlook MSG, EML, VCard, and iCalendar files.
-- Supports AI functions:
-  - Business card recognition.
-  - The Name API for parsing and handling personal names.
-- Has a built-in email client. This client provides:
-  - Unified REST API for different email protocols: IMAP, POP3, SMTP, EWS, WebDav.
-  - Virtual multi-account.
-  - Message threads (POP3 accounts are also supported).
-- Email configuration discovery.
-- Disposable email address detection.
-
-
-See [Release notes](https://docs.aspose.cloud/email/release-notes/).
+See [Release notes](https://docs.aspose.cloud/email/aspose-email-cloud-21-3-release-notes/).
 
 ## How to use the SDK?
 The complete source code is available in the [GIT repository](https://github.com/aspose-email-cloud/aspose-email-cloud-java/tree/master/src/main/java/com/aspose/email/cloud/sdk).

docs/ClientThreadApi.md

@@ -304,6 +304,7 @@ See parameter model documentation at [ClientThreadMoveRequest](ClientThreadMoveR
 ```java
 ClientThreadMoveRequest request = Models.clientThreadMoveRequest()
     .destinationFolder("INBOX/SubFolder")
+    .sourceFolder("INBOX")
     .threadId("5")
     .accountLocation(Models.storageFileLocation()
         .fileName("email.account")
@@ -331,6 +332,7 @@ EmailCloud api = new EmailCloud(clientSecret, clientId);
 // Prepare parameters:
 ClientThreadMoveRequest request = Models.clientThreadMoveRequest()
     .destinationFolder("INBOX/SubFolder")
+    .sourceFolder("INBOX")
     .threadId("5")
     .accountLocation(Models.storageFileLocation()
         .fileName("email.account")

docs/ClientThreadMoveRequest.md

@@ -6,6 +6,7 @@ Email client move thread request.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **destinationFolder** | **String** | Email account folder to move thread to.              | 
+**sourceFolder** | **String** | Email account folder to move thread from.              |  [optional]
 
 ## Parent class
 
@@ -16,6 +17,7 @@ See: [ClientThreadBaseRequest](ClientThreadBaseRequest.md)
 ```java
 ClientThreadMoveRequest clientThreadMoveRequest = Models.clientThreadMoveRequest()
     .destinationFolder("INBOX/SubFolder")
+    .sourceFolder("INBOX")
     .threadId("5")
     .accountLocation(Models.storageFileLocation()
         .fileName("email.account")

pom.xml

@@ -4,7 +4,7 @@
   <artifactId>aspose-email-cloud</artifactId>
   <packaging>jar</packaging>
   <name>aspose-email-cloud</name>
-  <version>20.12.0</version>
+  <version>21.3.0.132</version>
   <url>https://github.com/aspose-email-cloud/aspose-email-cloud-java</url>
   <description>Aspose.Email Cloud SDK</description>
   <licenses>
@@ -43,7 +43,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
+      <plugin>  
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>

src/main/java/com/aspose/email/cloud/sdk/model/ClientThreadMoveRequest.java

@@ -45,6 +45,8 @@
 public class ClientThreadMoveRequest extends ClientThreadBaseRequest {
   @JsonProperty("destinationFolder")
   private String destinationFolder = null;
+  @JsonProperty("sourceFolder")
+  private String sourceFolder = null;
 
   /**
    * Set destinationFolder and return this.
@@ -73,6 +75,33 @@ public void setDestinationFolder(String destinationFolder) {
   }
 
 
+  /**
+   * Set sourceFolder and return this.
+   * @param sourceFolder Email account folder to move thread from.             
+   * @return this
+  **/
+  public ClientThreadMoveRequest sourceFolder(String sourceFolder) {
+    this.sourceFolder = sourceFolder;
+    return this;
+  }
+
+  /**
+   * Email account folder to move thread from.             
+   * @return sourceFolder
+  **/
+  public String getSourceFolder() {
+    return sourceFolder;
+  }  
+
+  /**
+   * Set sourceFolder.
+   * @param sourceFolder Email account folder to move thread from.             
+  **/
+  public void setSourceFolder(String sourceFolder) {
+    this.sourceFolder = sourceFolder;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
   if (this == o) {
@@ -83,12 +112,13 @@ public boolean equals(java.lang.Object o) {
   }
     ClientThreadMoveRequest clientThreadMoveRequest = (ClientThreadMoveRequest) o;
     return ObjectUtils.equals(this.destinationFolder, clientThreadMoveRequest.destinationFolder) &&
+    ObjectUtils.equals(this.sourceFolder, clientThreadMoveRequest.sourceFolder) &&
     super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return ObjectUtils.hashCodeMulti(destinationFolder, super.hashCode());
+    return ObjectUtils.hashCodeMulti(destinationFolder, sourceFolder, super.hashCode());
   }
 
 
@@ -100,6 +130,7 @@ public String toString() {
     sb.append("    accountLocation: ").append(toIndentedString(getAccountLocation())).append("\n");
     sb.append("    threadId: ").append(toIndentedString(getThreadId())).append("\n");
     sb.append("    destinationFolder: ").append(toIndentedString(getDestinationFolder())).append("\n");
+    sb.append("    sourceFolder: ").append(toIndentedString(getSourceFolder())).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -124,16 +155,19 @@ public ClientThreadMoveRequest() {
    * @param accountLocation Email client account configuration location on storage.             
    * @param threadId Thread identifier.             
    * @param destinationFolder Email account folder to move thread to.             
+   * @param sourceFolder Email account folder to move thread from.             
    */
   public ClientThreadMoveRequest(
     StorageFileLocation accountLocation,
     String threadId,
-    String destinationFolder
+    String destinationFolder,
+    String sourceFolder
   ) {
     super();
     setAccountLocation(accountLocation);
     setThreadId(threadId);
     setDestinationFolder(destinationFolder);
+    setSourceFolder(sourceFolder);
   }
 
 }

src/main/java/com/aspose/email/cloud/sdk/model/ClientThreadMoveRequestBuilder.java

@@ -83,4 +83,13 @@ public ClientThreadMoveRequestBuilder destinationFolder(String destinationFolder
         this.model.destinationFolder(destinationFolder);
         return this;
     }
+    /**
+     * Set ClientThreadMoveRequest.sourceFolder and return builder.
+     * @param sourceFolder Email account folder to move thread from.             
+     * @return builder
+    **/
+    public ClientThreadMoveRequestBuilder sourceFolder(String sourceFolder) {
+        this.model.sourceFolder(sourceFolder);
+        return this;
+    }
 }