Skip to content

Commit d6ce798

Browse files
YaroslawEkimovYaroslawEkimov
committed
Merge branch 'master' into release
2 parents 7cd3264 + c7b4392 commit d6ce798

File tree

379 files changed

+4804
-1454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+4804
-1454
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<artifactId>aspose-words-cloud</artifactId>
55
<packaging>jar</packaging>
66
<name>AsposeWordsCloud</name>
7-
<version>20.3.0</version>
7+
<version>20.4.0</version>
88
<url>https://www.aspose.cloud/</url>
99
<description>Aspose Words Java SDK</description>
1010
<scm>

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

Lines changed: 304 additions & 275 deletions
Large diffs are not rendered by default.

‎src/main/java/com/aspose/words/cloud/model/ApiError.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
32-
import com.aspose.words.cloud.model.ApiError;
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3339
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3442
import io.swagger.annotations.ApiModel;
3543
import io.swagger.annotations.ApiModelProperty;
36-
import org.threeten.bp.OffsetDateTime;
3744

3845
/**
3946
* Api error.
4047
*/
4148
@ApiModel(description = "Api error.")
42-
4349
public class ApiError {
4450
@SerializedName("Code")
4551
private String code = null;
@@ -134,10 +140,10 @@ public ApiError innerError(ApiError innerError) {
134140
}
135141

136142
/**
137-
* Gets or sets inner error.
143+
* Get innerError
138144
* @return innerError
139145
**/
140-
@ApiModelProperty(value = "Gets or sets inner error.")
146+
@ApiModelProperty(value = "")
141147
public ApiError getInnerError() {
142148
return innerError;
143149
}

‎src/main/java/com/aspose/words/cloud/model/AvailableFontsResponse.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
32-
import com.aspose.words.cloud.model.FontInfo;
33-
import com.aspose.words.cloud.model.WordsResponse;
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3439
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3542
import io.swagger.annotations.ApiModel;
3643
import io.swagger.annotations.ApiModelProperty;
3744

38-
import java.util.ArrayList;
39-
import java.util.List;
40-
4145
/**
4246
* The list of fonts, available for document processing.
4347
*/
4448
@ApiModel(description = "The list of fonts, available for document processing.")
45-
4649
public class AvailableFontsResponse extends WordsResponse {
4750
@SerializedName("AdditionalFonts")
4851
private List<FontInfo> additionalFonts = null;

‎src/main/java/com/aspose/words/cloud/model/BmpSaveOptionsData.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
32-
import com.aspose.words.cloud.model.ImageSaveOptionsData;
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
39+
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3342
import io.swagger.annotations.ApiModel;
43+
import io.swagger.annotations.ApiModelProperty;
3444

3545
/**
3646
* Container class for bmp save options.
3747
*/
3848
@ApiModel(description = "Container class for bmp save options.")
39-
4049
public class BmpSaveOptionsData extends ImageSaveOptionsData {
4150

4251
@Override

‎src/main/java/com/aspose/words/cloud/model/Bookmark.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
32-
import com.aspose.words.cloud.model.LinkElement;
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3339
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3442
import io.swagger.annotations.ApiModel;
3543
import io.swagger.annotations.ApiModelProperty;
3644

3745
/**
3846
* Represents a single bookmark.
3947
*/
4048
@ApiModel(description = "Represents a single bookmark.")
41-
4249
public class Bookmark extends LinkElement {
4350
@SerializedName("Name")
4451
private String name = null;

‎src/main/java/com/aspose/words/cloud/model/BookmarkData.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3239
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3342
import io.swagger.annotations.ApiModel;
3443
import io.swagger.annotations.ApiModelProperty;
3544

3645
/**
3746
* DTO for bookmark updating.
3847
*/
3948
@ApiModel(description = "DTO for bookmark updating.")
40-
4149
public class BookmarkData {
4250
@SerializedName("Name")
4351
private String name = null;

‎src/main/java/com/aspose/words/cloud/model/BookmarkResponse.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
32-
import com.aspose.words.cloud.model.Bookmark;
33-
import com.aspose.words.cloud.model.WordsResponse;
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3439
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3542
import io.swagger.annotations.ApiModel;
3643
import io.swagger.annotations.ApiModelProperty;
3744

3845
/**
3946
* This response should be returned by the service when handling: GET bookmarks/{bookmarkName}.
4047
*/
4148
@ApiModel(description = "This response should be returned by the service when handling: GET bookmarks/{bookmarkName}.")
42-
4349
public class BookmarkResponse extends WordsResponse {
4450
@SerializedName("Bookmark")
4551
private Bookmark bookmark = null;
@@ -50,10 +56,10 @@ public BookmarkResponse bookmark(Bookmark bookmark) {
5056
}
5157

5258
/**
53-
* Gets or sets bookmark.
59+
* Get bookmark
5460
* @return bookmark
5561
**/
56-
@ApiModelProperty(value = "Gets or sets bookmark.")
62+
@ApiModelProperty(value = "")
5763
public Bookmark getBookmark() {
5864
return bookmark;
5965
}

‎src/main/java/com/aspose/words/cloud/model/Bookmarks.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
32-
import com.aspose.words.cloud.model.Bookmark;
33-
import com.aspose.words.cloud.model.LinkElement;
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3439
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3542
import io.swagger.annotations.ApiModel;
3643
import io.swagger.annotations.ApiModelProperty;
3744

38-
import java.util.ArrayList;
39-
import java.util.List;
40-
4145
/**
4246
* Represents an array of bookmarks.
4347
*/
4448
@ApiModel(description = "Represents an array of bookmarks.")
45-
4649
public class Bookmarks extends LinkElement {
4750
@SerializedName("BookmarkList")
4851
private List<Bookmark> bookmarkList = null;

‎src/main/java/com/aspose/words/cloud/model/BookmarksOutlineLevelData.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,24 @@
2828
package com.aspose.words.cloud.model;
2929

3030
import java.util.Objects;
31-
31+
import java.util.Arrays;
32+
import java.util.ArrayList;
33+
import java.util.List;
34+
import java.io.IOException;
35+
import org.threeten.bp.OffsetDateTime;
36+
import com.aspose.words.cloud.model.*;
37+
import com.google.gson.TypeAdapter;
38+
import com.google.gson.annotations.JsonAdapter;
3239
import com.google.gson.annotations.SerializedName;
40+
import com.google.gson.stream.JsonReader;
41+
import com.google.gson.stream.JsonWriter;
3342
import io.swagger.annotations.ApiModel;
3443
import io.swagger.annotations.ApiModelProperty;
3544

3645
/**
3746
* container class for individual bookmarks outline level.
3847
*/
3948
@ApiModel(description = "container class for individual bookmarks outline level.")
40-
4149
public class BookmarksOutlineLevelData {
4250
@SerializedName("Name")
4351
private String name = null;
@@ -72,7 +80,7 @@ public BookmarksOutlineLevelData bookmarksOutlineLevel(Integer bookmarksOutlineL
7280
* Gets or sets specify the bookmark&#39;s level.
7381
* @return bookmarksOutlineLevel
7482
**/
75-
@ApiModelProperty(required = true, value = "Gets or sets specify the bookmark's level.")
83+
@ApiModelProperty(value = "Gets or sets specify the bookmark's level.")
7684
public Integer getBookmarksOutlineLevel() {
7785
return bookmarksOutlineLevel;
7886
}

0 commit comments

Comments
 (0)