Add creating thumbnails support

Author: josiasmontag

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.cloudconvert</groupId>
     <artifactId>cloudconvert-java</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <name>cloudconvert-java</name>
     <description>CloudConvert is an online file converter API - more than 200 different audio, video, document, ebook, archive, image, spreadsheet and presentation formats supported.</description>

src/main/java/com/cloudconvert/client/AsyncCloudConvertClient.java

@@ -13,19 +13,7 @@
 import com.cloudconvert.dto.result.AsyncResult;
 import com.cloudconvert.executor.AsyncRequestExecutor;
 import com.cloudconvert.extractor.ResultExtractor;
-import com.cloudconvert.resource.async.AsyncCaptureWebsitesResource;
-import com.cloudconvert.resource.async.AsyncConvertFilesResource;
-import com.cloudconvert.resource.async.AsyncCreateArchivesResource;
-import com.cloudconvert.resource.async.AsyncExecuteCommandsResource;
-import com.cloudconvert.resource.async.AsyncExportFilesResource;
-import com.cloudconvert.resource.async.AsyncFilesResource;
-import com.cloudconvert.resource.async.AsyncImportFilesResource;
-import com.cloudconvert.resource.async.AsyncJobsResource;
-import com.cloudconvert.resource.async.AsyncMergeFilesResource;
-import com.cloudconvert.resource.async.AsyncOptimizeFilesResource;
-import com.cloudconvert.resource.async.AsyncTasksResource;
-import com.cloudconvert.resource.async.AsyncUsersResource;
-import com.cloudconvert.resource.async.AsyncWebhookResource;
+import com.cloudconvert.resource.async.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -61,7 +49,8 @@ public AsyncCloudConvertClient(
                 new AsyncCaptureWebsitesResource(settingsProvider, objectMapperProvider, asyncRequestExecutor),
                 new AsyncMergeFilesResource(settingsProvider, objectMapperProvider, asyncRequestExecutor),
                 new AsyncCreateArchivesResource(settingsProvider, objectMapperProvider, asyncRequestExecutor),
-                new AsyncExecuteCommandsResource(settingsProvider, objectMapperProvider, asyncRequestExecutor)
+                new AsyncExecuteCommandsResource(settingsProvider, objectMapperProvider, asyncRequestExecutor),
+                new AsyncCreateThumbnailsResource(settingsProvider, objectMapperProvider, asyncRequestExecutor)
             ),
             new AsyncJobsResource(settingsProvider, objectMapperProvider, asyncRequestExecutor)
         );

src/main/java/com/cloudconvert/client/CloudConvertClient.java

@@ -13,19 +13,7 @@
 import com.cloudconvert.dto.result.Result;
 import com.cloudconvert.executor.RequestExecutor;
 import com.cloudconvert.extractor.ResultExtractor;
-import com.cloudconvert.resource.sync.CaptureWebsitesResource;
-import com.cloudconvert.resource.sync.ConvertFilesResource;
-import com.cloudconvert.resource.sync.CreateArchivesResource;
-import com.cloudconvert.resource.sync.ExecuteCommandsResource;
-import com.cloudconvert.resource.sync.ExportFilesResource;
-import com.cloudconvert.resource.sync.FilesResource;
-import com.cloudconvert.resource.sync.ImportFilesResource;
-import com.cloudconvert.resource.sync.JobsResource;
-import com.cloudconvert.resource.sync.MergeFilesResource;
-import com.cloudconvert.resource.sync.OptimizeFilesResource;
-import com.cloudconvert.resource.sync.TasksResource;
-import com.cloudconvert.resource.sync.UsersResource;
-import com.cloudconvert.resource.sync.WebhookResource;
+import com.cloudconvert.resource.sync.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -62,7 +50,8 @@ public CloudConvertClient(
                 new CaptureWebsitesResource(settingsProvider, objectMapperProvider, requestExecutor),
                 new MergeFilesResource(settingsProvider, objectMapperProvider, requestExecutor),
                 new CreateArchivesResource(settingsProvider, objectMapperProvider, requestExecutor),
-                new ExecuteCommandsResource(settingsProvider, objectMapperProvider, requestExecutor)
+                new ExecuteCommandsResource(settingsProvider, objectMapperProvider, requestExecutor),
+                new CreateThumbnailsResource(settingsProvider, objectMapperProvider, requestExecutor)
             ),
             new JobsResource(settingsProvider, objectMapperProvider, requestExecutor)
         );

src/main/java/com/cloudconvert/dto/Operation.java

@@ -12,6 +12,7 @@ public enum Operation {
     ARCHIVE("archive"),
     ARCHIVE_EXTRACT("archive/extract"),
     COMMAND("command"),
+    THUMBNAIL("thumbnail"),
 
     IMPORT_URL("import/url"),
     IMPORT_UPLOAD("import/upload"),

src/main/java/com/cloudconvert/dto/request/CreateThumbnailsTaskRequest.java

@@ -0,0 +1,60 @@
+package com.cloudconvert.dto.request;
+
+import com.cloudconvert.dto.Operation;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@ToString
+@EqualsAndHashCode(callSuper = true)
+public class CreateThumbnailsTaskRequest extends TaskRequest {
+
+    /**
+     * (required) The ID of the input task for the conversion, normally the import task. Multiple task IDs can be provided as an array.
+     */
+    private List<String> input;
+
+    /**
+     * (optional) The current format of the file, e.g. pdf. If not set, the extension of the input file is used as input format.
+     */
+    private String inputFormat;
+
+    /**
+     * (required) The target format to create the thumbnail.
+     */
+    private String outputFormat;
+
+    /**
+     * (optional) Use a specific engine for the conversion.
+     */
+    private String engine;
+
+    /**
+     * (optional) Use a specific engine version for the conversion.
+     */
+    private String engineVersion;
+
+    /**
+     * (optional) Choose a filename (including extension) for the output file.
+     */
+    private String filename;
+
+    public CreateThumbnailsTaskRequest setInput(final String... input) {
+        this.input = Arrays.stream(input).collect(Collectors.toList());
+        return this;
+    }
+
+    @Override
+    public Operation getOperation() {
+        return Operation.THUMBNAIL;
+    }
+}

src/main/java/com/cloudconvert/resource/AbstractCreateThumbnailsResource.java

@@ -0,0 +1,48 @@
+package com.cloudconvert.resource;
+
+import com.cloudconvert.client.mapper.ObjectMapperProvider;
+import com.cloudconvert.client.setttings.SettingsProvider;
+import com.cloudconvert.dto.request.CreateThumbnailsTaskRequest;
+import com.cloudconvert.dto.response.TaskResponse;
+import com.cloudconvert.dto.result.AbstractResult;
+import com.google.common.collect.ImmutableList;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public abstract class AbstractCreateThumbnailsResource<TRAR extends AbstractResult<TaskResponse>> extends AbstractResource {
+
+    public static final String PATH_SEGMENT_CREATE_THUMBNAIL = "thumbnail";
+
+    public AbstractCreateThumbnailsResource(
+        final SettingsProvider settingsProvider, final ObjectMapperProvider objectMapperProvider
+    ) {
+        super(settingsProvider, objectMapperProvider);
+    }
+
+    /**
+     * Create a task to create a thumbnail (png, jpg).
+     *
+     * @param createThumbnailsTaskRequest {@link CreateThumbnailsTaskRequest}
+     * @return {@link TRAR}
+     * @throws IOException
+     * @throws URISyntaxException
+     */
+    public abstract TRAR thumbnail(
+        @NotNull final CreateThumbnailsTaskRequest createThumbnailsTaskRequest
+    ) throws IOException, URISyntaxException;
+
+    protected HttpUriRequest getThumbnailHttpUriRequest(
+        @NotNull final CreateThumbnailsTaskRequest createThumbnailsTaskRequest
+    ) throws IOException, URISyntaxException {
+        final URI uri = getUri(ImmutableList.of(PATH_SEGMENT_CREATE_THUMBNAIL));
+        final HttpEntity httpEntity = getHttpEntity(createThumbnailsTaskRequest);
+
+        return getHttpUriRequest(HttpPost.class, uri, httpEntity);
+    }
+}

src/main/java/com/cloudconvert/resource/AbstractTasksResource.java

@@ -8,6 +8,7 @@
 import com.cloudconvert.dto.request.ExecuteCommandsTaskRequest;
 import com.cloudconvert.dto.request.MergeFilesTaskRequest;
 import com.cloudconvert.dto.request.OptimizeFilesTaskRequest;
+import com.cloudconvert.dto.request.CreateThumbnailsTaskRequest;
 import com.cloudconvert.dto.response.OperationResponse;
 import com.cloudconvert.dto.response.Pageable;
 import com.cloudconvert.dto.response.TaskResponse;
@@ -63,6 +64,9 @@ public abstract class AbstractTasksResource<TRAR extends AbstractResult<TaskResp
     @Getter
     private final AbstractExecuteCommandsResource<TRAR> abstractExecuteCommandsResource;
 
+    @Getter
+    private final AbstractCreateThumbnailsResource<TRAR> abstractCreateThumbnailsResource;
+
     private final IncludesToNameValuePairsConverter includesToNameValuePairsConverter;
     private final FiltersToNameValuePairsConverter filtersToNameValuePairsConverter;
     private final AlternativeToNameValuePairsConverter alternativeToNameValuePairsConverter;
@@ -72,7 +76,8 @@ public AbstractTasksResource(
         final SettingsProvider settingsProvider, final ObjectMapperProvider objectMapperProvider,
         final AbstractConvertFilesResource<TRAR, ORPAR> abstractConvertFilesResource, final AbstractOptimizeFilesResource<TRAR> abstractOptimizeFilesResource,
         final AbstractCaptureWebsitesResource<TRAR> abstractCaptureWebsitesResource, final AbstractMergeFilesResource<TRAR> abstractMergeFilesResource,
-        final AbstractCreateArchivesResource<TRAR> abstractCreateArchivesResource, final AbstractExecuteCommandsResource<TRAR> abstractExecuteCommandsResource
+        final AbstractCreateArchivesResource<TRAR> abstractCreateArchivesResource, final AbstractExecuteCommandsResource<TRAR> abstractExecuteCommandsResource,
+        final AbstractCreateThumbnailsResource<TRAR> abstractCreateThumbnailsResource
     ) {
         super(settingsProvider, objectMapperProvider);
 
@@ -82,6 +87,7 @@ public AbstractTasksResource(
         this.abstractMergeFilesResource = abstractMergeFilesResource;
         this.abstractCreateArchivesResource = abstractCreateArchivesResource;
         this.abstractExecuteCommandsResource = abstractExecuteCommandsResource;
+        this.abstractCreateThumbnailsResource = abstractCreateThumbnailsResource;
 
         this.includesToNameValuePairsConverter = new IncludesToNameValuePairsConverter();
         this.filtersToNameValuePairsConverter = new FiltersToNameValuePairsConverter();
@@ -491,6 +497,19 @@ public abstract TRAR command(
         @NotNull final ExecuteCommandsTaskRequest executeCommandsTaskRequest
     ) throws IOException, URISyntaxException;
 
+    /**
+     * Create a task to convert one input file from input_format to output_format. Requires the task.write scope.
+     *
+     * @param createThumbnailsTaskRequest {@link CreateThumbnailsTaskRequest}
+     * @return {@link TRAR}
+     * @throws IOException
+     * @throws URISyntaxException
+     */
+    public abstract TRAR thumbnail(
+            @NotNull final CreateThumbnailsTaskRequest createThumbnailsTaskRequest
+    ) throws IOException, URISyntaxException;
+
+
     @Override
     public void close() throws IOException {
         abstractConvertFilesResource.close();
@@ -499,5 +518,6 @@ public void close() throws IOException {
         abstractMergeFilesResource.close();
         abstractCreateArchivesResource.close();
         abstractExecuteCommandsResource.close();
+        abstractCreateThumbnailsResource.close();
     }
 }

src/main/java/com/cloudconvert/resource/async/AsyncCreateThumbnailsResource.java

@@ -0,0 +1,41 @@
+package com.cloudconvert.resource.async;
+
+import com.cloudconvert.client.mapper.ObjectMapperProvider;
+import com.cloudconvert.client.setttings.SettingsProvider;
+import com.cloudconvert.dto.request.CreateThumbnailsTaskRequest;
+import com.cloudconvert.dto.response.TaskResponse;
+import com.cloudconvert.dto.result.AsyncResult;
+import com.cloudconvert.executor.AsyncRequestExecutor;
+import com.cloudconvert.resource.AbstractCreateThumbnailsResource;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+@Slf4j
+public class AsyncCreateThumbnailsResource extends AbstractCreateThumbnailsResource<AsyncResult<TaskResponse>> {
+
+    private final AsyncRequestExecutor asyncRequestExecutor;
+
+    public AsyncCreateThumbnailsResource(
+        final SettingsProvider settingsProvider,
+        final ObjectMapperProvider objectMapperProvider, final AsyncRequestExecutor asyncRequestExecutor
+    ) {
+        super(settingsProvider, objectMapperProvider);
+
+        this.asyncRequestExecutor = asyncRequestExecutor;
+    }
+
+    @Override
+    public AsyncResult<TaskResponse> thumbnail(
+        @NotNull final CreateThumbnailsTaskRequest createThumbnailsTaskRequest
+    ) throws IOException, URISyntaxException {
+        return asyncRequestExecutor.execute(getThumbnailHttpUriRequest(createThumbnailsTaskRequest), TASK_RESPONSE_TYPE_REFERENCE);
+    }
+
+    @Override
+    public void close() throws IOException {
+        asyncRequestExecutor.close();
+    }
+}

src/main/java/com/cloudconvert/resource/async/AsyncTasksResource.java

@@ -2,12 +2,7 @@
 
 import com.cloudconvert.client.mapper.ObjectMapperProvider;
 import com.cloudconvert.client.setttings.SettingsProvider;
-import com.cloudconvert.dto.request.CaptureWebsitesTaskRequest;
-import com.cloudconvert.dto.request.ConvertFilesTaskRequest;
-import com.cloudconvert.dto.request.CreateArchivesTaskRequest;
-import com.cloudconvert.dto.request.ExecuteCommandsTaskRequest;
-import com.cloudconvert.dto.request.MergeFilesTaskRequest;
-import com.cloudconvert.dto.request.OptimizeFilesTaskRequest;
+import com.cloudconvert.dto.request.*;
 import com.cloudconvert.dto.response.OperationResponse;
 import com.cloudconvert.dto.response.Pageable;
 import com.cloudconvert.dto.response.TaskResponse;
@@ -38,10 +33,11 @@ public AsyncTasksResource(
         final SettingsProvider settingsProvider, final ObjectMapperProvider objectMapperProvider, final AsyncRequestExecutor asyncRequestExecutor,
         final AsyncConvertFilesResource asyncConvertFilesResource, final AsyncOptimizeFilesResource asyncOptimizeFilesResource,
         final AsyncCaptureWebsitesResource asyncCaptureWebsitesResource, final AsyncMergeFilesResource asyncMergeFilesResource,
-        final AsyncCreateArchivesResource asyncCreateArchivesResource, final AsyncExecuteCommandsResource asyncExecuteCommandsResource
+        final AsyncCreateArchivesResource asyncCreateArchivesResource, final AsyncExecuteCommandsResource asyncExecuteCommandsResource,
+        final AsyncCreateThumbnailsResource asyncCreateThumbnailsResource
     ) {
         super(settingsProvider, objectMapperProvider, asyncConvertFilesResource, asyncOptimizeFilesResource, asyncCaptureWebsitesResource,
-            asyncMergeFilesResource, asyncCreateArchivesResource, asyncExecuteCommandsResource);
+            asyncMergeFilesResource, asyncCreateArchivesResource, asyncExecuteCommandsResource, asyncCreateThumbnailsResource);
 
         this.asyncRequestExecutor = asyncRequestExecutor;
     }
@@ -196,6 +192,14 @@ public AsyncResult<TaskResponse> command(
         return getAbstractExecuteCommandsResource().command(executeCommandsTaskRequest);
     }
 
+    @Override
+    public AsyncResult<TaskResponse> thumbnail(
+            @NotNull final CreateThumbnailsTaskRequest createThumbnailsTaskRequest
+    ) throws IOException, URISyntaxException {
+        return getAbstractCreateThumbnailsResource().thumbnail(createThumbnailsTaskRequest);
+    }
+
+
     @Override
     public void close() throws IOException {
         asyncRequestExecutor.close();

src/main/java/com/cloudconvert/resource/sync/CreateThumbnailsResource.java

@@ -0,0 +1,41 @@
+package com.cloudconvert.resource.sync;
+
+import com.cloudconvert.client.mapper.ObjectMapperProvider;
+import com.cloudconvert.client.setttings.SettingsProvider;
+import com.cloudconvert.dto.request.CreateThumbnailsTaskRequest;
+import com.cloudconvert.dto.response.TaskResponse;
+import com.cloudconvert.dto.result.Result;
+import com.cloudconvert.executor.RequestExecutor;
+import com.cloudconvert.resource.AbstractCreateThumbnailsResource;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+@Slf4j
+public class CreateThumbnailsResource extends AbstractCreateThumbnailsResource<Result<TaskResponse>> {
+
+    private final RequestExecutor requestExecutor;
+
+    public CreateThumbnailsResource(
+        final SettingsProvider settingsProvider,
+        final ObjectMapperProvider objectMapperProvider, final RequestExecutor requestExecutor
+    ) {
+        super(settingsProvider, objectMapperProvider);
+
+        this.requestExecutor = requestExecutor;
+    }
+
+    @Override
+    public Result<TaskResponse> thumbnail(
+        @NotNull final CreateThumbnailsTaskRequest createThumbnailsTaskRequest
+    ) throws IOException, URISyntaxException {
+        return requestExecutor.execute(getThumbnailHttpUriRequest(createThumbnailsTaskRequest), TASK_RESPONSE_TYPE_REFERENCE);
+    }
+
+    @Override
+    public void close() throws IOException {
+        requestExecutor.close();
+    }
+}