Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,11 @@ This repository contains Aspose.Words Cloud SDK for Java source code. This SDK a
 * 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 22.11
+
+- Added 'EmbedAttachments' property for PdfSaveOptionsData class.
+
+
 ## Enhancements in Version 22.10
 
 - Added 'CacheHeaderFooterShapes' property for PdfSaveOptionsData class.
@@ -251,7 +256,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>22.10.0</version>
+        <version>22.11.0</version>
     </dependency>
 </dependencies>
 ```

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>aspose-words-cloud</artifactId>
     <packaging>jar</packaging>
     <name>AsposeWordsCloud</name>
-    <version>22.10.0</version>
+    <version>22.11.0</version>
     <url>https://www.aspose.cloud/</url>
     <description>Aspose Words Java SDK</description>
     <scm>

src/main/java/com/aspose/words/cloud/ApiClient.java

@@ -59,7 +59,7 @@ public class ApiClient {
     private String apiVersion = "v4.0";
     private String baseUrl = "https://api.aspose.cloud";
     private String basePath = baseUrl + "/" + apiVersion;
-    private String clientVersion = "22.10";
+    private String clientVersion = "22.11";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;

src/main/java/com/aspose/words/cloud/model/CsvDataLoadOptions.java

@@ -44,8 +44,9 @@
 
 /**
  * Represents options for parsing CSV data.
+ * To learn more, visit the LINQ Reporting Engine documentation article.
  */
-@ApiModel(description = "Represents options for parsing CSV data.")
+@ApiModel(description = "Represents options for parsing CSV data. To learn more, visit the LINQ Reporting Engine documentation article.")
 public class CsvDataLoadOptions implements ModelIfc {
     @SerializedName("CommentChar")
     protected String commentChar;

src/main/java/com/aspose/words/cloud/model/PdfSaveOptionsData.java

@@ -434,8 +434,8 @@ public ZoomBehaviorEnum read(final JsonReader jsonReader) throws IOException {
         }
     }
 
-    @SerializedName("CacheHeaderFooterShapes")
-    protected Boolean cacheHeaderFooterShapes;
+    @SerializedName("CacheBackgroundGraphics")
+    protected Boolean cacheBackgroundGraphics;
 
     @SerializedName("Compliance")
     protected ComplianceEnum compliance;
@@ -455,6 +455,9 @@ public ZoomBehaviorEnum read(final JsonReader jsonReader) throws IOException {
     @SerializedName("DownsampleOptions")
     protected DownsampleOptionsData downsampleOptions;
 
+    @SerializedName("EmbedAttachments")
+    protected Boolean embedAttachments;
+
     @SerializedName("EmbedFullFonts")
     protected Boolean embedFullFonts;
 
@@ -512,21 +515,21 @@ public ZoomBehaviorEnum read(final JsonReader jsonReader) throws IOException {
     @SerializedName("ZoomFactor")
     protected Integer zoomFactor;
     /**
-     * Gets or sets a value indicating whether or not to cache shapes placed in header and footer of document.
-    * @return cacheHeaderFooterShapes
+     * Gets or sets a value determining whether or not to cache graphics placed in document's background.
+    * @return cacheBackgroundGraphics
     **/
-    @ApiModelProperty(value = "Gets or sets a value indicating whether or not to cache shapes placed in header and footer of document.")
-    public Boolean getCacheHeaderFooterShapes() {
-        return cacheHeaderFooterShapes;
+    @ApiModelProperty(value = "Gets or sets a value determining whether or not to cache graphics placed in document's background.")
+    public Boolean getCacheBackgroundGraphics() {
+        return cacheBackgroundGraphics;
     }
 
-    public PdfSaveOptionsData cacheHeaderFooterShapes(Boolean cacheHeaderFooterShapes) {
-        this.cacheHeaderFooterShapes = cacheHeaderFooterShapes;
+    public PdfSaveOptionsData cacheBackgroundGraphics(Boolean cacheBackgroundGraphics) {
+        this.cacheBackgroundGraphics = cacheBackgroundGraphics;
         return this;
     }
 
-    public void setCacheHeaderFooterShapes(Boolean cacheHeaderFooterShapes) {
-        this.cacheHeaderFooterShapes = cacheHeaderFooterShapes;
+    public void setCacheBackgroundGraphics(Boolean cacheBackgroundGraphics) {
+        this.cacheBackgroundGraphics = cacheBackgroundGraphics;
     }
 
 
@@ -647,6 +650,25 @@ public void setDownsampleOptions(DownsampleOptionsData downsampleOptions) {
     }
 
 
+    /**
+     * Gets or sets a value determining whether or not to embed attachments to the PDF document.
+    * @return embedAttachments
+    **/
+    @ApiModelProperty(value = "Gets or sets a value determining whether or not to embed attachments to the PDF document.")
+    public Boolean getEmbedAttachments() {
+        return embedAttachments;
+    }
+
+    public PdfSaveOptionsData embedAttachments(Boolean embedAttachments) {
+        this.embedAttachments = embedAttachments;
+        return this;
+    }
+
+    public void setEmbedAttachments(Boolean embedAttachments) {
+        this.embedAttachments = embedAttachments;
+    }
+
+
     /**
      * Gets or sets a value indicating whether fonts are embedded into the resulting PDF documents.
     * @return embedFullFonts
@@ -1011,13 +1033,14 @@ public void setZoomFactor(Integer zoomFactor) {
 
     public PdfSaveOptionsData() {
         super();
-        this.cacheHeaderFooterShapes = null;
+        this.cacheBackgroundGraphics = null;
         this.compliance = null;
         this.createNoteHyperlinks = null;
         this.customPropertiesExport = null;
         this.digitalSignatureDetails = null;
         this.displayDocTitle = null;
         this.downsampleOptions = null;
+        this.embedAttachments = null;
         this.embedFullFonts = null;
         this.encryptionDetails = null;
         this.exportDocumentStructure = null;
@@ -1060,13 +1083,14 @@ public boolean equals(java.lang.Object o) {
 
         PdfSaveOptionsData pdfSaveOptionsData = (PdfSaveOptionsData) o;
         return
-            Objects.equals(this.cacheHeaderFooterShapes, pdfSaveOptionsData.cacheHeaderFooterShapes) &&
+            Objects.equals(this.cacheBackgroundGraphics, pdfSaveOptionsData.cacheBackgroundGraphics) &&
             Objects.equals(this.compliance, pdfSaveOptionsData.compliance) &&
             Objects.equals(this.createNoteHyperlinks, pdfSaveOptionsData.createNoteHyperlinks) &&
             Objects.equals(this.customPropertiesExport, pdfSaveOptionsData.customPropertiesExport) &&
             Objects.equals(this.digitalSignatureDetails, pdfSaveOptionsData.digitalSignatureDetails) &&
             Objects.equals(this.displayDocTitle, pdfSaveOptionsData.displayDocTitle) &&
             Objects.equals(this.downsampleOptions, pdfSaveOptionsData.downsampleOptions) &&
+            Objects.equals(this.embedAttachments, pdfSaveOptionsData.embedAttachments) &&
             Objects.equals(this.embedFullFonts, pdfSaveOptionsData.embedFullFonts) &&
             Objects.equals(this.encryptionDetails, pdfSaveOptionsData.encryptionDetails) &&
             Objects.equals(this.exportDocumentStructure, pdfSaveOptionsData.exportDocumentStructure) &&
@@ -1091,7 +1115,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(cacheHeaderFooterShapes, compliance, createNoteHyperlinks, customPropertiesExport, digitalSignatureDetails, displayDocTitle, downsampleOptions, embedFullFonts, encryptionDetails, exportDocumentStructure, exportLanguageToSpanTag, fontEmbeddingMode, headerFooterBookmarksExportMode, imageColorSpaceExportMode, imageCompression, interpolateImages, openHyperlinksInNewWindow, outlineOptions, pageMode, preblendImages, preserveFormFields, textCompression, useBookFoldPrintingSettings, useCoreFonts, zoomBehavior, zoomFactor, super.hashCode());
+    return Objects.hash(cacheBackgroundGraphics, compliance, createNoteHyperlinks, customPropertiesExport, digitalSignatureDetails, displayDocTitle, downsampleOptions, embedAttachments, embedFullFonts, encryptionDetails, exportDocumentStructure, exportLanguageToSpanTag, fontEmbeddingMode, headerFooterBookmarksExportMode, imageColorSpaceExportMode, imageCompression, interpolateImages, openHyperlinksInNewWindow, outlineOptions, pageMode, preblendImages, preserveFormFields, textCompression, useBookFoldPrintingSettings, useCoreFonts, zoomBehavior, zoomFactor, super.hashCode());
   }
 
   @Override
@@ -1118,13 +1142,14 @@ public String toString() {
     sb.append("    optimizeOutput: ").append(toIndentedString(getOptimizeOutput())).append("\n");
     sb.append("    pageCount: ").append(toIndentedString(getPageCount())).append("\n");
     sb.append("    pageIndex: ").append(toIndentedString(getPageIndex())).append("\n");
-    sb.append("    cacheHeaderFooterShapes: ").append(toIndentedString(getCacheHeaderFooterShapes())).append("\n");
+    sb.append("    cacheBackgroundGraphics: ").append(toIndentedString(getCacheBackgroundGraphics())).append("\n");
     sb.append("    compliance: ").append(toIndentedString(getCompliance())).append("\n");
     sb.append("    createNoteHyperlinks: ").append(toIndentedString(getCreateNoteHyperlinks())).append("\n");
     sb.append("    customPropertiesExport: ").append(toIndentedString(getCustomPropertiesExport())).append("\n");
     sb.append("    digitalSignatureDetails: ").append(toIndentedString(getDigitalSignatureDetails())).append("\n");
     sb.append("    displayDocTitle: ").append(toIndentedString(getDisplayDocTitle())).append("\n");
     sb.append("    downsampleOptions: ").append(toIndentedString(getDownsampleOptions())).append("\n");
+    sb.append("    embedAttachments: ").append(toIndentedString(getEmbedAttachments())).append("\n");
     sb.append("    embedFullFonts: ").append(toIndentedString(getEmbedFullFonts())).append("\n");
     sb.append("    encryptionDetails: ").append(toIndentedString(getEncryptionDetails())).append("\n");
     sb.append("    exportDocumentStructure: ").append(toIndentedString(getExportDocumentStructure())).append("\n");

src/main/java/com/aspose/words/cloud/model/XmlDataLoadOptions.java

@@ -44,8 +44,9 @@
 
 /**
  * Represents options for XML data loading.
+ * To learn more, visit the LINQ Reporting Engine documentation article.
  */
-@ApiModel(description = "Represents options for XML data loading.")
+@ApiModel(description = "Represents options for XML data loading. To learn more, visit the LINQ Reporting Engine documentation article.")
 public class XmlDataLoadOptions implements ModelIfc {
     @SerializedName("AlwaysGenerateRootObject")
     protected Boolean alwaysGenerateRootObject;

src/test/java/com/aspose/words/cloud/api/pageSetup/TestPageSetup.java

@@ -189,7 +189,7 @@ public void testGetRenderPage() throws ApiException, MessagingException, IOExcep
         RenderPageRequest request = new RenderPageRequest(
             remoteFileName,
             1,
-            "bmp",
+            "jpg",
             remoteDataFolder,
             null,
             null,
@@ -212,7 +212,7 @@ public void testGetRenderPageOnline() throws ApiException, MessagingException, I
         RenderPageOnlineRequest request = new RenderPageOnlineRequest(
             requestDocument,
             1,
-            "bmp",
+            "jpg",
             null,
             null,
             null,