Skip to content

Commit b2a1ac7

Browse files
jonas-jasasjonas-jasas
committed
Merge branch 'develop'
# Conflicts: # README.md # examples/src/main/java/com/convertapi/examples/AlternativeConverter.java
2 parents 2800ade + 3d2495a commit b2a1ac7

37 files changed

+429
-202
lines changed

‎README.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,16 @@ You can get your free API secret at https://www.convertapi.com/a
1212

1313
## Installation
1414

15-
Download **[latest JAR file](https://github.com/ConvertAPI/convertapi-java/releases/download/v1.6/convertapi-1.6.jar)** and place it in your project library directory.
15+
### Maven
16+
17+
Add the following dependency to your pom.xml:
18+
```xml
19+
<dependency>
20+
<groupId>com.convertapi.client</groupId>
21+
<artifactId>convertapi</artifactId>
22+
<version>2.2</version>
23+
</dependency>
24+
```
1625

1726
## Usage
1827

@@ -93,7 +102,7 @@ import com.convertapi.ConvertApi;
93102

94103
public class SimpleConversion {
95104
public static void main(String[] args) {
96-
ConvertApi.convertFile("source.docx", "result.pdf", "your-api-secret");
105+
ConvertApi.convert("source.docx", "result.pdf", "your-api-secret");
97106
}
98107
}
99108
```

‎convertapi-java.iml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
4-
<exclude-output />
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
56
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
710
<excludeFolder url="file://$MODULE_DIR$/.idea" />
811
<excludeFolder url="file://$MODULE_DIR$/lib" />
9-
<excludeFolder url="file://$MODULE_DIR$/src/com/convertapi/examples" />
12+
<excludeFolder url="file://$MODULE_DIR$/src/main/java/com/convertapi/examples" />
13+
<excludeFolder url="file://$MODULE_DIR$/target" />
1014
</content>
1115
<orderEntry type="inheritedJdk" />
1216
<orderEntry type="sourceFolder" forTests="false" />
1317
<orderEntry type="library" exported="" name="lib" level="project" />
18+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
19+
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
20+
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
1421
</component>
1522
</module>

‎convertapi.iml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
4-
<exclude-output />
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
56
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7-
<excludeFolder url="file://$MODULE_DIR$/.idea" />
8-
<excludeFolder url="file://$MODULE_DIR$/lib" />
9-
<excludeFolder url="file://$MODULE_DIR$/src/com/convertapi/examples" />
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
10+
<excludeFolder url="file://$MODULE_DIR$/target" />
1011
</content>
1112
<orderEntry type="inheritedJdk" />
1213
<orderEntry type="sourceFolder" forTests="false" />
13-
<orderEntry type="library" exported="" name="lib" level="project" />
14+
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
15+
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
16+
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
1417
</component>
1518
</module>

‎examples/pom.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>com.convertapi.client</groupId>
4+
<artifactId>examples</artifactId>
5+
<packaging>jar</packaging>
6+
7+
<version>1.0-SNAPSHOT</version>
8+
<name>Examples for ConvertAPI Java Client</name>
9+
<properties>
10+
<maven.compiler.source>1.8</maven.compiler.source>
11+
<maven.compiler.target>1.8</maven.compiler.target>
12+
</properties>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>com.convertapi.client</groupId>
17+
<artifactId>convertapi</artifactId>
18+
<version>2.2</version>
19+
</dependency>
20+
</dependencies>
21+
22+
<build>
23+
<resources>
24+
<resource>
25+
<directory>src/main/resources</directory>
26+
<includes>
27+
<include>test.docx</include>
28+
<include>test.pdf</include>
29+
</includes>
30+
</resource>
31+
</resources>
32+
</build>
33+
34+
</project>

src/com/convertapi/examples/Advanced.java renamed to examples/src/main/java/com/convertapi/examples/Advanced.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.convertapi.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.net.InetSocketAddress;
@@ -19,17 +19,17 @@
1919
/**
2020
* Example of HTTP client setup to use HTTP proxy server.
2121
*/
22-
2322
public class Advanced {
23+
2424
public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
2525
Config.setDefaultSecret(getenv("CONVERTAPI_SECRET")); //Get your secret at https://www.convertapi.com/a
2626

2727
// Advanced HTTP client setup
2828
Config.setDefaultHttpBuilder(builder -> {
2929
return builder
30-
.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("10.0.0.1", 8888))) // Setting Proxy server
31-
.connectTimeout(3, TimeUnit.SECONDS); // Setting connect timeout
32-
// More settings can be tuned here
30+
.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("10.0.0.1", 8888))) // Setting Proxy server
31+
.connectTimeout(3, TimeUnit.SECONDS); // Setting connect timeout
32+
// More settings can be tuned here
3333
});
3434

3535
// Conversion
@@ -47,4 +47,4 @@ public static void main(String[] args) throws IOException, ExecutionException, I
4747

4848
System.out.println("PDF file saved to: " + pdfFile.toString());
4949
}
50-
}
50+
}

src/com/convertapi/examples/AlternativeConverter.java renamed to examples/src/main/java/com/convertapi/examples/AlternativeConverter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.convertapi.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

8+
import java.io.File;
89
import java.io.IOException;
910
import java.nio.file.Path;
1011
import java.nio.file.Paths;
11-
import java.util.List;
1212
import java.util.concurrent.CompletableFuture;
1313
import java.util.concurrent.ExecutionException;
1414

@@ -27,7 +27,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
2727
Path tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
2828

2929
System.out.println("Converting DOCX to PDF with OpenOffice converter");
30-
Param docxFileParam = new Param("file", Paths.get("test-files/test.docx"));
30+
Param docxFileParam = new Param("file", new File(AlternativeConverter.class.getClassLoader().getResource("test.docx").getFile()).toPath());
3131
Param converterParam = new Param("converter", "openofficetopdf");
3232

3333
CompletableFuture<ConversionResult> pdfResult = ConvertApi.convert("docx", "pdf", docxFileParam, converterParam);

src/com/convertapi/examples/ConversionChaining.java renamed to examples/src/main/java/com/convertapi/examples/ConversionChaining.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.convertapi.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

8+
import java.io.File;
89
import java.io.IOException;
910
import java.nio.file.Path;
1011
import java.nio.file.Paths;
@@ -23,7 +24,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
2324
Config.setDefaultSecret(getenv("CONVERTAPI_SECRET")); //Get your secret at https://www.convertapi.com/a
2425

2526
System.out.println("Converting PDF to JPG and compressing result files with ZIP");
26-
CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", new Param("file", Paths.get("test-files/test.docx")));
27+
CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", new Param("file", new File(AlternativeConverter.class.getClassLoader().getResource("test.docx").getFile()).toPath()));
2728
System.out.println("ConvertApi.convert is not blocking method, proceeding to ZIP conversion");
2829

2930
CompletableFuture<ConversionResult> zipResult = ConvertApi.convert("jpg", "zip", new Param("files", jpgResult));

src/com/convertapi/examples/ConvertRemoteFile.java renamed to examples/src/main/java/com/convertapi/examples/ConvertRemoteFile.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.convertapi.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

src/com/convertapi/examples/ConvertWebToPdf.java renamed to examples/src/main/java/com/convertapi/examples/ConvertWebToPdf.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.convertapi.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

src/com/convertapi/examples/ConvertWordToPdfAndPng.java renamed to examples/src/main/java/com/convertapi/examples/ConvertWordToPdfAndPng.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.convertapi.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

8+
import java.io.File;
89
import java.io.IOException;
910
import java.nio.file.Path;
1011
import java.nio.file.Paths;
@@ -28,7 +29,7 @@ public static void main(String[] args) throws IOException, ExecutionException, I
2829

2930
System.out.println("Converting DOCX to PDF and JPG in parallel");
3031

31-
Param docxFileParam = new Param("file", Paths.get("test-files/test.docx"));
32+
Param docxFileParam = new Param("file", new File(AlternativeConverter.class.getClassLoader().getResource("test.docx").getFile()).toPath());
3233

3334
CompletableFuture<ConversionResult> pdfResult = ConvertApi.convert("docx", "pdf", docxFileParam);
3435
CompletableFuture<ConversionResult> jpgResult = ConvertApi.convert("docx", "jpg", docxFileParam);

0 commit comments

Comments
 (0)