Remove gxClassR dependency from CloudStorage

Author: ggallotti

gxcloudstorage-awss3/pom.xml

@@ -14,6 +14,12 @@
     <name>GeneXus AWS S3 Cloud Storage</name>
 
 	<dependencies>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.genexus</groupId>
             <artifactId>gxcloudstorage-common</artifactId>

gxcloudstorage-awss3/src/main/java/com/genexus/db/driver/ExternalProviderS3.java

@@ -8,7 +8,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import com.amazonaws.HttpMethod;
-import com.genexus.Application;
 import com.genexus.util.GXService;
 import com.genexus.util.StorageUtils;
 import com.genexus.StructSdtMessages_Message;
@@ -75,10 +74,6 @@ public String getName(){
 		return NAME;
 	}
 
-	public ExternalProviderS3(String service) throws Exception{
-		this(Application.getGXServices().get(service));
-	}
-
 	public ExternalProviderS3() throws Exception{
 		super();
 		initialize();

gxcloudstorage-azureblob/pom.xml

@@ -14,6 +14,12 @@
     <name>GeneXus Azure Blob Cloud Storage</name>
 
 	<dependencies>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.genexus</groupId>
             <artifactId>gxcloudstorage-common</artifactId>

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

@@ -1,6 +1,5 @@
 package com.genexus.db.driver;
 
-import com.genexus.Application;
 import com.genexus.StructSdtMessages_Message;
 import com.genexus.util.GXService;
 import com.genexus.util.StorageUtils;
@@ -47,10 +46,6 @@ public class ExternalProviderAzureStorage extends ExternalProviderBase implement
 	private String privateContainerName;
 	private String publicContainerName;
 
-	public ExternalProviderAzureStorage(String service) throws Exception {
-		this(Application.getGXServices().get(service));
-	}
-
 	private void init() throws Exception {
 		try {
 			account = getEncryptedPropertyValue(ACCOUNT, ACCOUNT_DEPRECATED);

gxcloudstorage-common/pom.xml

@@ -13,12 +13,27 @@
     <artifactId>gxcloudstorage-common</artifactId>
 	<name>GeneXus Cloud Storage Common</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>gxcommon</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxcommon</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

gxcloudstorage-googlecloudstorage/pom.xml

@@ -14,6 +14,12 @@
     <name>GeneXus Google Cloud Storage</name>
 
 	<dependencies>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.genexus</groupId>
             <artifactId>gxcloudstorage-common</artifactId>

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

@@ -1,6 +1,5 @@
 package com.genexus.db.driver;
 
-import com.genexus.Application;
 import com.genexus.StructSdtMessages_Message;
 import com.genexus.util.GXService;
 import com.genexus.util.StorageUtils;
@@ -57,10 +56,6 @@ public ExternalProviderGoogle() throws Exception{
 		initialize();
 	}
 
-	public ExternalProviderGoogle(String service) throws Exception{
-		this(Application.getGXServices().get(service));
-	}
-
 	public ExternalProviderGoogle(GXService providerService) throws Exception{
 		super(providerService);
 		initialize();

gxcloudstorage-ibmcos/pom.xml

@@ -14,6 +14,12 @@
 	<name>GeneXus IBM Cloud Storage</name>
 
 	<dependencies>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.genexus</groupId>
             <artifactId>gxcloudstorage-common</artifactId>

gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java

@@ -1,9 +1,7 @@
 package com.genexus.db.driver;
 
-import com.genexus.Application;
 import com.genexus.StructSdtMessages_Message;
 import com.genexus.util.GXService;
-import com.genexus.util.GXServices;
 import com.genexus.util.StorageUtils;
 import com.ibm.cloud.objectstorage.ClientConfiguration;
 import com.ibm.cloud.objectstorage.HttpMethod;
@@ -57,14 +55,10 @@ public class ExternalProviderIBM extends ExternalProviderBase implements Externa
     private String endpointUrl;
 	private int defaultExpirationMinutes = DEFAULT_EXPIRATION_MINUTES;
 
-    /* For compatibility reasons with GX16 U6 or lower*/
-    public ExternalProviderIBM() throws Exception {
-        this(GXServices.STORAGE_SERVICE);
-    }
-
-    public ExternalProviderIBM(String service) throws Exception {
-        this(Application.getGXServices().get(service));
-    }
+	public ExternalProviderIBM() throws Exception{
+		super();
+		init();
+	}
 
     public ExternalProviderIBM(GXService providerService) throws Exception {
     	super(providerService);

java/src/main/java/com/genexus/Application.java

@@ -184,7 +184,7 @@ private static ExternalProvider getExternalProviderImpl(String service)
 				throw new InternalError("Unrecognized External Provider class (ClassNotFound) : " + providerService.getName() + " / " + providerService.getClassName());
 			}
 			try {
-				externalProviderImpl = (ExternalProvider) providerClass.getConstructor(String.class).newInstance(service);
+				externalProviderImpl = (ExternalProvider) providerClass.getConstructor(GXService.class).newInstance(providerService);
 			}
 			catch (Exception e)
 			{