Merge pull request #18 from ConvertAPI/fix/user-agent-header

Fix error with convertapi version in user agent header

Author: kmozsi

README.md

@@ -19,7 +19,7 @@ Add the following dependency to your pom.xml:
 <dependency>
     <groupId>com.convertapi.client</groupId>
     <artifactId>convertapi</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>convertapi</artifactId>
     <packaging>jar</packaging>
 
-    <version>2.5-SNAPSHOT </version>
+    <version>2.5-SNAPSHOT</version>
     <name>ConvertAPI Java Client</name>
     <description>
         The ConvertAPI helps converting various file formats.

src/main/java/com/convertapi/client/Config.java

@@ -5,6 +5,7 @@
 import java.util.function.Function;
 
 public class Config {
+
     private static String defaultSecret;
     private static int defaultTimeout = 0;  // Infinite read waiting
     private static Function<OkHttpClient.Builder, OkHttpClient.Builder> defaultHttpClientBuilder = b -> b;
@@ -75,4 +76,4 @@ String getSecret() {
     Function<OkHttpClient.Builder, OkHttpClient.Builder> getHttpClientBuilder() {
         return httpClientBuilder;
     }
-}
+}

src/main/java/com/convertapi/client/ConversionException.java

@@ -1,6 +1,7 @@
 package com.convertapi.client;
 
 public class ConversionException extends RuntimeException {
+
     private final int httpStatusCode;
 
     public ConversionException(String message, int httpStatusCode) {
@@ -11,4 +12,4 @@ public ConversionException(String message, int httpStatusCode) {
     public int getHttpStatusCode() {
         return httpStatusCode;
     }
-}
+}

src/main/java/com/convertapi/client/ConversionResult.java

@@ -14,6 +14,7 @@
 
 @SuppressWarnings("WeakerAccess")
 public class ConversionResult {
+
     private final ConversionResponse response;
 
     @SuppressWarnings("unused")
@@ -27,8 +28,11 @@ public Integer fileCount() {
     }
 
     public List<String> urls() {
-        @SuppressWarnings("unchecked") List<String> valueList = new ArrayList();
-        for (ConversionResponseFile file : response.Files) valueList.add(file.Url);
+        @SuppressWarnings("unchecked")
+        List<String> valueList = new ArrayList();
+        for (ConversionResponseFile file : response.Files) {
+            valueList.add(file.Url);
+        }
         return valueList;
     }
 
@@ -38,7 +42,9 @@ public Integer conversionCost() {
     }
 
     public ConversionResultFile getFile(int index) {
-        if (index < 0) index = response.Files.length + index;
+        if (index < 0) {
+            index = response.Files.length + index;
+        }
         return new ConversionResultFile(response.Files[index]);
     }
 
@@ -52,8 +58,9 @@ public CompletableFuture<Path> saveFile(Path file) {
 
     @SuppressWarnings("WeakerAccess")
     public List<CompletableFuture<Path>> saveFiles(Path directory) {
-        if (!Files.isDirectory(directory))
+        if (!Files.isDirectory(directory)) {
             throw new RuntimeException("Directory expected, but received: " + directory.toString());
+        }
         List<CompletableFuture<Path>> paths = new ArrayList<>();
         for (int i = 0; i < response.Files.length; i++) {
             paths.add(getFile(i).saveFile(directory));
@@ -92,4 +99,4 @@ public void deleteSync() {
             }
         });
     }
-}
+}

src/main/java/com/convertapi/client/ConversionResultFile.java

@@ -11,6 +11,7 @@
 import java.util.concurrent.CompletableFuture;
 
 public class ConversionResultFile {
+
     private final ConversionResponseFile conversionResponseFile;
 
     public ConversionResultFile(ConversionResponseFile conversionResponseFile) {
@@ -53,4 +54,4 @@ public CompletableFuture<Path> saveFile(Path path) {
     public CompletableFuture delete() {
         return Http.requestDelete(getUrl());
     }
-}
+}

src/main/java/com/convertapi/client/ConvertApi.java

@@ -21,6 +21,7 @@
 
 @SuppressWarnings("WeakerAccess")
 public class ConvertApi {
+
     @SuppressWarnings("SpellCheckingInspection")
     private static final List<String> IGNORE_PARAMS = Arrays.asList("storefile", "async", "jobid");
 
@@ -39,7 +40,7 @@ public static CompletableFuture<ConversionResult> convert(String fromFormat, Str
                     .addPathSegment(toFormat);
 
             for (Param param : params) {
-                if (param.getName() == "converter") {
+                if (param.getName().equals("converter")) {
                     try {
                         urlBuilder = urlBuilder
                                 .addPathSegment("converter")
@@ -183,7 +184,7 @@ public static Path convertRemoteFile(String url, String toPathToFile, String sec
         try {
             Path toPath = Paths.get(toPathToFile);
             return convert(response.FileExt, getFileExtension(toPath), new Param[]{
-                    new Param("file", response.FileId)
+                new Param("file", response.FileId)
             }, Config.defaults(secret)).get().saveFile(toPath).get();
         } catch (ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
@@ -224,4 +225,4 @@ private static HashMap<String, List<String>> getParamValues(Param[] params) {
 
         return result;
     }
-}
+}

src/main/java/com/convertapi/client/Http.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.TimeUnit;
 
 class Http {
+
     private static final OkHttpClient client = new OkHttpClient();
 
     static OkHttpClient getClient() {
@@ -58,7 +59,7 @@ static CompletableFuture<Void> requestDelete(String url) {
     }
 
     static Request.Builder getRequestBuilder() {
-        String agent = String.format("ConvertAPI-Java/%.1f (%s)", Http.class.getPackage().getImplementationVersion(), System.getProperty("os.name"));
+        String agent = String.format("ConvertAPI-Java/%s (%s)", Http.class.getPackage().getImplementationVersion(), System.getProperty("os.name"));
         return new Request.Builder().header("User-Agent", agent);
     }
 

src/main/java/com/convertapi/client/Param.java

@@ -18,6 +18,7 @@
 
 @SuppressWarnings("WeakerAccess")
 public class Param {
+
     private final String name;
     private CompletableFuture<List<String>> value;
     private boolean isUploadedFile = false;
@@ -130,4 +131,4 @@ public static Param[] concat(Param[] a, Param[] b) {
         System.arraycopy(b, 0, result, a.length, b.length);
         return result;
     }
-}
+}

src/main/java/com/convertapi/client/RequestBodyStream.java

@@ -11,6 +11,7 @@
 import java.io.InputStream;
 
 class RequestBodyStream {
+
     static RequestBody create(final MediaType mediaType, final InputStream inputStream) {
         return new RequestBody() {
             @Override
@@ -39,4 +40,4 @@ public void writeTo(BufferedSink sink) throws IOException {
             }
         };
     }
-}
+}