#HouseKeeping: CloudStorage implementation refactoring. Prepare for import using gradle

.github/workflows/External-Storage-Tests.yml → .github/workflows/cloud-storage-tests.yml

@@ -1,4 +1,4 @@
-name: External Storage Tests
+name: Cloud Storage Tests
 
 on:
   workflow_dispatch:
@@ -16,8 +16,8 @@ on:
     - cron: '0 0 * * 1' # At 00:00 on (every) Monday
 
 jobs:
- test-external-storages:
-    name: Test External Storage
+ test-cloud-storage-providers:
+    name: Cloud Storage Provider Test
     env:
       GIT_REF: ${{ github.ref }}
       GIT_SHA: ${{ github.sha }}
@@ -45,7 +45,7 @@ jobs:
     - name: Install
       run: mvn -B install --file $POM_PATH
 
-    - name: Test External Storages
+    - name: Test Cloud Storage
       run: |
         export AWSS3_TEST_ENABLED=true
         export STORAGE_AWSS3_ACCESS_KEY="${{ secrets.AWSS3_ACCESS_KEY }}"
@@ -72,4 +72,4 @@ jobs:
         export STORAGE_GOOGLECS_FOLDER_NAME=gxclasses
         export STORAGE_GOOGLECS_APPLICATION_NAME=gxjavacloudstorageunittests
 
-        mvn -B -pl gxexternalproviders test --file $POM_PATH
+        mvn -B -pl gxcloudstorage-tests test --file $POM_PATH

gxcloudstorage-awss3/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.genexus</groupId>
+		<artifactId>parent</artifactId>
+		<version>${revision}${changelist}</version>
+	</parent>
+
+    <artifactId>gxcloudstorage-awss3</artifactId>
+    <name>GeneXus AWS S3 Cloud Storage</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>gxclassR</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxcloudstorage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
+            <version>${com.amazonaws.version}</version>
+        </dependency>
+    </dependencies>
+</project>

gxcloudstorage-azureblob/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.genexus</groupId>
+		<artifactId>parent</artifactId>
+		<version>${revision}${changelist}</version>
+	</parent>
+
+    <artifactId>gxcloudstorage-azureblob</artifactId>
+    <name>GeneXus Azure Blob Cloud Storage</name>
+
+	<dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxcloudstorage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		<dependency>
+			<groupId>com.microsoft.azure</groupId>
+			<artifactId>azure-storage</artifactId>
+			<version>8.6.6</version>
+		</dependency>
+	</dependencies>
+</project>

gxexternalproviders/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java → gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java

@@ -1,26 +1,21 @@
 package com.genexus.db.driver;
 
 import com.genexus.Application;
+import com.genexus.StructSdtMessages_Message;
 import com.genexus.util.GXService;
 import com.genexus.util.StorageUtils;
-import com.genexus.StructSdtMessages_Message;
-
-import com.microsoft.azure.storage.*;
+import com.microsoft.azure.storage.CloudStorageAccount;
+import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.InputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.*;
 
 public class ExternalProviderAzureStorage extends ExternalProviderBase implements ExternalProvider {
 	private static Logger logger = LogManager.getLogger(ExternalProviderAzureStorage.class);
@@ -111,7 +106,7 @@ public void download(String externalFileName, String localFile, ResourceAccessCo
 			logger.error("Invalid URI ", ex.getMessage());
 		} catch (StorageException ex) {
 			throw new RuntimeException(ex.getMessage(), ex);
-		} catch (java.io.IOException ioex) {
+		} catch (IOException ioex) {
 			logger.error("Error downloading file", ioex);
 		}
 	}
@@ -168,7 +163,7 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
 			return "";
 		} catch (StorageException ex) {
 			throw new RuntimeException(ex.getMessage(), ex);
-		} catch (java.io.IOException ex) {
+		} catch (IOException ex) {
 			logger.error("Error uploading file", ex);
 			return "";
 		}
@@ -359,7 +354,7 @@ public void createDirectory(String directoryName) {
 			logger.error("Invalid URI ", ex.getMessage());
 		} catch (StorageException ex) {
 			throw new RuntimeException(ex.getMessage(), ex);
-		} catch (java.io.IOException ioex) {
+		} catch (IOException ioex) {
 			logger.error("Error uploading file", ioex);
 		}
 	}

gxcloudstorage-common/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.genexus</groupId>
+		<artifactId>parent</artifactId>
+		<version>${revision}${changelist}</version>
+	</parent>
+
+    <artifactId>gxcloudstorage-common</artifactId>
+	<name>GeneXus Cloud Storage Common</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>gxclassR</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+    </dependencies>
+
+</project>

gxexternalproviders/src/main/java/com/genexus/db/driver/ExternalProviderBase.java → gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java

@@ -21,7 +21,7 @@ public abstract class ExternalProviderBase {
 	static final String DEFAULT_EXPIRATION_DEPRECATED = "STORAGE_PROVIDER_DEFAULT_EXPIRATION";
 
 	static final int DEFAULT_EXPIRATION_MINUTES = 24 * 60;
-	 ResourceAccessControlList defaultAcl = ResourceAccessControlList.PublicRead;
+	ResourceAccessControlList defaultAcl = ResourceAccessControlList.PublicRead;
 
 	public ExternalProviderBase() {
 		init();

gxcloudstorage-googlecloudstorage/pom.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.genexus</groupId>
+		<artifactId>parent</artifactId>
+		<version>${revision}${changelist}</version>
+	</parent>
+
+    <artifactId>gxcloudstorage-googlecloudstorage</artifactId>
+    <name>GeneXus Google Cloud Storage</name>
+
+	<dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxcloudstorage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-storage</artifactId>
+            <version>1.118.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>listenablefuture</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.j2objc</groupId>
+                    <artifactId>j2objc-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.auto.value</groupId>
+                    <artifactId>auto-value-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.api.grpc</groupId>
+                    <artifactId>proto-google-common-protos</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+
+                <exclusion>
+                    <groupId>com.google.api.grpc</groupId>
+                    <artifactId>proto-google-iam-v1</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java-util</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+	</dependencies>
+</project>

gxexternalproviders/src/main/java/com/genexus/db/driver/ExternalProviderGoogle.java → gxcloudstorage-googlecloudstorage/src/main/java/com/genexus/db/driver/ExternalProviderGoogle.java

@@ -1,45 +1,34 @@
 package com.genexus.db.driver;
 
 import com.genexus.Application;
+import com.genexus.StructSdtMessages_Message;
 import com.genexus.util.GXService;
 import com.genexus.util.StorageUtils;
-import com.genexus.StructSdtMessages_Message;
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.InputStreamContent;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.storage.StorageScopes;
 import com.google.api.services.storage.model.Objects;
 import com.google.api.services.storage.model.StorageObject;
-import com.google.cloud.storage.*;
 import com.google.auth.oauth2.ServiceAccountCredentials;
+import com.google.cloud.storage.*;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.URLDecoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 public class ExternalProviderGoogle extends ExternalProviderBase implements ExternalProvider  {
 
 	private static Logger logger = LogManager.getLogger(ExternalProviderGoogle.class);

gxcloudstorage-ibmcos/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.genexus</groupId>
+		<artifactId>parent</artifactId>
+		<version>${revision}${changelist}</version>
+	</parent>
+
+    <artifactId>gxcloudstorage-ibmcos</artifactId>
+	<name>GeneXus IBM Cloud Storage</name>
+
+	<dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxcloudstorage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.cos</groupId>
+            <artifactId>ibm-cos-java-sdk-s3</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+	</dependencies>
+
+</project>