Refacroting. More UnitTest. GeneXus API Implementation.

ggallotti · ggallotti · commit 023ec0d61b8c · 2022-06-15T16:19:13.000-03:00
diff --git a/common/src/main/java/com/genexus/db/DynamicExecute.java b/common/src/main/java/com/genexus/db/DynamicExecute.java
@@ -439,7 +439,8 @@ public static boolean dynamicExecute(ModelContext context, int handle, Class cal
 		{
 			//Application.printWarning("java.lang.reflect.InvocationTargetException Can't execute dynamic call " + className + " - " + e.getTargetException().getMessage(), e);
 			//return false;
-			throw new RuntimeException("java.lang.reflect.InvocationTargetException Can't execute dynamic call " + className + " - " + e.getTargetException().getMessage());
+			e.printStackTrace();
+			throw new RuntimeException("java.lang.reflect.InvocationTargetException Can't execute dynamic call " + className + " - " + e.getTargetException().getMessage(), e);
 		}
 		catch (InstantiationException e)
 		{
diff --git a/gxqueue/src/main/java/com/genexus/messaging/queue/Convert.java b/gxqueue/src/main/java/com/genexus/messaging/queue/Convert.java
@@ -1,7 +1,7 @@
 package com.genexus.messaging.queue;
 
 import com.genexus.GXBaseCollection;
-import com.genexus.ModelContext;
+
 import com.genexus.messaging.queue.model.SendMessageResult;
 import com.genexus.messaging.queue.model.SimpleQueueMessage;
 import com.genexus.util.GXProperties;
@@ -10,8 +10,6 @@
 import com.genexusmessaging.genexusmessagingqueue.simplequeue.SdtMessageProperty;
 import com.genexusmessaging.genexusmessagingqueue.simplequeue.SdtMessageResult;
 
-import java.util.ArrayList;
-
 public class Convert {
 
 	protected static SimpleQueueMessage toSimpleQueueMessage(SdtMessage msg) {
@@ -37,10 +35,10 @@ protected static GXBaseCollection<SdtMessageProperty> toSdtMessagePropertyCollec
 		GXBaseCollection<SdtMessageProperty> props = new GXBaseCollection<SdtMessageProperty>();
 		for (int i = 0; i < msgProps.count(); i++) {
 			GXProperty propertyItem = msgProps.item(i);
-			props.add(new SdtMessageProperty() {{
-				setgxTv_SdtMessageProperty_Propertykey(propertyItem.getKey());
-				setgxTv_SdtMessageProperty_Propertyvalue(propertyItem.getValue());
-			}});
+			SdtMessageProperty msgProperty = new SdtMessageProperty();
+			msgProperty.setgxTv_SdtMessageProperty_Propertykey(propertyItem.getKey());
+			msgProperty.setgxTv_SdtMessageProperty_Propertyvalue(propertyItem.getValue());
+			props.add(msgProperty);
 		}
 		return props;
 	}
diff --git a/gxqueue/src/main/java/com/genexus/messaging/queue/SimpleMessageQueue.java b/gxqueue/src/main/java/com/genexus/messaging/queue/SimpleMessageQueue.java
@@ -1,34 +1,25 @@
 package com.genexus.messaging.queue;
 
-
 import com.genexus.*;
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
 import com.genexus.messaging.queue.model.DeleteMessageResult;
-import com.genexus.messaging.queue.model.MessageId;
 import com.genexus.messaging.queue.model.SendMessageResult;
 import com.genexus.messaging.queue.model.SimpleQueueMessage;
 import com.genexusmessaging.genexusmessagingqueue.simplequeue.SdtMessage;
 import com.genexusmessaging.genexusmessagingqueue.simplequeue.SdtMessageResult;
 
-import java.lang.reflect.Constructor;
-
 public class SimpleMessageQueue {
 	private IQueue queue;
 	private static ILogger logger = LogManager.getLogger(SimpleMessageQueue.class);
 
-	private static String SDT_MESSAGE_CLASS_NAME = "SdtMessage";
-	private static String SDT_MESSAGEPROPERTY_CLASS_NAME = "SdtMessageProperty";
-	private static String SDT_MESSAGERESULT_CLASS_NAME = "SdtMessageResult";
-	private static String NAMESPACE = "GeneXus.Programs.genexusmessagingqueue.simplequeue";
-
-
-	public SimpleMessageQueue() {
+	public SimpleMessageQueue()
+	{
 
 	}
 
-	public SimpleMessageQueue(SimpleMessageQueue other) {
-		queue = other.queue;
+	public SimpleMessageQueue(IQueue queueProvider) {
+		queue = queueProvider;
 	}
 
 	void validQueue() throws Exception {
@@ -76,10 +67,8 @@ public GxUserType sendMessage(SdtMessage sdtMessage, GXBaseCollection<SdtMessage
 			sendMessageResult = queue.sendMessage(queueMessage);
 			success[0] = true;
 			return Convert.toSdtMessageResult(sendMessageResult);
-
 		} catch (Exception ex) {
 			queueErrorMessagesSetup(ex, errorMessages);
-
 			logger.error("Could not send queue message", ex);
 		}
 
@@ -107,14 +96,8 @@ public boolean deleteMessage(String messageHandleId, GXBaseCollection<SdtMessage
 	protected void queueErrorMessagesSetup(Exception ex, GXBaseCollection<SdtMessages_Message> messages) {
 		if (messages != null && ex != null) {
 			StructSdtMessages_Message struct = new StructSdtMessages_Message();
-			/*if (provider!=null && provider.getMessageFromException(ex, struct)) {
-				struct.setDescription(ex.getMessage());
-				struct.setType((byte) 1); //error
-				SdtMessages_Message msg = new SdtMessages_Message(struct);
-				messages.add(msg);
-			} else {
-				GXutil.ErrorToMessages("Storage Error", ex.getClass()+" " +ex.getMessage(), messages);
-			}*/
+			struct.setType((byte)1);
+			struct.setDescription(ex.getMessage());
 		}
 	}
 
diff --git a/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessage.java b/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessage.java
@@ -2,7 +2,7 @@
 
 import com.genexus.*;
 
-public class SdtMessage extends GxUserType {
+public final class SdtMessage extends GxUserType {
 	protected byte gxTv_SdtMessage_N;
 	protected byte gxTv_SdtMessage_Messageattributes_N;
 	protected String sTagName;
diff --git a/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessageOptions.java b/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessageOptions.java
@@ -5,7 +5,7 @@
 
 import java.util.*;
 
-public class SdtMessageOptions extends GxUserType {
+public final class SdtMessageOptions extends GxUserType {
 	protected byte gxTv_SdtMessageOptions_N;
 	protected short gxTv_SdtMessageOptions_Maxnumberofmessages;
 	protected int gxTv_SdtMessageOptions_Waittimeout;
diff --git a/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessageProperty.java b/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessageProperty.java
@@ -2,7 +2,7 @@
 
 import com.genexus.*;
 
-public class SdtMessageProperty extends GxUserType {
+public final class SdtMessageProperty extends GxUserType {
 	protected byte gxTv_SdtMessageProperty_N;
 	protected String gxTv_SdtMessageProperty_Propertykey;
 	protected String gxTv_SdtMessageProperty_Propertyvalue;
diff --git a/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessageResult.java b/gxqueue/src/main/java/com/genexusmessaging/genexusmessagingqueue/simplequeue/SdtMessageResult.java
@@ -2,7 +2,7 @@
 
 import com.genexus.*;
 
-public class SdtMessageResult extends GxUserType {
+public final class SdtMessageResult extends GxUserType {
 	protected byte gxTv_SdtMessageResult_N;
 	protected byte gxTv_SdtMessageResult_Messageattributes_N;
 	protected String gxTv_SdtMessageResult_Messageid;
diff --git a/gxqueueawssqs/pom.xml b/gxqueueawssqs/pom.xml
@@ -57,6 +57,9 @@
                             <Build-Path>${basedir}</Build-Path>
                         </manifestEntries>
                     </archive>
+                    <excludes>
+                        <exclude>**/com/genexusmessaging/**</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSBasicCredentials.java b/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSBasicCredentials.java
@@ -0,0 +1,31 @@
+package com.genexus.messaging.queue.aws;
+
+public class AWSBasicCredentials extends AWSCredentials {
+	private String accessKeyId;
+	private String secretKey;
+	private String region;
+
+	public String getAccessKeyId() {
+		return accessKeyId;
+	}
+
+	public void setAccessKeyId(String accessKeyId) {
+		this.accessKeyId = accessKeyId;
+	}
+
+	public String getSecretKey() {
+		return secretKey;
+	}
+
+	public void setSecretKey(String secretKey) {
+		this.secretKey = secretKey;
+	}
+
+	public String getRegion() {
+		return region;
+	}
+
+	public void setRegion(String region) {
+		this.region = region;
+	}
+}
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSCredentials.java b/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSCredentials.java
@@ -0,0 +1,4 @@
+package com.genexus.messaging.queue.aws;
+
+public abstract class AWSCredentials {
+}
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueue.java b/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueue.java
@@ -7,10 +7,8 @@
 import com.genexus.messaging.queue.model.SendMessageResult;
 
 import com.genexus.services.ServiceConfigurationException;
-import com.genexus.services.ServiceSettingsReader;
 import com.genexus.util.GXProperties;
 import com.genexus.util.GXProperty;
-import com.genexus.util.GXService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
@@ -29,11 +27,6 @@ public class AWSQueue implements IQueue {
 
 	private SqsClient sqsClient;
 
-	public static String ACCESS_KEY = "ACCESS_KEY";
-	public static String SECRET_ACCESS_KEY = "SECRET_KEY";
-	public static String REGION = "REGION";
-	public static String QUEUE_URL = "QUEUE_URL";
-
 	private String accessKey;
 	private String secret;
 	private String awsRegion;
@@ -43,24 +36,24 @@ public class AWSQueue implements IQueue {
 	private static String MESSSAGE_GROUP_ID = "MessageGroupId";
 	private static String MESSSAGE_DEDUPLICATION_ID = "MessageDeduplicationId";
 
-	public AWSQueue() throws ServiceConfigurationException {
-		initialize(new GXService());
+	public AWSQueue(String queueUrl) throws ServiceConfigurationException {
+		initialize(null, queueURL);
 	}
 
-	public AWSQueue(GXService service) throws ServiceConfigurationException {
-		initialize(service);
+	public AWSQueue(AWSBasicCredentials credentials, String queueUrl) throws ServiceConfigurationException {
+		initialize(credentials, queueUrl);
 	}
 
-	private void initialize(GXService providerService) throws ServiceConfigurationException {
-		ServiceSettingsReader serviceSettings = new ServiceSettingsReader("QUEUE", Name, providerService);
-
-		queueURL = serviceSettings.getEncryptedPropertyValue(QUEUE_URL, "");
-		accessKey = serviceSettings.getEncryptedPropertyValue(ACCESS_KEY, "");
-		secret = serviceSettings.getEncryptedPropertyValue(SECRET_ACCESS_KEY, "");
-		awsRegion = serviceSettings.getEncryptedPropertyValue(REGION, "");
-		isFIFO = queueURL.endsWith(".fifo");
+	private void initialize(AWSBasicCredentials credentials, String queueUrl) throws ServiceConfigurationException {
+		queueURL = queueUrl;
 
-		boolean bUseIAM = !serviceSettings.getPropertyValue("USE_IAM", "", "").isEmpty() || (accessKey.equals("") && secret.equals(""));
+		boolean bUseIAM = credentials == null;
+		if (!bUseIAM) {
+			accessKey = credentials.getAccessKeyId();
+			secret = credentials.getSecretKey();
+			awsRegion = credentials.getRegion();
+			isFIFO = queueURL.endsWith(".fifo");
+		}
 
 		if (bUseIAM) {
 			sqsClient = SqsClient.builder()
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueueFactory.java b/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueueFactory.java
@@ -0,0 +1,60 @@
+package com.genexus.messaging.queue.aws;
+
+import com.genexus.GXBaseCollection;
+import com.genexus.GxUserType;
+import com.genexus.SdtMessages_Message;
+import com.genexus.diagnostics.core.ILogger;
+import com.genexus.diagnostics.core.LogManager;
+import com.genexus.messaging.queue.IQueue;
+import com.genexus.messaging.queue.SimpleMessageQueue;
+import com.genexus.services.ServiceConfigurationException;
+import com.genexusmessaging.awscore.SdtAWSBasicCredentials;
+
+
+public class AWSQueueFactory {
+	private static ILogger logger = LogManager.getLogger(AWSQueueFactory.class);
+
+	public SimpleMessageQueue connect(GxUserType awsBasicCredentials, String queueURL, GXBaseCollection<SdtMessages_Message>[] errorMessagesArr, boolean[] success) {
+		GXBaseCollection<SdtMessages_Message> errMessages = errorMessagesArr[0];
+		AWSBasicCredentials credentials = new AWSBasicCredentials() {{
+			setAccessKeyId(((SdtAWSBasicCredentials)awsBasicCredentials).getgxTv_SdtAWSBasicCredentials_Accesskey());
+			setSecretKey(((SdtAWSBasicCredentials)awsBasicCredentials).getgxTv_SdtAWSBasicCredentials_Secretkey());
+			setRegion(((SdtAWSBasicCredentials)awsBasicCredentials).getgxTv_SdtAWSBasicCredentials_Region());
+		}};
+
+		try {
+			IQueue queueImpl = new AWSQueue(credentials, queueURL);
+			errMessages.clear();
+			success[0] = true;
+			return new SimpleMessageQueue(queueImpl);
+
+		} catch (ServiceConfigurationException e) {
+			handleConnectionError(errMessages, e);
+		}
+		return null;
+	}
+
+	public SimpleMessageQueue connect(String queueURL, GXBaseCollection<SdtMessages_Message>[] errorMessagesArr, boolean[] success) {
+		GXBaseCollection<SdtMessages_Message> errMessages = errorMessagesArr[0];
+
+		try {
+			IQueue queueImpl = new AWSQueue(queueURL);
+			errMessages.clear();
+			success[0] = true;
+			return new SimpleMessageQueue(queueImpl);
+
+		} catch (ServiceConfigurationException e) {
+			handleConnectionError(errMessages, e);
+		}
+		return null;
+	}
+
+	private static void handleConnectionError(GXBaseCollection<SdtMessages_Message> errMessages, ServiceConfigurationException e) {
+		logger.error("Failed to connect to AWS SQS Queue", e);
+		SdtMessages_Message msg = new SdtMessages_Message();
+		msg.setgxTv_SdtMessages_Message_Description(e.getMessage());
+		msg.setgxTv_SdtMessages_Message_Type((byte) 1);
+		errMessages.add(msg);
+	}
+
+}
diff --git a/gxqueueawssqs/src/main/java/com/genexusmessaging/awscore/SdtAWSBasicCredentials.java b/gxqueueawssqs/src/main/java/com/genexusmessaging/awscore/SdtAWSBasicCredentials.java
@@ -0,0 +1,79 @@
+package com.genexusmessaging.awscore;
+import com.genexus.*;
+
+public final class SdtAWSBasicCredentials extends GxUserType {
+	protected byte gxTv_SdtAWSBasicCredentials_N;
+	protected String sTagName;
+	protected String gxTv_SdtAWSBasicCredentials_Accesskey;
+	protected String gxTv_SdtAWSBasicCredentials_Secretkey;
+	protected String gxTv_SdtAWSBasicCredentials_Region;
+
+
+	public SdtAWSBasicCredentials() {
+		this(new ModelContext(SdtAWSBasicCredentials.class));
+	}
+
+	public SdtAWSBasicCredentials(ModelContext context) {
+		super(context, "SdtAWSBasicCredentials");
+	}
+
+	public SdtAWSBasicCredentials(int remoteHandle,
+								  ModelContext context) {
+		super(remoteHandle, context, "SdtAWSBasicCredentials");
+	}
+
+
+	public String getgxTv_SdtAWSBasicCredentials_Accesskey() {
+		return gxTv_SdtAWSBasicCredentials_Accesskey;
+	}
+
+	public void setgxTv_SdtAWSBasicCredentials_Accesskey(String value) {
+		gxTv_SdtAWSBasicCredentials_N = (byte) (0);
+		gxTv_SdtAWSBasicCredentials_Accesskey = value;
+	}
+
+	public String getgxTv_SdtAWSBasicCredentials_Secretkey() {
+		return gxTv_SdtAWSBasicCredentials_Secretkey;
+	}
+
+	public void setgxTv_SdtAWSBasicCredentials_Secretkey(String value) {
+		gxTv_SdtAWSBasicCredentials_N = (byte) (0);
+		gxTv_SdtAWSBasicCredentials_Secretkey = value;
+	}
+
+	public String getgxTv_SdtAWSBasicCredentials_Region() {
+		return gxTv_SdtAWSBasicCredentials_Region;
+	}
+
+	public void setgxTv_SdtAWSBasicCredentials_Region(String value) {
+		gxTv_SdtAWSBasicCredentials_N = (byte) (0);
+		gxTv_SdtAWSBasicCredentials_Region = value;
+	}
+
+	public void initialize(int remoteHandle) {
+		initialize();
+	}
+
+	public void initialize() {
+		gxTv_SdtAWSBasicCredentials_Accesskey = "";
+		gxTv_SdtAWSBasicCredentials_N = (byte) (1);
+		gxTv_SdtAWSBasicCredentials_Secretkey = "";
+		gxTv_SdtAWSBasicCredentials_Region = "";
+		sTagName = "";
+	}
+
+	public byte isNull() {
+		return gxTv_SdtAWSBasicCredentials_N;
+	}
+
+	public SdtAWSBasicCredentials Clone() {
+		return (SdtAWSBasicCredentials) (clone());
+	}
+
+
+	@Override
+	public String getJsonMap(String value) {
+		return null;
+	}
+}
+
diff --git a/gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestAWSQueue.java b/gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestAWSQueue.java
diff --git a/gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java b/gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,8 @@ public static boolean dynamicExecute(ModelContext context, int handle, Class cal`
`439`	`439`	`{`
`440`	`440`	`//Application.printWarning("java.lang.reflect.InvocationTargetException Can't execute dynamic call " + className + " - " + e.getTargetException().getMessage(), e);`
`441`	`441`	`//return false;`
`442`		`- throw new RuntimeException("java.lang.reflect.InvocationTargetException Can't execute dynamic call " + className + " - " + e.getTargetException().getMessage());`
	`442`	`+ e.printStackTrace();`
	`443`	`+ throw new RuntimeException("java.lang.reflect.InvocationTargetException Can't execute dynamic call " + className + " - " + e.getTargetException().getMessage(), e);`
`443`	`444`	`}`
`444`	`445`	`catch (InstantiationException e)`
`445`	`446`	`{`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.genexus.messaging.queue.aws;
++
 +public abstract class AWSCredentials {
 +}