Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,19 @@ 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.6
+
+- Added 'DeleteBookmark' and 'DeleteBookmarkOnline' API methods for delete bookmarks by name from the document.
+- Added 'DeleteBookmarks' and 'DeleteBookmarksOnline' API methods for delete all bookmarks from the document.
+- Added 'InsertBookmark' and 'InsertBookmarkOnline' API methods for create new bookmarks in the document.
+- Support all save formats for 'CreateDocument' operation.
+
+
+## Enhancements in Version 22.5
+
+- Internal API fixes and improvments.
+
+
 ## Enhancements in Version 22.4
 
 - Added ExportShapesAsSvg to HtmlSaveOption.
@@ -212,7 +225,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>22.5.0</version>
+        <version>22.6.0</version>
     </dependency>
 </dependencies>
 ```

TestData/DocumentElements/Sections/Source.docx

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

pom.xml

@@ -58,7 +58,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.5";
+    private String clientVersion = "22.6";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;

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

@@ -0,0 +1,142 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="BookmarkInsert.java">
+ *   Copyright (c) 2022 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>
+ * --------------------------------------------------------------------------------
+ */
+
+package com.aspose.words.cloud.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+import java.io.IOException;
+import org.threeten.bp.OffsetDateTime;
+import com.aspose.words.cloud.model.*;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Represents a bookmark to insert.
+ */
+@ApiModel(description = "Represents a bookmark to insert.")
+public class BookmarkInsert extends BookmarkData {
+    @SerializedName("EndRange")
+    protected DocumentPosition endRange;
+
+    @SerializedName("StartRange")
+    protected DocumentPosition startRange;
+    /**
+     * Gets or sets the link to end bookmark node.
+    * @return endRange
+    **/
+    @ApiModelProperty(value = "Gets or sets the link to end bookmark node.")
+    public DocumentPosition getEndRange() {
+        return endRange;
+    }
+
+    public BookmarkInsert endRange(DocumentPosition endRange) {
+        this.endRange = endRange;
+        return this;
+    }
+
+    public void setEndRange(DocumentPosition endRange) {
+        this.endRange = endRange;
+    }
+
+
+    /**
+     * Gets or sets the link to start bookmark node.
+    * @return startRange
+    **/
+    @ApiModelProperty(value = "Gets or sets the link to start bookmark node.")
+    public DocumentPosition getStartRange() {
+        return startRange;
+    }
+
+    public BookmarkInsert startRange(DocumentPosition startRange) {
+        this.startRange = startRange;
+        return this;
+    }
+
+    public void setStartRange(DocumentPosition startRange) {
+        this.startRange = startRange;
+    }
+
+
+    public BookmarkInsert() {
+        super();
+        this.endRange = null;
+        this.startRange = null;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BookmarkInsert bookmarkInsert = (BookmarkInsert) o;
+        return
+            Objects.equals(this.endRange, bookmarkInsert.endRange) &&
+            Objects.equals(this.startRange, bookmarkInsert.startRange) &&
+            super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(endRange, startRange, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BookmarkInsert {\n");
+    sb.append("    name: ").append(toIndentedString(getName())).append("\n");
+    sb.append("    text: ").append(toIndentedString(getText())).append("\n");
+    sb.append("    endRange: ").append(toIndentedString(getEndRange())).append("\n");
+    sb.append("    startRange: ").append(toIndentedString(getStartRange())).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}

src/main/java/com/aspose/words/cloud/api/WordsApi.java

@@ -132,8 +132,6 @@ public String toString() {
     sb.append("    exportPageSetup: ").append(toIndentedString(getExportPageSetup())).append("\n");
     sb.append("    exportRelativeFontSize: ").append(toIndentedString(getExportRelativeFontSize())).append("\n");
     sb.append("    exportRoundtripInformation: ").append(toIndentedString(getExportRoundtripInformation())).append("\n");
-    sb.append("    exportShapesAsSvg: ").append(toIndentedString(getExportShapesAsSvg())).append("\n");
-    sb.append("    exportTextBoxAsSvg: ").append(toIndentedString(getExportTextBoxAsSvg())).append("\n");
     sb.append("    exportTextInputFormFieldAsText: ").append(toIndentedString(getExportTextInputFormFieldAsText())).append("\n");
     sb.append("    exportTocPageNumbers: ").append(toIndentedString(getExportTocPageNumbers())).append("\n");
     sb.append("    exportXhtmlTransitional: ").append(toIndentedString(getExportXhtmlTransitional())).append("\n");

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

@@ -489,12 +489,6 @@ public TableWidthOutputModeEnum read(final JsonReader jsonReader) throws IOExcep
     @SerializedName("ExportRoundtripInformation")
     protected Boolean exportRoundtripInformation;
 
-    @SerializedName("ExportShapesAsSvg")
-    protected Boolean exportShapesAsSvg;
-
-    @SerializedName("ExportTextBoxAsSvg")
-    protected Boolean exportTextBoxAsSvg;
-
     @SerializedName("ExportTextInputFormFieldAsText")
     protected Boolean exportTextInputFormFieldAsText;
 
@@ -933,45 +927,6 @@ public void setExportRoundtripInformation(Boolean exportRoundtripInformation) {
     }
 
 
-    /**
-     * Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.
-    * @return exportShapesAsSvg
-    **/
-    @ApiModelProperty(value = "Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.")
-    public Boolean getExportShapesAsSvg() {
-        return exportShapesAsSvg;
-    }
-
-    public HtmlSaveOptionsData exportShapesAsSvg(Boolean exportShapesAsSvg) {
-        this.exportShapesAsSvg = exportShapesAsSvg;
-        return this;
-    }
-
-    public void setExportShapesAsSvg(Boolean exportShapesAsSvg) {
-        this.exportShapesAsSvg = exportShapesAsSvg;
-    }
-
-
-    /**
-     * Gets or sets the flag, that controls how textboxes represented by Aspose.Words.Drawing.Shape are saved to HTML, MHTML or EPUB. The default value is false.
-     * When set to true, exports textboxes as inline "svg" elements. When false, exports as "image" elements.
-    * @return exportTextBoxAsSvg
-    **/
-    @ApiModelProperty(value = "Gets or sets the flag, that controls how textboxes represented by Aspose.Words.Drawing.Shape are saved to HTML, MHTML or EPUB. The default value is false. When set to true, exports textboxes as inline \"svg\" elements. When false, exports as \"image\" elements.")
-    public Boolean getExportTextBoxAsSvg() {
-        return exportTextBoxAsSvg;
-    }
-
-    public HtmlSaveOptionsData exportTextBoxAsSvg(Boolean exportTextBoxAsSvg) {
-        this.exportTextBoxAsSvg = exportTextBoxAsSvg;
-        return this;
-    }
-
-    public void setExportTextBoxAsSvg(Boolean exportTextBoxAsSvg) {
-        this.exportTextBoxAsSvg = exportTextBoxAsSvg;
-    }
-
-
     /**
      * Gets or sets the flag, that controls how text input form fields are saved.
     * @return exportTextInputFormFieldAsText
@@ -1341,8 +1296,6 @@ public HtmlSaveOptionsData() {
         this.exportPageSetup = null;
         this.exportRelativeFontSize = null;
         this.exportRoundtripInformation = null;
-        this.exportShapesAsSvg = null;
-        this.exportTextBoxAsSvg = null;
         this.exportTextInputFormFieldAsText = null;
         this.exportTocPageNumbers = null;
         this.exportXhtmlTransitional = null;
@@ -1395,8 +1348,6 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.exportPageSetup, htmlSaveOptionsData.exportPageSetup) &&
             Objects.equals(this.exportRelativeFontSize, htmlSaveOptionsData.exportRelativeFontSize) &&
             Objects.equals(this.exportRoundtripInformation, htmlSaveOptionsData.exportRoundtripInformation) &&
-            Objects.equals(this.exportShapesAsSvg, htmlSaveOptionsData.exportShapesAsSvg) &&
-            Objects.equals(this.exportTextBoxAsSvg, htmlSaveOptionsData.exportTextBoxAsSvg) &&
             Objects.equals(this.exportTextInputFormFieldAsText, htmlSaveOptionsData.exportTextInputFormFieldAsText) &&
             Objects.equals(this.exportTocPageNumbers, htmlSaveOptionsData.exportTocPageNumbers) &&
             Objects.equals(this.exportXhtmlTransitional, htmlSaveOptionsData.exportXhtmlTransitional) &&
@@ -1420,7 +1371,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowNegativeIndent, cssClassNamePrefix, cssStyleSheetFileName, cssStyleSheetType, documentSplitCriteria, documentSplitHeadingLevel, encoding, exportDocumentProperties, exportDropDownFormFieldAsText, exportFontResources, exportFontsAsBase64, exportHeadersFootersMode, exportImagesAsBase64, exportLanguageInformation, exportListLabels, exportOriginalUrlForLinkedImages, exportPageMargins, exportPageSetup, exportRelativeFontSize, exportRoundtripInformation, exportShapesAsSvg, exportTextBoxAsSvg, exportTextInputFormFieldAsText, exportTocPageNumbers, exportXhtmlTransitional, fontResourcesSubsettingSizeThreshold, fontsFolder, fontsFolderAlias, htmlVersion, imageResolution, imagesFolder, imagesFolderAlias, metafileFormat, officeMathOutputMode, prettyFormat, resolveFontNames, resourceFolder, resourceFolderAlias, scaleImageToShapeSize, tableWidthOutputMode, super.hashCode());
+    return Objects.hash(allowNegativeIndent, cssClassNamePrefix, cssStyleSheetFileName, cssStyleSheetType, documentSplitCriteria, documentSplitHeadingLevel, encoding, exportDocumentProperties, exportDropDownFormFieldAsText, exportFontResources, exportFontsAsBase64, exportHeadersFootersMode, exportImagesAsBase64, exportLanguageInformation, exportListLabels, exportOriginalUrlForLinkedImages, exportPageMargins, exportPageSetup, exportRelativeFontSize, exportRoundtripInformation, exportTextInputFormFieldAsText, exportTocPageNumbers, exportXhtmlTransitional, fontResourcesSubsettingSizeThreshold, fontsFolder, fontsFolderAlias, htmlVersion, imageResolution, imagesFolder, imagesFolderAlias, metafileFormat, officeMathOutputMode, prettyFormat, resolveFontNames, resourceFolder, resourceFolderAlias, scaleImageToShapeSize, tableWidthOutputMode, super.hashCode());
   }
 
   @Override
@@ -1461,8 +1412,6 @@ public String toString() {
     sb.append("    exportPageSetup: ").append(toIndentedString(getExportPageSetup())).append("\n");
     sb.append("    exportRelativeFontSize: ").append(toIndentedString(getExportRelativeFontSize())).append("\n");
     sb.append("    exportRoundtripInformation: ").append(toIndentedString(getExportRoundtripInformation())).append("\n");
-    sb.append("    exportShapesAsSvg: ").append(toIndentedString(getExportShapesAsSvg())).append("\n");
-    sb.append("    exportTextBoxAsSvg: ").append(toIndentedString(getExportTextBoxAsSvg())).append("\n");
     sb.append("    exportTextInputFormFieldAsText: ").append(toIndentedString(getExportTextInputFormFieldAsText())).append("\n");
     sb.append("    exportTocPageNumbers: ").append(toIndentedString(getExportTocPageNumbers())).append("\n");
     sb.append("    exportXhtmlTransitional: ").append(toIndentedString(getExportXhtmlTransitional())).append("\n");

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

@@ -132,8 +132,6 @@ public String toString() {
     sb.append("    exportPageSetup: ").append(toIndentedString(getExportPageSetup())).append("\n");
     sb.append("    exportRelativeFontSize: ").append(toIndentedString(getExportRelativeFontSize())).append("\n");
     sb.append("    exportRoundtripInformation: ").append(toIndentedString(getExportRoundtripInformation())).append("\n");
-    sb.append("    exportShapesAsSvg: ").append(toIndentedString(getExportShapesAsSvg())).append("\n");
-    sb.append("    exportTextBoxAsSvg: ").append(toIndentedString(getExportTextBoxAsSvg())).append("\n");
     sb.append("    exportTextInputFormFieldAsText: ").append(toIndentedString(getExportTextInputFormFieldAsText())).append("\n");
     sb.append("    exportTocPageNumbers: ").append(toIndentedString(getExportTocPageNumbers())).append("\n");
     sb.append("    exportXhtmlTransitional: ").append(toIndentedString(getExportXhtmlTransitional())).append("\n");