Skip to content

Commit 43ab364

Browse files
Merge branch 'master' into release
2 parents ef32e82 + 15756d0 commit 43ab364

File tree

14 files changed

+1209
-6
lines changed

14 files changed

+1209
-6
lines changed

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ This repository contains Aspose.Words Cloud SDK for Java source code. This SDK a
1313
* Watermarks and protection
1414
* Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
1515

16+
## Enhancements in Version 24.11
17+
18+
- Added GetAllRevisions method to obtain all available revisions in document.
19+
- Added AppendAllEntriesToOneSection parameter to AppendDocument method to append entries to the same section.
20+
21+
1622
## Enhancements in Version 24.9
1723

1824
- Added digital signature methds for DOC, DOCX, XPS, or ODT documents.
@@ -369,7 +375,7 @@ Add this dependency to your project's POM:
369375
<dependency>
370376
<groupId>com.aspose</groupId>
371377
<artifactId>aspose-words-cloud</artifactId>
372-
<version>24.10.0</version>
378+
<version>24.11.0</version>
373379
</dependency>
374380
</dependencies>
375381
```
26 KB
Binary file not shown.

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>24.10.0</version>
7+
<version>24.11.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/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ApiClient {
5959
private String apiVersion = "v4.0";
6060
private String baseUrl = "https://api.aspose.cloud";
6161
private String basePath = baseUrl + "/" + apiVersion;
62-
private String clientVersion = "24.10";
62+
private String clientVersion = "24.11";
6363
private boolean debugging = false;
6464
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
6565
private String tempFolderPath = null;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,10 @@ public static class ModelAdapterFactory implements TypeAdapterFactory {
595595
put("ReplaceTextParameters, _", com.aspose.words.cloud.model.ReplaceTextParameters.class);
596596
put("ReplaceTextResponse, _", com.aspose.words.cloud.model.ReplaceTextResponse.class);
597597
put("ReportEngineSettings, _", com.aspose.words.cloud.model.ReportEngineSettings.class);
598+
put("Revision, _", com.aspose.words.cloud.model.Revision.class);
599+
put("RevisionCollection, _", com.aspose.words.cloud.model.RevisionCollection.class);
598600
put("RevisionsModificationResponse, _", com.aspose.words.cloud.model.RevisionsModificationResponse.class);
601+
put("RevisionsResponse, _", com.aspose.words.cloud.model.RevisionsResponse.class);
599602
put("RtfSaveOptionsData, _", com.aspose.words.cloud.model.RtfSaveOptionsData.class);
600603
put("Run, _", com.aspose.words.cloud.model.Run.class);
601604
put("RunInsert, _", com.aspose.words.cloud.model.RunInsert.class);

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

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6571,6 +6571,152 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
65716571
return call;
65726572
}
65736573

6574+
@SuppressWarnings("rawtypes")
6575+
private com.squareup.okhttp.Call getAllRevisionsValidateBeforeCall(GetAllRevisionsRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
6576+
return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));
6577+
}
6578+
6579+
/**
6580+
* Get all information about revisions.
6581+
* @param request Request object
6582+
* @return RevisionsResponse
6583+
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
6584+
* @throws IOException If fail to serialize the request body object
6585+
*/
6586+
public RevisionsResponse getAllRevisions(GetAllRevisionsRequest request) throws ApiException, MessagingException, IOException {
6587+
try {
6588+
ApiResponse< RevisionsResponse > resp = getAllRevisionsWithHttpInfo(request);
6589+
return resp.getData();
6590+
}
6591+
catch (ApiException ex) {
6592+
if (ex.getCode() == apiClient.getNotAuthCode()) {
6593+
apiClient.requestToken();
6594+
ApiResponse< RevisionsResponse > resp = getAllRevisionsWithHttpInfo(request);
6595+
return resp.getData();
6596+
}
6597+
throw ex;
6598+
}
6599+
}
6600+
6601+
/**
6602+
* Get all information about revisions.
6603+
* @param request Request object
6604+
* @return ApiResponse< RevisionsResponse >;
6605+
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
6606+
* @throws IOException If fail to serialize the request body object
6607+
*/
6608+
private ApiResponse< RevisionsResponse > getAllRevisionsWithHttpInfo(GetAllRevisionsRequest request) throws ApiException, MessagingException, IOException {
6609+
com.squareup.okhttp.Call call = getAllRevisionsValidateBeforeCall(request, null, null);
6610+
return apiClient.execute(call, request);
6611+
}
6612+
6613+
/**
6614+
* Get all information about revisions. (asynchronously)
6615+
* @param request Request object
6616+
* @param callback The callback to be executed when the API call finishes
6617+
* @return The request call
6618+
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
6619+
* @throws IOException If fail to serialize the request body object
6620+
*/
6621+
public com.squareup.okhttp.Call getAllRevisionsAsync(GetAllRevisionsRequest request, final ApiCallback< RevisionsResponse > callback) throws ApiException, MessagingException, IOException {
6622+
6623+
ProgressResponseBody.ProgressListener progressListener = null;
6624+
ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
6625+
6626+
if (callback != null) {
6627+
progressListener = new ProgressResponseBody.ProgressListener() {
6628+
@Override
6629+
public void update(long bytesRead, long contentLength, boolean done) {
6630+
callback.onDownloadProgress(bytesRead, contentLength, done);
6631+
}
6632+
};
6633+
6634+
progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
6635+
@Override
6636+
public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
6637+
callback.onUploadProgress(bytesWritten, contentLength, done);
6638+
}
6639+
};
6640+
}
6641+
6642+
com.squareup.okhttp.Call call = getAllRevisionsValidateBeforeCall(request, progressListener, progressRequestListener);
6643+
apiClient.executeAsync(call, request, callback);
6644+
return call;
6645+
}
6646+
6647+
@SuppressWarnings("rawtypes")
6648+
private com.squareup.okhttp.Call getAllRevisionsOnlineValidateBeforeCall(GetAllRevisionsOnlineRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
6649+
return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));
6650+
}
6651+
6652+
/**
6653+
* Get all information about revisions.
6654+
* @param request Request object
6655+
* @return RevisionsResponse
6656+
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
6657+
* @throws IOException If fail to serialize the request body object
6658+
*/
6659+
public RevisionsResponse getAllRevisionsOnline(GetAllRevisionsOnlineRequest request) throws ApiException, MessagingException, IOException {
6660+
try {
6661+
ApiResponse< RevisionsResponse > resp = getAllRevisionsOnlineWithHttpInfo(request);
6662+
return resp.getData();
6663+
}
6664+
catch (ApiException ex) {
6665+
if (ex.getCode() == apiClient.getNotAuthCode()) {
6666+
apiClient.requestToken();
6667+
ApiResponse< RevisionsResponse > resp = getAllRevisionsOnlineWithHttpInfo(request);
6668+
return resp.getData();
6669+
}
6670+
throw ex;
6671+
}
6672+
}
6673+
6674+
/**
6675+
* Get all information about revisions.
6676+
* @param request Request object
6677+
* @return ApiResponse< RevisionsResponse >;
6678+
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
6679+
* @throws IOException If fail to serialize the request body object
6680+
*/
6681+
private ApiResponse< RevisionsResponse > getAllRevisionsOnlineWithHttpInfo(GetAllRevisionsOnlineRequest request) throws ApiException, MessagingException, IOException {
6682+
com.squareup.okhttp.Call call = getAllRevisionsOnlineValidateBeforeCall(request, null, null);
6683+
return apiClient.execute(call, request);
6684+
}
6685+
6686+
/**
6687+
* Get all information about revisions. (asynchronously)
6688+
* @param request Request object
6689+
* @param callback The callback to be executed when the API call finishes
6690+
* @return The request call
6691+
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
6692+
* @throws IOException If fail to serialize the request body object
6693+
*/
6694+
public com.squareup.okhttp.Call getAllRevisionsOnlineAsync(GetAllRevisionsOnlineRequest request, final ApiCallback< RevisionsResponse > callback) throws ApiException, MessagingException, IOException {
6695+
6696+
ProgressResponseBody.ProgressListener progressListener = null;
6697+
ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
6698+
6699+
if (callback != null) {
6700+
progressListener = new ProgressResponseBody.ProgressListener() {
6701+
@Override
6702+
public void update(long bytesRead, long contentLength, boolean done) {
6703+
callback.onDownloadProgress(bytesRead, contentLength, done);
6704+
}
6705+
};
6706+
6707+
progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
6708+
@Override
6709+
public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
6710+
callback.onUploadProgress(bytesWritten, contentLength, done);
6711+
}
6712+
};
6713+
}
6714+
6715+
com.squareup.okhttp.Call call = getAllRevisionsOnlineValidateBeforeCall(request, progressListener, progressRequestListener);
6716+
apiClient.executeAsync(call, request, callback);
6717+
return call;
6718+
}
6719+
65746720
@SuppressWarnings("rawtypes")
65756721
private com.squareup.okhttp.Call getAvailableFontsValidateBeforeCall(GetAvailableFontsRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
65766722
return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,33 @@
4848
*/
4949
@ApiModel(description = "Represents a list of documents which will be appended to the original resource document.")
5050
public class DocumentEntryList extends BaseEntryList {
51+
@SerializedName("AppendAllEntriesToOneSection")
52+
protected Boolean appendAllEntriesToOneSection;
53+
5154
@SerializedName("ApplyBaseDocumentHeadersAndFootersToAppendingDocuments")
5255
protected Boolean applyBaseDocumentHeadersAndFootersToAppendingDocuments;
5356

5457
@SerializedName("DocumentEntries")
5558
protected List<DocumentEntry> documentEntries;
59+
/**
60+
* Gets or sets a value indicating whether to append all documents to the same section.
61+
* @return appendAllEntriesToOneSection
62+
**/
63+
@ApiModelProperty(value = "Gets or sets a value indicating whether to append all documents to the same section.")
64+
public Boolean getAppendAllEntriesToOneSection() {
65+
return appendAllEntriesToOneSection;
66+
}
67+
68+
public DocumentEntryList appendAllEntriesToOneSection(Boolean appendAllEntriesToOneSection) {
69+
this.appendAllEntriesToOneSection = appendAllEntriesToOneSection;
70+
return this;
71+
}
72+
73+
public void setAppendAllEntriesToOneSection(Boolean appendAllEntriesToOneSection) {
74+
this.appendAllEntriesToOneSection = appendAllEntriesToOneSection;
75+
}
76+
77+
5678
/**
5779
* Gets or sets a value indicating whether to apply headers and footers from base document to appending documents. The default value is true.
5880
* @return applyBaseDocumentHeadersAndFootersToAppendingDocuments
@@ -102,6 +124,7 @@ public void setDocumentEntries(List<DocumentEntry> documentEntries) {
102124

103125
public DocumentEntryList() {
104126
super();
127+
this.appendAllEntriesToOneSection = null;
105128
this.applyBaseDocumentHeadersAndFootersToAppendingDocuments = null;
106129
this.documentEntries = null;
107130
}
@@ -155,20 +178,22 @@ public boolean equals(java.lang.Object o) {
155178

156179
DocumentEntryList documentEntryList = (DocumentEntryList) o;
157180
return
181+
Objects.equals(this.appendAllEntriesToOneSection, documentEntryList.appendAllEntriesToOneSection) &&
158182
Objects.equals(this.applyBaseDocumentHeadersAndFootersToAppendingDocuments, documentEntryList.applyBaseDocumentHeadersAndFootersToAppendingDocuments) &&
159183
Objects.equals(this.documentEntries, documentEntryList.documentEntries) &&
160184
super.equals(o);
161185
}
162186

163187
@Override
164188
public int hashCode() {
165-
return Objects.hash(applyBaseDocumentHeadersAndFootersToAppendingDocuments, documentEntries, super.hashCode());
189+
return Objects.hash(appendAllEntriesToOneSection, applyBaseDocumentHeadersAndFootersToAppendingDocuments, documentEntries, super.hashCode());
166190
}
167191

168192
@Override
169193
public String toString() {
170194
StringBuilder sb = new StringBuilder();
171195
sb.append("class DocumentEntryList {\n");
196+
sb.append(" appendAllEntriesToOneSection: ").append(toIndentedString(getAppendAllEntriesToOneSection())).append("\n");
172197
sb.append(" applyBaseDocumentHeadersAndFootersToAppendingDocuments: ").append(toIndentedString(getApplyBaseDocumentHeadersAndFootersToAppendingDocuments())).append("\n");
173198
sb.append(" documentEntries: ").append(toIndentedString(getDocumentEntries())).append("\n");
174199
sb.append("}");

0 commit comments

Comments
 (0)