Skip to content

Commit d01c3ff

Browse files
YaroslawEkimovYaroslawEkimov
committed
Merge branch 'master' into release
2 parents 8a866b1 + c6cfe2b commit d01c3ff

File tree

759 files changed

+1640
-1220
lines changed

Some content is hidden

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

759 files changed

+1640
-1220
lines changed

‎README.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,23 @@ 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.1
17+
18+
- Added support for InsertAfterNode in the insert API without NodePath.
19+
- Added support for inserting nodes (runs/rows/cells/bookmarks) without NodePath.
20+
- Added support for transparency in the Watermark API.
21+
- Added support for password and encryptedPassword fields in FileReference.
22+
- Fixed missing href value in document responses.
23+
24+
1625
## Enhancements in Version 23.12
1726

1827
- Properties Name, Text, StartRange, EndRange marked as required for InsertBookmark operation.
1928
- Implemented DeleteOfficeMathObjects operation to delete all office math objects from document.
2029
- Parameter ProtectionRequest was removed from the UnprotectDocument operation. Now removing protection from a document does not require a password.
2130
- Model ProtectionRequest marked as deprecated, please use ProtectionRequestV2 instead for perform ProtectDocument operation. To change the password or protection type of protected document, the old password is no required.
31+
- Added fields Password and EncryptedPassword to FileReference for documents encrypted by password.
32+
- Removed parameter encryptedPassword2 from CompareDocument method. Please use FileReference password instead.
2233

2334

2435
## Enhancements in Version 23.11
@@ -317,7 +328,7 @@ Add this dependency to your project's POM:
317328
<dependency>
318329
<groupId>com.aspose</groupId>
319330
<artifactId>aspose-words-cloud</artifactId>
320-
<version>23.12.0</version>
331+
<version>24.1.0</version>
321332
</dependency>
322333
</dependencies>
323334
```

‎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>23.12.0</version>
7+
<version>24.1.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/ApiCallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="ApiCallback.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

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

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="ApiClient.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -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 = "23.12";
62+
private String clientVersion = "24.1";
6363
private boolean debugging = false;
6464
private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
6565
private String tempFolderPath = null;
@@ -827,7 +827,14 @@ public Request buildRequest(String path, String method, List<Pair> queryParams,
827827
RequestBody reqBody = null;
828828
if (HttpMethod.permitsRequestBody(method)) {
829829
String contentType = headerParams.get("Content-Type");
830-
int partsCount = formParams.size() + filesContentParams.size();
830+
int partsCount = formParams.size();
831+
for (FileReference fileReference : filesContentParams) {
832+
fileReference.encryptPassword(this);
833+
if ("Request".equals(fileReference.getSource())) {
834+
partsCount = partsCount + 1;
835+
}
836+
}
837+
831838
if ("application/x-www-form-urlencoded".equals(contentType)) {
832839
reqBody = buildRequestBodyFormEncoding(formParams);
833840
}
@@ -974,9 +981,11 @@ public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams, Lis
974981
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
975982
mpBuilder.addPart(partHeaders, serialize(param.getValue()));
976983
}
977-
for (FileReference param : fileParams) {
978-
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getReference() + "\"");
979-
mpBuilder.addPart(partHeaders, RequestBody.create(MediaType.parse("application/octet-stream"), param.getContent()));
984+
for (FileReference fileRef : fileParams) {
985+
if ("Request".equals(fileRef.getSource())) {
986+
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + fileRef.getReference() + "\"");
987+
mpBuilder.addPart(partHeaders, RequestBody.create(MediaType.parse("application/octet-stream"), fileRef.getContent()));
988+
}
980989
}
981990
}
982991
return mpBuilder.build();
@@ -1224,7 +1233,7 @@ public Object parseBatchPart(RequestIfc apiRequest, Request sysRequest, BodyPart
12241233
* Encrypt string to base64-encoded string
12251234
*/
12261235
public String encrypt(String data) throws ApiException, IOException {
1227-
if (data != null && !data.isEmpty()) {
1236+
if (data == null || data.isEmpty()) {
12281237
return null;
12291238
}
12301239

‎src/main/java/com/aspose/words/cloud/ApiException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="ApiException.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎src/main/java/com/aspose/words/cloud/ApiLoggingInterceptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="ApiLoggingInterceptor.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎src/main/java/com/aspose/words/cloud/ApiResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="ApiResponse.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎src/main/java/com/aspose/words/cloud/ChildRequestContent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="ChildRequestContent.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎src/main/java/com/aspose/words/cloud/Configuration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="Configuration.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

‎src/main/java/com/aspose/words/cloud/EncryptorFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* --------------------------------------------------------------------------------
33
* <copyright company="Aspose" file="EncryptorFactory.java">
4-
* Copyright (c) 2023 Aspose.Words for Cloud
4+
* Copyright (c) 2024 Aspose.Words for Cloud
55
* </copyright>
66
* <summary>
77
* Permission is hereby granted, free of charge, to any person obtaining a copy

0 commit comments

Comments
 (0)