From b7b39c72e128971979af044470778865fb259b69 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 14:03:50 -0300 Subject: [PATCH 01/10] Remove gxClassR dependency from CloudStorage --- gxcloudstorage-awss3-v1/pom.xml | 5 ----- gxcloudstorage-azureblob/pom.xml | 5 ----- gxcloudstorage-common/pom.xml | 2 +- gxcloudstorage-googlecloudstorage/pom.xml | 5 ----- gxcloudstorage-ibmcos/pom.xml | 5 ----- 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/gxcloudstorage-awss3-v1/pom.xml b/gxcloudstorage-awss3-v1/pom.xml index e5f2ab5ae..7772665de 100644 --- a/gxcloudstorage-awss3-v1/pom.xml +++ b/gxcloudstorage-awss3-v1/pom.xml @@ -14,11 +14,6 @@ GeneXus AWS S3 (V1) Cloud Storage - - ${project.groupId} - gxclassR - ${project.version} - com.genexus gxcloudstorage-common diff --git a/gxcloudstorage-azureblob/pom.xml b/gxcloudstorage-azureblob/pom.xml index af5675dce..33e84ee4b 100644 --- a/gxcloudstorage-azureblob/pom.xml +++ b/gxcloudstorage-azureblob/pom.xml @@ -14,11 +14,6 @@ GeneXus Azure Blob Cloud Storage - - ${project.groupId} - gxclassR - ${project.version} - com.genexus gxcloudstorage-common diff --git a/gxcloudstorage-common/pom.xml b/gxcloudstorage-common/pom.xml index 0d255c645..5a52184f4 100644 --- a/gxcloudstorage-common/pom.xml +++ b/gxcloudstorage-common/pom.xml @@ -16,7 +16,7 @@ ${project.groupId} - gxclassR + gxcommon ${project.version} diff --git a/gxcloudstorage-googlecloudstorage/pom.xml b/gxcloudstorage-googlecloudstorage/pom.xml index 7decd8b39..57f2f4362 100644 --- a/gxcloudstorage-googlecloudstorage/pom.xml +++ b/gxcloudstorage-googlecloudstorage/pom.xml @@ -14,11 +14,6 @@ GeneXus Google Cloud Storage - - ${project.groupId} - gxclassR - ${project.version} - com.genexus gxcloudstorage-common diff --git a/gxcloudstorage-ibmcos/pom.xml b/gxcloudstorage-ibmcos/pom.xml index 5ba1e55c1..d7e83b5d1 100644 --- a/gxcloudstorage-ibmcos/pom.xml +++ b/gxcloudstorage-ibmcos/pom.xml @@ -14,11 +14,6 @@ GeneXus IBM Cloud Storage - - ${project.groupId} - gxclassR - ${project.version} - com.genexus gxcloudstorage-common From 45c7b4e39e8642889b068380e4a8a9b89fee45f1 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 14:11:32 -0300 Subject: [PATCH 02/10] Remove gxClassR dependency from CloudStorage --- gxcloudstorage-awss3-v1/pom.xml | 6 ++++++ gxcloudstorage-awss3-v2/pom.xml | 6 ++++++ gxcloudstorage-azureblob/pom.xml | 6 ++++++ gxcloudstorage-googlecloudstorage/pom.xml | 6 ++++++ gxcloudstorage-ibmcos/pom.xml | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/gxcloudstorage-awss3-v1/pom.xml b/gxcloudstorage-awss3-v1/pom.xml index 7772665de..cd2de5134 100644 --- a/gxcloudstorage-awss3-v1/pom.xml +++ b/gxcloudstorage-awss3-v1/pom.xml @@ -14,6 +14,12 @@ GeneXus AWS S3 (V1) Cloud Storage + + com.genexus + gxclassR + ${project.version} + test + com.genexus gxcloudstorage-common diff --git a/gxcloudstorage-awss3-v2/pom.xml b/gxcloudstorage-awss3-v2/pom.xml index 283598786..735ae78ee 100644 --- a/gxcloudstorage-awss3-v2/pom.xml +++ b/gxcloudstorage-awss3-v2/pom.xml @@ -14,6 +14,12 @@ GeneXus AWS S3 (V2) Cloud Storage + + com.genexus + gxclassR + ${project.version} + test + ${project.groupId} gxclassR diff --git a/gxcloudstorage-azureblob/pom.xml b/gxcloudstorage-azureblob/pom.xml index 33e84ee4b..6b1aa9db8 100644 --- a/gxcloudstorage-azureblob/pom.xml +++ b/gxcloudstorage-azureblob/pom.xml @@ -14,6 +14,12 @@ GeneXus Azure Blob Cloud Storage + + com.genexus + gxclassR + ${project.version} + test + com.genexus gxcloudstorage-common diff --git a/gxcloudstorage-googlecloudstorage/pom.xml b/gxcloudstorage-googlecloudstorage/pom.xml index 57f2f4362..5606567f2 100644 --- a/gxcloudstorage-googlecloudstorage/pom.xml +++ b/gxcloudstorage-googlecloudstorage/pom.xml @@ -14,6 +14,12 @@ GeneXus Google Cloud Storage + + com.genexus + gxclassR + ${project.version} + test + com.genexus gxcloudstorage-common diff --git a/gxcloudstorage-ibmcos/pom.xml b/gxcloudstorage-ibmcos/pom.xml index d7e83b5d1..074326fbf 100644 --- a/gxcloudstorage-ibmcos/pom.xml +++ b/gxcloudstorage-ibmcos/pom.xml @@ -14,6 +14,12 @@ GeneXus IBM Cloud Storage + + com.genexus + gxclassR + ${project.version} + test + com.genexus gxcloudstorage-common From 2ad43529ac43c2133dda29f7938ca58a9a6677f7 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 14:12:40 -0300 Subject: [PATCH 03/10] Remove gxClassR dependency from CloudStorage --- gxcloudstorage-awss3-v2/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gxcloudstorage-awss3-v2/pom.xml b/gxcloudstorage-awss3-v2/pom.xml index 735ae78ee..4244c4f30 100644 --- a/gxcloudstorage-awss3-v2/pom.xml +++ b/gxcloudstorage-awss3-v2/pom.xml @@ -20,11 +20,6 @@ ${project.version} test - - ${project.groupId} - gxclassR - ${project.version} - com.genexus gxcloudstorage-common From b897521308970a7c5c5f1bc50f05445cdef0ad05 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 15:52:34 -0300 Subject: [PATCH 04/10] Remove gxClassR dependencies --- .../genexus/db/driver/ExternalProviderS3V1.java | 6 +----- .../genexus/db/driver/ExternalProviderS3V2.java | 5 ----- .../db/driver/ExternalProviderAzureStorage.java | 4 ---- gxcloudstorage-common/pom.xml | 15 +++++++++++++++ .../genexus/db/driver/ExternalProviderGoogle.java | 5 ----- java/src/main/java/com/genexus/Application.java | 2 +- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java b/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java index 830e92e11..bebdc4c84 100644 --- a/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java +++ b/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.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; @@ -29,6 +28,7 @@ import java.util.Date; import java.util.List; + public class ExternalProviderS3V1 extends ExternalProviderBase implements ExternalProvider { private static Logger logger = LogManager.getLogger(ExternalProviderS3V1.class); @@ -74,10 +74,6 @@ public String getName(){ return NAME; } - public ExternalProviderS3V1(String service) throws Exception{ - this(Application.getGXServices().get(service)); - } - public ExternalProviderS3V1() throws Exception{ super(); initialize(); diff --git a/gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java b/gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java index a250db53b..c5576bc4e 100644 --- a/gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java +++ b/gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java @@ -19,7 +19,6 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import com.genexus.Application; import com.genexus.util.GXService; import com.genexus.util.StorageUtils; import com.genexus.StructSdtMessages_Message; @@ -80,10 +79,6 @@ public String getName() { return NAME; } - public ExternalProviderS3V2(String service) throws Exception { - this(Application.getGXServices().get(service)); - } - public ExternalProviderS3V2() throws Exception { super(); initialize(); diff --git a/gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java b/gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java index 332aa47c0..ed25d917b 100644 --- a/gxcloudstorage-azureblob/src/main/java/com/genexus/db/driver/ExternalProviderAzureStorage.java +++ b/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,9 +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 { diff --git a/gxcloudstorage-common/pom.xml b/gxcloudstorage-common/pom.xml index 5a52184f4..8f8724f1c 100644 --- a/gxcloudstorage-common/pom.xml +++ b/gxcloudstorage-common/pom.xml @@ -19,6 +19,21 @@ gxcommon ${project.version} + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + diff --git a/gxcloudstorage-googlecloudstorage/src/main/java/com/genexus/db/driver/ExternalProviderGoogle.java b/gxcloudstorage-googlecloudstorage/src/main/java/com/genexus/db/driver/ExternalProviderGoogle.java index 729245e9b..7c39c45a0 100644 --- a/gxcloudstorage-googlecloudstorage/src/main/java/com/genexus/db/driver/ExternalProviderGoogle.java +++ b/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(); diff --git a/java/src/main/java/com/genexus/Application.java b/java/src/main/java/com/genexus/Application.java index 9b3c0e3f4..1366d03f2 100644 --- a/java/src/main/java/com/genexus/Application.java +++ b/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) { From d6d1b5ba8608c9d487c20ebc986e99cef69995c6 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 15:58:12 -0300 Subject: [PATCH 05/10] Remove gxClassR dependencies --- .../com/genexus/db/driver/ExternalProviderIBM.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java b/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java index 5d3977647..fec79c230 100644 --- a/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java +++ b/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,15 +55,6 @@ 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(GXService providerService) throws Exception { super(providerService); init(); From 480adf71e12279fb93834e8f7a4eba08c3044ff4 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 16:04:28 -0300 Subject: [PATCH 06/10] Fix IBMStorage --- .../src/main/java/com/genexus/db/driver/ExternalProviderIBM.java | 1 - 1 file changed, 1 deletion(-) diff --git a/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java b/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java index fec79c230..fc1d37937 100644 --- a/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java +++ b/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; - public class ExternalProviderIBM extends ExternalProviderBase implements ExternalProvider { private static Logger logger = LogManager.getLogger(ExternalProviderIBM.class); From 00f2ec8a106b006796c7d4b96915c1352fcb1048 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 30 May 2024 16:41:39 -0300 Subject: [PATCH 07/10] Fix: ExternalProviderIBM --- .../main/java/com/genexus/db/driver/ExternalProviderIBM.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java b/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java index fc1d37937..b38c8eb4b 100644 --- a/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java +++ b/gxcloudstorage-ibmcos/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java @@ -54,6 +54,11 @@ public class ExternalProviderIBM extends ExternalProviderBase implements Externa private String endpointUrl; private int defaultExpirationMinutes = DEFAULT_EXPIRATION_MINUTES; + public ExternalProviderIBM() throws Exception{ + super(); + init(); + } + public ExternalProviderIBM(GXService providerService) throws Exception { super(providerService); init(); From eb11543c7f18365ffa1674a4e05f351f6b249b9d Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Fri, 31 May 2024 09:45:58 -0300 Subject: [PATCH 08/10] Add Statr Method --- .../com/genexus/db/driver/ExternalProviderBase.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java b/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java index 9d6fc7ed1..40353a370 100644 --- a/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java +++ b/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java @@ -32,6 +32,17 @@ public ExternalProviderBase(GXService s) { init(); } + + /** + * Starts the necessary processes required for the usage of an External Object. + * This method ensures that the Provider is installed correctly before any + * operations are performed. It should be called at the beginning to set up + * the environment for the External Object. + */ + public void start() { + + } + private void init() { String aclS = getPropertyValue(DEFAULT_ACL, DEFAULT_ACL_DEPRECATED, ""); if (aclS.length() > 0) { From 829a8eb55ee8a6bdfc2e37f784b120ab7cdf0aad Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Fri, 31 May 2024 09:53:29 -0300 Subject: [PATCH 09/10] Minor improvements --- gxcloudstorage-awss3-v1/pom.xml | 2 +- gxcloudstorage-awss3-v2/pom.xml | 2 +- gxcloudstorage-azureblob/pom.xml | 2 +- .../main/java/com/genexus/db/driver/ExternalProviderBase.java | 2 +- gxcloudstorage-googlecloudstorage/pom.xml | 2 +- gxcloudstorage-ibmcos/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gxcloudstorage-awss3-v1/pom.xml b/gxcloudstorage-awss3-v1/pom.xml index cd2de5134..caabe7d44 100644 --- a/gxcloudstorage-awss3-v1/pom.xml +++ b/gxcloudstorage-awss3-v1/pom.xml @@ -15,7 +15,7 @@ - com.genexus + ${project.groupId} gxclassR ${project.version} test diff --git a/gxcloudstorage-awss3-v2/pom.xml b/gxcloudstorage-awss3-v2/pom.xml index 4244c4f30..2cf8236c8 100644 --- a/gxcloudstorage-awss3-v2/pom.xml +++ b/gxcloudstorage-awss3-v2/pom.xml @@ -15,7 +15,7 @@ - com.genexus + ${project.groupId} gxclassR ${project.version} test diff --git a/gxcloudstorage-azureblob/pom.xml b/gxcloudstorage-azureblob/pom.xml index 6b1aa9db8..ca586d19a 100644 --- a/gxcloudstorage-azureblob/pom.xml +++ b/gxcloudstorage-azureblob/pom.xml @@ -15,7 +15,7 @@ - com.genexus + ${project.groupId} gxclassR ${project.version} test diff --git a/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java b/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java index 40353a370..852495cb1 100644 --- a/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java +++ b/gxcloudstorage-common/src/main/java/com/genexus/db/driver/ExternalProviderBase.java @@ -40,7 +40,7 @@ public ExternalProviderBase(GXService s) { * the environment for the External Object. */ public void start() { - + } private void init() { diff --git a/gxcloudstorage-googlecloudstorage/pom.xml b/gxcloudstorage-googlecloudstorage/pom.xml index 5606567f2..05eeecf7f 100644 --- a/gxcloudstorage-googlecloudstorage/pom.xml +++ b/gxcloudstorage-googlecloudstorage/pom.xml @@ -15,7 +15,7 @@ - com.genexus + ${project.groupId} gxclassR ${project.version} test diff --git a/gxcloudstorage-ibmcos/pom.xml b/gxcloudstorage-ibmcos/pom.xml index 074326fbf..4299e1acb 100644 --- a/gxcloudstorage-ibmcos/pom.xml +++ b/gxcloudstorage-ibmcos/pom.xml @@ -15,7 +15,7 @@ - com.genexus + ${project.groupId} gxclassR ${project.version} test From e4beeb498cfce0eade84fe7e8a8c8e43ad38b126 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Fri, 31 May 2024 10:20:30 -0300 Subject: [PATCH 10/10] Minor improvements --- gxcloudstorage-awss3-v1/pom.xml | 2 +- gxcloudstorage-tests/pom.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gxcloudstorage-awss3-v1/pom.xml b/gxcloudstorage-awss3-v1/pom.xml index caabe7d44..4235dfb1c 100644 --- a/gxcloudstorage-awss3-v1/pom.xml +++ b/gxcloudstorage-awss3-v1/pom.xml @@ -13,7 +13,7 @@ gxcloudstorage-awss3-v1 GeneXus AWS S3 (V1) Cloud Storage - + ${project.groupId} gxclassR diff --git a/gxcloudstorage-tests/pom.xml b/gxcloudstorage-tests/pom.xml index ce7d00c0a..41c583267 100644 --- a/gxcloudstorage-tests/pom.xml +++ b/gxcloudstorage-tests/pom.xml @@ -20,36 +20,36 @@ ${project.version} - com.genexus + ${project.groupId} gxcloudstorage-common ${project.version} - com.genexus + ${project.groupId} gxcloudstorage-ibmcos ${project.version} test - com.genexus + ${project.groupId} gxcloudstorage-googlecloudstorage ${project.version} test - com.genexus + ${project.groupId} gxcloudstorage-azureblob ${project.version} test - com.genexus + ${project.groupId} gxcloudstorage-awss3-v1 ${project.version} test - com.genexus + ${project.groupId} gxcloudstorage-awss3-v2 ${project.version} test