Updated frontend.

Updated to have option in configuration to use Google Drive API as files source
Implemented provider to use files from Google Drive using it's API (simple sample)

Author: oleksii-unnamed

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

@@ -25,7 +25,6 @@
 import static com.groupdocs.ui.common.exception.PasswordExceptions.PASSWORD_REQUIRED;
 
 public class Utils {
-    private static final Logger logger = LoggerFactory.getLogger(Utils.class);
 
     private static final List<String> SUPPORTED_FORMATS = Arrays.asList(
             "jpg",
@@ -48,10 +47,6 @@ public static java.util.List<FileDescriptionEntity> orderByTypeAndName(List<File
 
     /**
      * Read stream and convert to string
-     *
-     * @param inputStream
-     * @return
-     * @throws IOException
      */
     public static String getStringFromStream(InputStream inputStream) throws IOException {
         byte[] bytes = IOUtils.toByteArray(inputStream);
@@ -80,103 +75,4 @@ public static String parseFileExtension(String documentGuid) {
     public static boolean checkSupportedFiles(String extension) {
         return SUPPORTED_FORMATS.contains(extension);
     }
-
-    /**
-     * Get correct message for security exceptions
-     *
-     * @param password
-     * @return
-     */
-    public static String getExceptionMessage(String password) {
-        return StringUtils.isEmpty(password) ? PASSWORD_REQUIRED : INCORRECT_PASSWORD;
-    }
-
-    /**
-     * Rename file if exist
-     *
-     * @param directory directory where files are located
-     * @param fileName  file name
-     * @return new file with new file name
-     */
-    public static File getFreeFileName(String directory, String fileName) {
-        File file = null;
-        try {
-            File folder = new File(directory);
-            File[] listOfFiles = folder.listFiles();
-            for (int i = 0; i < listOfFiles.length; i++) {
-                int number = i + 1;
-                String newFileName = FilenameUtils.removeExtension(fileName) + "-Copy(" + number + ")." + FilenameUtils.getExtension(fileName);
-                file = new File(directory + File.separator + newFileName);
-                if (file.exists()) {
-                    continue;
-                } else {
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return file;
-    }
-
-    /**
-     * Create file in previewPath and name imageGuid
-     * if the file is already exist, create new file with next number in name
-     * examples, 001, 002, 003, etc
-     *
-     * @param previewPath path to file folder
-     * @param imageGuid   path to file
-     * @return created file
-     */
-    public static File getFileWithUniqueName(String previewPath, String imageGuid, String ext) {
-        if (!StringUtils.isEmpty(imageGuid) && new File(imageGuid).exists()) {
-            return new File(imageGuid);
-        } else {
-            File[] listOfFiles = new File(previewPath).listFiles();
-            return createUniqueFile(previewPath, listOfFiles, ext);
-        }
-    }
-
-    private static File createUniqueFile(String previewPath, File[] listOfFiles, String ext) {
-        for (int i = 0; i <= listOfFiles.length; i++) {
-            // set file name, for example 001
-            String fileName = String.format("%03d", i + 1);
-            File file = new File(String.format("%s%s%s.%s", previewPath, File.separator, fileName, ext));
-            // check if file with such name already exists
-            if (file.exists()) {
-                continue;
-            } else {
-                return file;
-            }
-        }
-        return new File(String.format("%s%s001.png", previewPath, File.separator));
-    }
-
-    /**
-     * Generate empty image for future signing with signature, such approach required to get signature as image
-     *
-     * @param width  image width
-     * @param height image height
-     * @return
-     */
-    public static BufferedImage getBufferedImage(int width, int height) {
-        BufferedImage bufImage = null;
-        try {
-            bufImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-            // Create a graphics contents on the buffered image
-            Graphics2D g2d = bufImage.createGraphics();
-            // Draw graphics
-            g2d.setColor(Color.WHITE);
-            g2d.fillRect(0, 0, width, height);
-            // Graphics context no longer needed so dispose it
-            g2d.dispose();
-            return bufImage;
-        } catch (Exception ex) {
-            throw new TotalGroupDocsException(ex.getMessage(), ex);
-        } finally {
-            if (bufImage != null) {
-                bufImage.flush();
-            }
-        }
-    }
 }

Demos/Spring/client/package.json

@@ -37,24 +37,24 @@
     "@angular/platform-browser": "^8.2.14",
     "@angular/platform-browser-dynamic": "^8.2.14",
     "@angular/router": "^8.2.14",
-    "@groupdocs.examples.angular/comparison": "^0.8.20",
+    "@groupdocs.examples.angular/comparison": "^0.8.80",
     "@nrwl/angular": "^8.8.2",
     "core-js": "^2.6.10",
     "rxjs": "~6.4.0",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.1",
-    "@angular/cli": "8.1.1",
+    "@angular-devkit/build-angular": "^0.800.0",
+    "@angular/cli": "8.0.0",
     "@angular/compiler-cli": "^8.2.14",
     "@angular/language-service": "^8.2.14",
-    "@nrwl/cypress": "8.4.3",
-    "@nrwl/jest": "8.4.3",
-    "@nrwl/workspace": "8.4.3",
+    "@nrwl/cypress": "8.2.0",
+    "@nrwl/jest": "8.2.0",
+    "@nrwl/workspace": "8.2.0",
     "@types/jest": "24.0.9",
     "@types/node": "~8.9.4",
     "codelyzer": "~5.0.1",
-    "cypress": "3.4.0",
+    "cypress": "~3.3.1",
     "dotenv": "6.2.0",
     "jest": "24.1.0",
     "jest-preset-angular": "7.0.0",

Demos/Spring/configuration.yml

@@ -12,9 +12,10 @@ server:
 # Application (global) configurations
 ################################################
 application:
-  # License path
-  # Absolute or relative path to GroupDocs license file
-  licensePath: ${LIC_PATH:Licenses}
+  # Absolute or relative path to GroupDocs license
+  # Can be as a path to license file, to directory, in which license file is placed (*.lic) or url to download license file
+  # Default value is `Licenses`
+  licensePath: ${LIC_PATH:}
   # Host name or ip for server instance
   hostAddress: ${HOST_ADDRESS:}
 
@@ -23,9 +24,9 @@ application:
 ################################################
 common:
   # File rewriting on document uploading
-  # Set false to keep both files
+  # Set false to cancel uploading in case of existence of file with the same name
   # Set true to replace files with same name
-  rewrite: true
+  rewrite: ${REWRITE:true}
   # Page navigation
   # Set false to disable document navigation (go to next, previous, last and first page)
   pageSelector: true
@@ -42,19 +43,58 @@ common:
   # Set false to disable document browse
   browse: ${BROWSE_ON:true}
   # Set false to disable right mouse click
-  enableRightClick: ${RIGHTCLICK_ON:false}
+  enableRightClick: ${RIGHTCLICK_ON:true}
 
 ################################################
 # GroupDocs.Comparison configurations
 ################################################
 comparison:
-  # Files directory path
-  # Absolute or relative path to files directory
-  filesDirectory: ${FILES_DIR:DocumentSamples}
-  # FResult files directory path
-  # Absolute path to result files directory
-  resultDirectory: ${RESULT_DIR:DocumentSamples}
+  # Files provider, where to get files to show them in browse dialog
+  # Available values are `google` - using Google Drive API, `local` - using local directories
+  filesProviderType: ${FILES_PROVIDER_TYPE:local}
   # Result pages preload
   # How many pages from a result document should be loaded, remaining pages will be loaded on page scrolling
   # Set 0 to load all pages at once
-  preloadResultPageCount: 0
+  preloadResultPageCount: 0
+  # Page width that will be used to resize preview images before displaying them
+  # Default value is 768
+  previewPageWidth: ${PREVIEW_PAGE_WIDTH:}
+  # Ratio to calculate height of preview images using width
+  # Default value is 1.3
+  previewPageRatio: ${PREVIEW_PAGE_RATIO:}
+  # Absolute or relative path to directory to save cache files
+  # Default value is system temp directory. The path is always local
+  cacheDirectory: ${CACHE_DIR:}
+  # Absolute or relative path to directory to save temporary files
+  # Default value is system temp directory. The path is always local
+  tempDirectory: ${TEMP_DIR:}
+################################################
+# Local files provider Configuration
+################################################
+local:
+  # Files directory path
+  # Absolute or relative path to files directory, default value is `DocumentSamples`.
+  filesDirectory: ${FILES_DIR:DocumentSamples}
+  # Result files directory path
+  # Absolute or relative path to result files directory, default value is `DocumentSamples/Temp`.
+  resultDirectory: ${RESULT_DIR:}
+################################################
+# Google API files provider Configuration
+################################################
+google:
+  # When false or empty, file with name `credentials.json` from resources will be used
+  useCredentialsPath: ${USE_CREDENTIALS_PATH:false}
+  # When useCredentialsPath is true, this path will be used as a path to google credentials file (usually `credentials.json`)
+  credentialsPath: ${CREDENTIALS_PATH:}
+  # Path to directory to save stored credentials. When empty, credentials will not be saved
+  tokensDirectoryPath: ${TOKENS_DIRECTORY_PATH:}
+  # Client application name
+  applicationName: ${APPLICATION_NAME:GroupDocs.Comparison for Java Dropwizard sample}
+  # Files access type, available options are `offline` and `online`.
+  # Default value is `offline`
+  accessType: offline
+  # Port that will be used for Google Drive API authorization callback.
+  # Default value is `8888`
+  localServerReceiverPort: ${LOCAL_SERVER_RECEIVER_PORT:8888}
+  # user ID or null if not using a persisted credential store
+  authorizationUserId: user

Demos/Spring/pom.xml

@@ -51,7 +51,7 @@
     </profiles>
 
     <properties>
-        <start-class>com.groupdocs.ui.Application</start-class>
+        <start-class>com.groupdocs.ui.common.Application</start-class>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -131,6 +131,24 @@
             <artifactId>guava</artifactId>
             <version>23.0</version>
         </dependency>
+
+        <!-- Google API -->
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+            <version>1.33.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.apis</groupId>
+            <artifactId>google-api-services-drive</artifactId>
+            <version>v3-rev20211107-1.32.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.oauth-client</groupId>
+            <artifactId>google-oauth-client-jetty</artifactId>
+            <version>1.32.1</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -143,7 +161,7 @@
         <repository>
             <id>com.springsource.repository.bundles.external</id>
             <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/external</url>
+            <url>https://repository.springsource.com/maven/bundles/external</url>
         </repository>
         <repository>
             <id>maven.groupdocs.com</id>

Demos/Spring/src/main/java/com/groupdocs/ui/ApplicationStartup.java

@@ -1,6 +1,6 @@
 package com.groupdocs.ui;
 
-import com.groupdocs.ui.config.ServerConfiguration;
+import com.groupdocs.ui.common.config.ServerConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.context.WebServerInitializedEvent;
 import org.springframework.context.ApplicationListener;

…n/java/com/groupdocs/ui/Application.java …com/groupdocs/ui/common/Application.javaDemos/Spring/src/main/java/com/groupdocs/ui/Application.java renamed to Demos/Spring/src/main/java/com/groupdocs/ui/common/Application.java Demos/Spring/src/main/java/com/groupdocs/ui/Application.java renamed to Demos/Spring/src/main/java/com/groupdocs/ui/common/Application.java

@@ -1,4 +1,4 @@
-package com.groupdocs.ui;
+package com.groupdocs.ui.common;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +19,18 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
-@SpringBootApplication
+//@EnableAutoConfiguration
+@SpringBootApplication(
+        scanBasePackages = {
+                "com.groupdocs.ui",
+//                "com.groupdocs.ui.common",
+//                "com.groupdocs.ui.comparison",
+//                "com.groupdocs.ui.common.config",
+//                "com.groupdocs.ui.comparison.config",
+//                "com.groupdocs.ui.comparison.resources",
+//                "com.groupdocs.ui.comparison.service"
+        }
+)
 public class Application extends SpringBootServletInitializer {
 
     private static final Logger logger = LoggerFactory.getLogger(Application.class);

Demos/Spring/src/main/java/com/groupdocs/ui/common/Defaults.java

@@ -0,0 +1,38 @@
+package com.groupdocs.ui.common;
+
+public interface Defaults {
+    interface Application {
+        String DEFAULT_LICENSE_PATH = "Licenses";
+        String DEFAULT_LICENSE_EXTENSION = ".lic";
+    }
+
+    interface Comparison {
+        enum FilesProviderType {
+            LOCAL, GOOGLE
+        }
+
+        int DEFAULT_PRELOAD_RESULT_PAGE_COUNT = 2;
+        int DEFAULT_PREVIEW_PAGE_WIDTH = 768;
+        float DEFAULT_PREVIEW_PAGE_RATIO = 1.3F;
+        FilesProviderType DEFAULT_FILES_PROVIDER_TYPE = FilesProviderType.LOCAL;
+    }
+
+    interface Local {
+
+        String DEFAULT_FILES_DIRECTORY = "DocumentSamples";
+        String DEFAULT_RESULT_DIRECTORY = "DocumentSamples/Temp";
+        String DEFAULT_CACHE_DIRECTORY = System.getProperty("java.io.tmpdir");
+        String DEFAULT_TEMP_DIRECTORY = System.getProperty("java.io.tmpdir");
+    }
+
+    interface Google {
+
+        enum AccessType {
+            OFFLINE, ONLINE
+        }
+
+        int DEFAULT_LOCAL_SERVER_RECEIVER_PORT = 8888;
+        AccessType DEFAULT_ACCESS_TYPE = AccessType.OFFLINE;
+        String DEFAULT_CREDENTIALS_PATH = "credentials.json";
+    }
+}