Updated to work with Java 8. Fixed problem with exists result file

Author: oleksii-unnamed

Demos/Dropwizard/pom.xml

@@ -13,7 +13,7 @@
     <url>https://groupdocs.com</url>
 
     <properties>
-        <java.version>15</java.version>
+        <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>com.dropbox.core</groupId>
             <artifactId>dropbox-core-sdk</artifactId>
-            <version>5.2.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>

Demos/Dropwizard/src/main/java/com/groupdocs/ui/common/util/TempFilesManager.java

@@ -8,6 +8,7 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public final class TempFilesManager {
     private static final Logger logger = LoggerFactory.getLogger(TempFilesManager.class);
@@ -36,7 +37,7 @@ public static void createInstance(String tempDirectory) {
         if (tempDirectory == null) {
             throw new IllegalArgumentException("tempDirectory must not be null");
         }
-        INSTANCE = new TempFilesManager(Path.of(tempDirectory));
+        INSTANCE = new TempFilesManager(Paths.get(tempDirectory));
     }
 
     public static TempFilesManager getInstance() {

Demos/Dropwizard/src/main/java/com/groupdocs/ui/comparison/provider/DropboxFilesProvider.java

@@ -123,6 +123,10 @@ public void receiveResultOutputStream(String fileName, Consumer<OutputStream> st
         final String path = "/" + resultDirectory + "/" + fileName;
         logger.debug("Request to Dropbox API to upload result file '" + path + "'");
         try {
+            // Always delete result file if it is already exist.
+            if (isFileExists(path)) {
+                deleteFile(path);
+            }
             final DbxUserFilesRequests filesRequests = client.files();
             try (final UploadUploader apiUploader = filesRequests.upload(path)) {
                 try (final OutputStream outputStream = apiUploader.getOutputStream()) {
@@ -139,11 +143,39 @@ public void receiveResultOutputStream(String fileName, Consumer<OutputStream> st
     public boolean isFileExists(String path) {
         logger.debug("Checking is result file exists: '" + path + "'");
         try {
-            ListFolderResult result = client.files().listFolder("");
+            if (path.startsWith("/")) {
+                path = path.substring(1);
+            }
+            final String fileDirectory, fileName;
+            if (path.contains("/")) {
+                final int nameStartsFrom = path.lastIndexOf("/") + 1;
+                fileDirectory = "/" + path.substring(0, nameStartsFrom);
+                fileName = path.substring(nameStartsFrom);
+            } else {
+                fileDirectory = "";
+                fileName = path;
+            }
+
+            ListFolderResult result = client.files().listFolder(fileDirectory);
             final List<Metadata> entries = result.getEntries();
-            return entries.stream().anyMatch(metadata -> metadata.getPathLower().equals(path.toLowerCase(Locale.ROOT)));
+            return entries.stream().anyMatch(metadata -> metadata.getName().equals(fileName.toLowerCase(Locale.ROOT)));
         } catch (Exception e) {
             throw new ApiException("Api exception: Can't check if result file exists!", e);
         }
     }
+
+    @Override
+    public void deleteFile(String path) throws ApiException {
+        logger.debug("Request to Dropbox API to delete file with path '" + path + "'");
+
+        try {
+            final DbxUserFilesRequests filesRequests = client.files();
+            if (!path.startsWith("/")) {
+                path = "/" + path;
+            }
+            filesRequests.deleteV2(path);
+        } catch (Exception e) {
+            throw new ApiException("Api exception: Can't delete file data!", e);
+        }
+    }
 }

Demos/Dropwizard/src/main/java/com/groupdocs/ui/comparison/provider/FilesProvider.java

@@ -2,7 +2,8 @@
 
 import com.groupdocs.ui.common.Defaults;
 import com.groupdocs.ui.common.config.GlobalConfiguration;
-import com.groupdocs.ui.common.exception.ApiException;
+import com.groupdocs.ui.common.exception.TotalGroupDocsException;
+import com.groupdocs.ui.common.exception.TotalGroupDocsException;
 import com.groupdocs.ui.comparison.config.ComparisonConfiguration;
 
 import java.io.InputStream;
@@ -17,17 +18,19 @@ public interface DirectoryContentVisitor {
         void visit(String guid, String name, boolean isDirectory, long size);
     }
 
-    public abstract void visitDirectoryContent(String path, DirectoryContentVisitor visitor) throws ApiException;
+    public abstract void visitDirectoryContent(String path, DirectoryContentVisitor visitor) throws TotalGroupDocsException;
 
-    public abstract void receiveFilesInputStream(String path, Consumer<InputStream> streamConsumer) throws ApiException;
+    public abstract void receiveFilesInputStream(String path, Consumer<InputStream> streamConsumer) throws TotalGroupDocsException;
 
-    public abstract void receiveFilesOutputStream(String fileName, Consumer<OutputStream> streamConsumer) throws ApiException;
+    public abstract void receiveFilesOutputStream(String fileName, Consumer<OutputStream> streamConsumer) throws TotalGroupDocsException;
 
-    public abstract void receiveResultInputStream(String fileName, Consumer<InputStream> streamConsumer) throws ApiException;
+    public abstract void receiveResultInputStream(String fileName, Consumer<InputStream> streamConsumer) throws TotalGroupDocsException;
 
-    public abstract void receiveResultOutputStream(String fileName, Consumer<OutputStream> streamConsumer) throws ApiException;
+    public abstract void receiveResultOutputStream(String fileName, Consumer<OutputStream> streamConsumer) throws TotalGroupDocsException;
 
-    public abstract boolean isFileExists(String fileName) throws ApiException;
+    public abstract boolean isFileExists(String fileName) throws TotalGroupDocsException;
+
+    public abstract void deleteFile(String path) throws TotalGroupDocsException;
 
     public static void create(GlobalConfiguration globalConfiguration) {
         final ComparisonConfiguration comparisonConfiguration = globalConfiguration.getComparison();

Demos/Dropwizard/src/main/java/com/groupdocs/ui/comparison/provider/GoogleFilesProvider.java

@@ -257,4 +257,27 @@ public boolean isFileExists(String path) throws ApiException {
             throw new ApiException("Api exception: Can't check if result file exists!", e);
         }
     }
+
+    @Override
+    public void deleteFile(String path) throws ApiException {
+        logger.debug("Deleting the file: '" + path + "'");
+        try {
+            FileList result = service.files().list()
+                    .setFields("files(id)")
+                    .setCorpora("user")
+                    .set("ownedByMe", true)
+                    .setSpaces("drive")
+                    .set("trashed", false)
+                    // Remove directories and their content from the list, check by name is file exists
+                    .setQ("mimeType != 'application/vnd.google-apps.folder' and 'root' in parents and name = '" + path + "'")
+                    .execute();
+            final Optional<File> optionalFile = result.getFiles().stream().findFirst();
+            if (optionalFile.isPresent()) {
+                service.files().delete(optionalFile.get().getId());
+            }
+
+        } catch (Exception e) {
+            throw new ApiException("Api exception: Can't delete the file!", e);
+        }
+    }
 }

Demos/Dropwizard/src/main/java/com/groupdocs/ui/comparison/provider/LocalFilesProvider.java

@@ -1,7 +1,7 @@
 package com.groupdocs.ui.comparison.provider;
 
 import com.groupdocs.ui.common.exception.LocalDiskException;
-import com.groupdocs.ui.common.exception.LocalDiskException;
+import com.groupdocs.ui.common.exception.TotalGroupDocsException;
 import com.groupdocs.ui.comparison.config.LocalProviderConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -119,7 +119,17 @@ public void receiveResultOutputStream(String fileName, Consumer<OutputStream> st
 
     @Override
     public boolean isFileExists(String path) {
-        logger.debug("Checking is result file exists: '" + path + "'");
+        logger.debug("Checking is file exists: '" + path + "'");
         return Files.exists(filesDirectory.resolve(path));
     }
+
+    @Override
+    public void deleteFile(String path) throws TotalGroupDocsException {
+        logger.debug("Deleting the file: '" + path + "'");
+        try {
+            Files.delete(filesDirectory.resolve(path));
+        } catch (IOException e) {
+            throw new LocalDiskException("Storage exception: Can't delete the file!", e);
+        }
+    }
 }

Demos/Dropwizard/src/main/java/com/groupdocs/ui/comparison/service/ComparisonServiceImpl.java

@@ -305,9 +305,13 @@ public boolean checkFiles(CompareRequest compareRequest) {
      * @return path to file in storage
      */
     @Override
-    public String uploadFile(InputStream inputStream, String fileName, boolean isRewrite) throws Exception {
+    public String uploadFile(InputStream inputStream, String fileName, boolean isRewrite) {
         final FilesProvider filesProvider = FilesProvider.getInstance();
-        if (!filesProvider.isFileExists(fileName) || isRewrite) {
+        final boolean isFileExists = filesProvider.isFileExists(fileName);
+        if (!isFileExists || isRewrite) {
+            if (isFileExists) {
+                filesProvider.deleteFile(fileName);
+            }
             filesProvider.receiveFilesOutputStream(fileName, outputStream -> {
                 try {
                     IOUtils.copy(inputStream, outputStream);