fix: removed dependency to fileinputstream (#12)

* removed dependency to fileinputstream in order to process other sources of an image like incoming streams from other web requests, without persisting files first on disk

Signed-off-by: Erik Neurohr <erik.neurohr@leadtributor.com>

* removed dependency to fileinputstream in order to process other sources of an image like incoming streams from other web requests, without persisting files first on disk

Signed-off-by: Erik Neurohr <erik.neurohr@leadtributor.com>

Author: kellerkind87

src/main/java/abbyy/cloudsdk/v2/client/IOcrClient.java

@@ -21,7 +21,7 @@
 import abbyy.cloudsdk.v2.client.models.enums.TaskStatus;
 import abbyy.cloudsdk.v2.client.models.requestparams.*;
 
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -44,27 +44,27 @@ public interface IOcrClient {
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processImageAsync(ImageProcessingParams parameters, FileInputStream fileStream, String fileName,
+    CompletableFuture<TaskInfo> processImageAsync(ImageProcessingParams parameters, InputStream fileStream, String fileName,
                                                   boolean waitTaskFinished);
 
     /**
      * The method adds the image to the existing task or creates a new task for the image. This task is not passed for processing until
      * the {@link #processDocumentAsync(DocumentProcessingParams, boolean)} or
-     * {@link #processFieldsAsync(FieldsProcessingParams, FileInputStream, String, boolean)} method is called for it.
+     * {@link #processFieldsAsync(FieldsProcessingParams, InputStream, String, boolean)} method is called for it.
      * Several images can be uploaded to one task
      * @param parameters Image submitting parameters
      * @param fileStream Stream of the file with the image to recognize
      * @param fileName Name of the file with the image
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> submitImageAsync(ImageSubmittingParams parameters, FileInputStream fileStream, String fileName);
+    CompletableFuture<TaskInfo> submitImageAsync(ImageSubmittingParams parameters, InputStream fileStream, String fileName);
 
 
     /**
      * The method starts the processing task with the specified parameters.
      *
      * <b>Note:</b> This method allows you to process several images using the same settings and obtain recognition
-     * result as a multi-page document. You can upload several images to one task using {@link #submitImageAsync(ImageSubmittingParams, FileInputStream, String)} method.
+     * result as a multi-page document. You can upload several images to one task using {@link #submitImageAsync(ImageSubmittingParams, InputStream, String)} method.
      * It is also possible to specify up to three file formats for the result, in which case the server response for the completed
      * task will contain several result URLs. Only the task with {@link TaskStatus#Submitted},
      * {@link TaskStatus#Completed} or {@link TaskStatus#NotEnoughCredits}
@@ -85,7 +85,7 @@ CompletableFuture<TaskInfo> processImageAsync(ImageProcessingParams parameters,
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processBusinessCardAsync(BusinessCardProcessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processBusinessCardAsync(BusinessCardProcessingParams parameters, InputStream fileStream,
                                                          String fileName, boolean waitTaskFinished);
 
     /**
@@ -102,7 +102,7 @@ CompletableFuture<TaskInfo> processBusinessCardAsync(BusinessCardProcessingParam
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processTextFieldAsync(TextFieldProcessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processTextFieldAsync(TextFieldProcessingParams parameters, InputStream fileStream,
                                            String fileName, boolean waitTaskFinished);
 
     /**
@@ -121,7 +121,7 @@ CompletableFuture<TaskInfo> processTextFieldAsync(TextFieldProcessingParams para
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processBarcodeFieldAsync(BarcodeFieldProcessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processBarcodeFieldAsync(BarcodeFieldProcessingParams parameters, InputStream fileStream,
                                            String fileName, boolean waitTaskFinished);
 
 
@@ -138,7 +138,7 @@ CompletableFuture<TaskInfo> processBarcodeFieldAsync(BarcodeFieldProcessingParam
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processCheckmarkFieldAsync(CheckmarkFieldProcessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processCheckmarkFieldAsync(CheckmarkFieldProcessingParams parameters, InputStream fileStream,
                                               String fileName, boolean waitTaskFinished);
 
     /**
@@ -161,7 +161,7 @@ CompletableFuture<TaskInfo> processCheckmarkFieldAsync(CheckmarkFieldProcessingP
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processFieldsAsync(FieldsProcessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processFieldsAsync(FieldsProcessingParams parameters, InputStream fileStream,
                                                 String fileName, boolean waitTaskFinished);
 
     /**
@@ -180,7 +180,7 @@ CompletableFuture<TaskInfo> processFieldsAsync(FieldsProcessingParams parameters
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processMrzAsync(MrzProcessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processMrzAsync(MrzProcessingParams parameters, InputStream fileStream,
                                         String fileName, boolean waitTaskFinished);
 
     /**
@@ -200,7 +200,7 @@ CompletableFuture<TaskInfo> processMrzAsync(MrzProcessingParams parameters, File
      * @param waitTaskFinished Indicates whether to wait until task is finished.
      * @return {@link TaskInfo}
      */
-    CompletableFuture<TaskInfo> processReceiptAsync(ReceiptProccessingParams parameters, FileInputStream fileStream,
+    CompletableFuture<TaskInfo> processReceiptAsync(ReceiptProccessingParams parameters, InputStream fileStream,
                                      String fileName, boolean waitTaskFinished);
 
     /**

src/main/java/abbyy/cloudsdk/v2/client/OcrClient.java

@@ -39,7 +39,7 @@ public OcrClient(AuthInfo authInfo) {
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processImageAsync(ImageProcessingParams parameters, FileInputStream fileStream, String fileName,
+    public CompletableFuture<TaskInfo> processImageAsync(ImageProcessingParams parameters, InputStream fileStream, String fileName,
                                                          boolean waitTaskFinished){
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessImage, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -48,7 +48,7 @@ public CompletableFuture<TaskInfo> processImageAsync(ImageProcessingParams param
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> submitImageAsync(ImageSubmittingParams parameters, FileInputStream fileStream, String fileName) {
+    public CompletableFuture<TaskInfo> submitImageAsync(ImageSubmittingParams parameters, InputStream fileStream, String fileName) {
         return makeRequestAsync(HttpRequestMethod.Post, Urls.SubmitImage, parameters, fileStream, fileName, parameters.getResponseClass());
     }
 
@@ -64,7 +64,7 @@ public CompletableFuture<TaskInfo> processDocumentAsync(DocumentProcessingParams
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processBusinessCardAsync(BusinessCardProcessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processBusinessCardAsync(BusinessCardProcessingParams parameters, InputStream fileStream,
                                                                 String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessBusinessCard, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -73,7 +73,7 @@ public CompletableFuture<TaskInfo> processBusinessCardAsync(BusinessCardProcessi
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processTextFieldAsync(TextFieldProcessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processTextFieldAsync(TextFieldProcessingParams parameters, InputStream fileStream,
                                                              String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessTextField, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -82,7 +82,7 @@ public CompletableFuture<TaskInfo> processTextFieldAsync(TextFieldProcessingPara
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processBarcodeFieldAsync(BarcodeFieldProcessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processBarcodeFieldAsync(BarcodeFieldProcessingParams parameters, InputStream fileStream,
                                                          String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessBarcodeField, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -91,7 +91,7 @@ public CompletableFuture<TaskInfo> processBarcodeFieldAsync(BarcodeFieldProcessi
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processCheckmarkFieldAsync(CheckmarkFieldProcessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processCheckmarkFieldAsync(CheckmarkFieldProcessingParams parameters, InputStream fileStream,
                                                            String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessCheckmarkField, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -100,7 +100,7 @@ public CompletableFuture<TaskInfo> processCheckmarkFieldAsync(CheckmarkFieldProc
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processFieldsAsync(FieldsProcessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processFieldsAsync(FieldsProcessingParams parameters, InputStream fileStream,
                                                    String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessFields, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -109,7 +109,7 @@ public CompletableFuture<TaskInfo> processFieldsAsync(FieldsProcessingParams par
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processMrzAsync(MrzProcessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processMrzAsync(MrzProcessingParams parameters, InputStream fileStream,
                                                        String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessMrz, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -118,7 +118,7 @@ public CompletableFuture<TaskInfo> processMrzAsync(MrzProcessingParams parameter
      * {@inheritDoc}
      */
     @Override
-    public CompletableFuture<TaskInfo> processReceiptAsync(ReceiptProccessingParams parameters, FileInputStream fileStream,
+    public CompletableFuture<TaskInfo> processReceiptAsync(ReceiptProccessingParams parameters, InputStream fileStream,
                                                     String fileName, boolean waitTaskFinished) {
         return startTaskAsync(HttpRequestMethod.Post, Urls.ProcessReceipt, parameters, fileStream, fileName, waitTaskFinished);
     }
@@ -167,7 +167,7 @@ private CompletableFuture<TaskInfo> startTaskAsync(
             HttpRequestMethod method,
             String requestUrl,
             RequestParams<TaskInfo> params,
-            FileInputStream fileStream,
+            InputStream fileStream,
             String filename,
             boolean waitTaskFinished
     ) {
@@ -183,7 +183,7 @@ private <T> CompletableFuture<T> makeRequestAsync(
             HttpRequestMethod method,
             String requestUrl,
             Object params,
-            FileInputStream fileStream,
+            InputStream fileStream,
             String fileName,
             Class<T> responseClass
     ) {

src/main/java/abbyy/cloudsdk/v2/client/http/HttpAsyncFileWrapper.java

@@ -21,12 +21,12 @@ public class HttpAsyncFileWrapper {
     private static final String lineSeparator = "\r\n";
     private static final String boundaryPrefix = "--";
 
-    private FileInputStream fileStream;
+    private InputStream fileStream;
     private String fileName;
 
     private String boundary;
 
-    public HttpAsyncFileWrapper(FileInputStream fileStream, String fileName) {
+    public HttpAsyncFileWrapper(InputStream fileStream, String fileName) {
         this.fileStream = fileStream;
         this.fileName = fileName;
         this.boundary = UUID.randomUUID().toString();

src/main/java/abbyy/cloudsdk/v2/client/http/HttpAsyncRequest.java

@@ -17,6 +17,7 @@
 import abbyy.cloudsdk.v2.client.Serializer;
 
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -58,7 +59,7 @@ public void setFileWrapper(HttpAsyncFileWrapper fileWrapper) {
         this.fileWrapper = fileWrapper;
     }
 
-    public static <T> HttpAsyncRequest<T> buildRequest(HttpRequestMethod method, String requestUrl, Object params, FileInputStream fileStream, String fileName) {
+    public static <T> HttpAsyncRequest<T> buildRequest(HttpRequestMethod method, String requestUrl, Object params, InputStream fileStream, String fileName) {
         HttpAsyncRequest<T> request = new HttpAsyncRequest<>();
         request.setMethod(method);
         request.setRequestUri(buildRequestUri(requestUrl, params));