Skip to content

Commit a706619

Browse files
update to v.19.07
1 parent 3e25b79 commit a706619

File tree

235 files changed

+60367
-15579
lines changed

Some content is hidden

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

235 files changed

+60367
-15579
lines changed

.classpath

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
<attribute name="maven.pomderived" value="true"/>
66
</attributes>
77
</classpathentry>
8-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_201">
9-
<attributes>
10-
<attribute name="maven.pomderived" value="true"/>
11-
</attributes>
12-
</classpathentry>
138
<classpathentry kind="src" output="target/classes" path="src/main/java">
149
<attributes>
1510
<attribute name="optional" value="true"/>
@@ -18,10 +13,12 @@
1813
</classpathentry>
1914
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
2015
<attributes>
16+
<attribute name="test" value="true"/>
2117
<attribute name="optional" value="true"/>
2218
<attribute name="maven.pomderived" value="true"/>
2319
</attributes>
2420
</classpathentry>
2521
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2623
<classpathentry kind="output" path="target/classes"/>
2724
</classpath>

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ hs_err_pid*
1515
**/target
1616
target
1717
build
18+
testresult/

.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.compliance=1.7
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1212
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
1313
org.eclipse.jdt.core.compiler.release=disabled
14-
org.eclipse.jdt.core.compiler.source=1.8
14+
org.eclipse.jdt.core.compiler.source=1.7

README.md

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Add this dependency to your project's POM:
4141
<dependency>
4242
<groupId>com.aspose</groupId>
4343
<artifactId>aspose-html-cloud</artifactId>
44-
<version>1.0.0</version>
44+
<version>1.1.0</version>
4545
<scope>compile</scope>
4646
</dependency>
4747
```
@@ -50,33 +50,16 @@ Add this dependency to your project's POM:
5050

5151
At first generate the JAR by executing:
5252

53-
mvn package
53+
mvn package -DskipTests
5454

5555
Then manually install the following JARs:
5656

57-
* target/aspose-html-cloud-1.0.0.jar
57+
* target/aspose-html-cloud-19.5.0.jar
5858
* target/lib/*.jar
5959

6060
### Sample usage
6161

62-
Before fill all fields in /setting/config.json
63-
64-
Example:
65-
```json
66-
{
67-
"basePath":"https://api.aspose.cloud/v1.1",
68-
"authPath":"https://api.aspose.cloud/oauth2/token",
69-
"apiKey":"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
70-
"appSID":"XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
71-
"storage":"\\data\\",
72-
"testdata":"\\testdata\\",
73-
"defaultUserAgent":"Webkit",
74-
"debug": false
75-
}
76-
```
77-
7862
```java
79-
8063
import com.aspose.html.client.invoker.*;
8164
import com.aspose.html.client.invoker.auth.*;
8265
import com.aspose.html.client.api.ConversionApi;
@@ -87,8 +70,16 @@ import java.util.*;
8770
public class ConversionApiExample {
8871

8972
public static void main(String[] args) {
90-
91-
ConversionApi apiInstance = new ConversionApi();
73+
74+
Configuration.setAPI_KEY("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
75+
Configuration.setAPP_SID("XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
76+
Configuration.setBasePath("https://api.aspose.cloud/v3.0");
77+
Configuration.setAuthPath("https://api.aspose.cloud/connect/token");
78+
Configuration.setUserAgent("WebKit");
79+
Configuration.setDebug(true);
80+
81+
ConversionApi api = new ApiClient().createService(ConversionApi.class);
82+
9283
String name = "name_example"; // String | Document name.
9384
String outFormat = "jpg"; // String | Resulting image format.
9485
Integer width = 800; // Integer | Resulting image width.
@@ -97,12 +88,11 @@ public class ConversionApiExample {
9788
Integer rightMargin = 10; // Integer | Right resulting image margin.
9889
Integer topMargin = 10; // Integer | Top resulting image margin.
9990
Integer bottomMargin = 10; // Integer | Bottom resulting image margin.
100-
Integer xResolution = 300; // Integer | Horizontal resolution of resulting image.
101-
Integer yResolution = 300; // Integer | Vertical resolution of resulting image.
91+
Integer resolution = 300; // Integer | Resolution of resulting image.
10292
String folder = "folder_example"; // String | The document folder.
10393
String storage = "storage_example"; // String | The document storage.
10494
try {
105-
File result = apiInstance.GetConvertDocumentToImage(name, outFormat, width, height, leftMargin, rightMargin, topMargin, bottomMargin, xResolution, yResolution, folder, storage);
95+
File result = apiInstance.GetConvertDocumentToImage(name, outFormat, width, height, leftMargin, rightMargin, topMargin, bottomMargin, resolution, folder, storage);
10696

10797
//Save to test directory
10898
File copyFile = new File("~/testdir/test.jpg");
@@ -113,16 +103,16 @@ public class ConversionApiExample {
113103
}
114104
}
115105
}
116-
117106
```
107+
118108
# Documentation for API Endpoints
119109

120-
All URIs are relative to *https://api.aspose.cloud/v1.1*
110+
All URIs are relative to *https://api.aspose.cloud/v3.0*
121111

122112

123113
## ConversionApi
124114
- Input format (html, epub, svg)
125-
- Output format for images (jpeg, png, bmp, tiff)
115+
- Output format for images (jpeg, png, bmp, tiff, gif)
126116

127117
Method | HTTP request | Description
128118
------------- | ------------- | -------------
@@ -132,17 +122,26 @@ Method | HTTP request | Description
132122
**GetConvertDocumentToPdfByUrl** | **GET** html/convert/pdf | Convert the HTML page from the web by its URL to PDF.
133123
**GetConvertDocumentToXps** | **GET** html/{name}/convert/xps | Convert the HTML document from the storage by its name to XPS.
134124
**GetConvertDocumentToXpsByUrl** | **GET** html/convert/xps | Convert the HTML page from the web by its URL to XPS.
135-
**PutConvertDocumentInRequestToImage** | **PUT** html/convert/image/{outFormat} | Converts the HTML document (in request content) to the specified image format and uploads resulting file to storage.
136-
**PutConvertDocumentInRequestToPdf** | **PUT** html/convert/pdf | Converts the HTML document (in request content) to PDF and uploads resulting file to storage.
137-
**PutConvertDocumentInRequestToXps** | **PUT** html/convert/xps | Converts the HTML document (in request content) to XPS and uploads resulting file to storage.
125+
**PostConvertDocumentInRequestToImage** | **POST** html/convert/image/{outFormat} | Converts the HTML document (in request content) to the specified image format and uploads resulting file to storage.
126+
**PostConvertDocumentInRequestToPdf** | **POST** html/convert/pdf | Converts the HTML document (in request content) to PDF and uploads resulting file to storage.
127+
**PostConvertDocumentInRequestToXps** | **POST** html/convert/xps | Converts the HTML document (in request content) to XPS and uploads resulting file to storage.
138128
**PutConvertDocumentToImage** | **PUT** html/{name}/convert/image/{outFormat} | Converts the HTML document (located on storage) to the specified image format and uploads resulting file to storage.
139129
**PutConvertDocumentToPdf** | **PUT** html/{name}/convert/pdf | Converts the HTML document (located on storage) to PDF and uploads resulting file to storage.
140130
**PutConvertDocumentToXps** | **PUT** html/{name}/convert/xps | Converts the HTML document (located on storage) to XPS and uploads resulting file to storage.
141131
**GetConvertDocumentToMHTMLByUrl** | **GET** /html/convert/mhtml | Converts the HTML page from Web by its URL to MHTML returns resulting file in response content.
142132
**GetConvertDocumentToMarkdown** | **GET** /html/{name}/convert/md | Converts the HTML document (located on storage) to Markdown and returns resulting file in response content.
143-
**PutConvertDocumentInRequestToMarkdown** | **PUT** /html/convert/md | Converts the HTML document (in request content) to Markdown and uploads resulting file to storage by specified path.
133+
**PostConvertDocumentInRequestToMarkdown** | **POST** /html/convert/md | Converts the HTML document (in request content) to Markdown and uploads resulting file to storage by specified path.
144134
**PutConvertDocumentToMarkdown** | **PUT** /html/{name}/convert/md | Converts the HTML document (located on storage) to Markdown and uploads resulting file to storage by specified path.
145135

136+
## ImportApi
137+
138+
Method | HTTP request | Description
139+
------------- | ------------- | -------------
140+
**GetConvertMarkdownToHtml** | **GET** /html/{name}/import/md | Converts the Markdown document (located on storage) to HTML and returns resulting file in response content.
141+
**PostConvertMarkdownInRequestToHtml** | **POST** /html/{name}/import/md | Converts the Markdown document (in request content) to HTML and uploads resulting file to storage by specified path.
142+
**PutConvertMarkdownToHtml** | **PUT** /html/import/md | Converts the Markdown document (located on storage) to HTML and uploads resulting file to storage by specified path.
143+
144+
146145
## DocumentApi
147146

148147
Method | HTTP request | Description
@@ -180,8 +179,8 @@ Method | HTTP request | Description
180179

181180
Method | HTTP request | Description
182181
------------- | ------------- | -------------
183-
*GetMergeHtmlTemplate* | **GET** /html/{templateName}/merge | Populate HTML document template with data located as a file in the storage.
184-
*PutMergeHtmlTemplate* | **PUT** /html/{templateName}/merge | Populate HTML document template with data from the request body. Result document will be saved to storage.
182+
**GetMergeHtmlTemplate** | **GET** /html/{templateName}/merge | Populate HTML document template with data located as a file in the storage.
183+
**PostMergeHtmlTemplate** | **POST** /html/{templateName}/merge | Populate HTML document template with data from the request body. Result document will be saved to storage.
185184

186185

187186
## Recommendation

0 commit comments

Comments
 (0)