Skip to content

Commit c9981eb

Browse files
sjuarezgxsjuarezgx
committed
clean up the code for AWS SQS
1 parent 82ca6bd commit c9981eb

File tree

4 files changed

+45
-30
lines changed

4 files changed

+45
-30
lines changed

‎dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/AWSMessageQueueProvider.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ public SimpleMessageQueue Connect(string queueURL, out GXBaseCollection<SdtMessa
2121

2222
{
2323
MessageQueueProvider messageQueueProvider = new MessageQueueProvider();
24-
GXProperties properties = new GXProperties();
25-
properties.Add("QUEUE_AWSSQS_QUEUE_URL", queueURL);
24+
GXProperties properties = new GXProperties
25+
{
26+
{ "QUEUE_AWSSQS_QUEUE_URL", queueURL }
27+
};
2628
SimpleMessageQueue simpleMessageQueue = messageQueueProvider.Connect(AWS_SQS, properties, out GXBaseCollection<SdtMessages_Message> errorMessagesConnect, out bool successConnect);
2729
errorMessages = errorMessagesConnect;
2830
success = successConnect;
@@ -31,10 +33,12 @@ public SimpleMessageQueue Connect(string queueURL, out GXBaseCollection<SdtMessa
3133

3234
public GXProperties TransformAWSCredentials(GxUserType awsCredentials)
3335
{
34-
GXProperties properties = new GXProperties();
35-
properties.Add("QUEUE_AWSSQS_ACCESS_KEY", awsCredentials.GetPropertyValue<string>("Accesskey"));
36-
properties.Add("QUEUE_AWSSQS_SECRET_KEY", awsCredentials.GetPropertyValue<string>("Secretkey"));
37-
properties.Add("QUEUE_AWSSQS_REGION", awsCredentials.GetPropertyValue<string>("Region"));
36+
GXProperties properties = new GXProperties
37+
{
38+
{ "QUEUE_AWSSQS_ACCESS_KEY", awsCredentials.GetPropertyValue<string>("Accesskey") },
39+
{ "QUEUE_AWSSQS_SECRET_KEY", awsCredentials.GetPropertyValue<string>("Secretkey") },
40+
{ "QUEUE_AWSSQS_REGION", awsCredentials.GetPropertyValue<string>("Region") }
41+
};
3842
return properties;
3943
}
4044
}

‎dotnet/src/dotnetcore/Providers/Messaging/GXAmazonSQS/AWSQueue.cs‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace GeneXus.Messaging.Queue
1616
public class AWSQueue : QueueBase, IQueue
1717
{
1818

19-
public static String Name = "AWSSQS";
19+
public static string Name = "AWSSQS";
2020
const string ACCESS_KEY = "ACCESS_KEY";
2121
const string SECRET_ACCESS_KEY = "SECRET_KEY";
2222
const string REGION = "REGION";
@@ -313,13 +313,14 @@ private MessageQueueResult SetupMessageQueueResult(SendMessageResponse response)
313313
messageQueueResult.MessageId = response.MessageId;
314314
messageQueueResult.MessageStatus = MessageQueueResultStatus.Sent;
315315

316-
messageQueueResult.MessageAttributes = new GXProperties();
317-
318-
messageQueueResult.MessageAttributes.Add("MD5OfMessageSystemAttributes", response.MD5OfMessageSystemAttributes);
319-
messageQueueResult.MessageAttributes.Add("MD5OfMessageAttributes", response.MD5OfMessageAttributes);
320-
messageQueueResult.MessageAttributes.Add("ContentLength", response.ContentLength.ToString());
321-
messageQueueResult.MessageAttributes.Add("MD5OfMessageBody", response.MD5OfMessageBody);
322-
messageQueueResult.MessageAttributes.Add("SequenceNumber", response.SequenceNumber);
316+
messageQueueResult.MessageAttributes = new GXProperties
317+
{
318+
{ "MD5OfMessageSystemAttributes", response.MD5OfMessageSystemAttributes },
319+
{ "MD5OfMessageAttributes", response.MD5OfMessageAttributes },
320+
{ "ContentLength", response.ContentLength.ToString() },
321+
{ "MD5OfMessageBody", response.MD5OfMessageBody },
322+
{ "SequenceNumber", response.SequenceNumber }
323+
};
323324

324325
Type t = response.ResponseMetadata.GetType();
325326
PropertyInfo[] props = t.GetProperties();
@@ -342,12 +343,13 @@ private MessageQueueResult SetupMessageQueueResult(SendMessageBatchResultEntry r
342343
messageQueueResult.MessageId = response.Id;
343344
messageQueueResult.MessageStatus = MessageQueueResultStatus.Sent;
344345

345-
messageQueueResult.MessageAttributes = new GXProperties();
346-
347-
messageQueueResult.MessageAttributes.Add("MD5OfMessageSystemAttributes", response.MD5OfMessageSystemAttributes);
348-
messageQueueResult.MessageAttributes.Add("MD5OfMessageAttributes", response.MD5OfMessageAttributes);
349-
messageQueueResult.MessageAttributes.Add("MD5OfMessageBody", response.MD5OfMessageBody);
350-
messageQueueResult.MessageAttributes.Add("SequenceNumber", response.SequenceNumber);
346+
messageQueueResult.MessageAttributes = new GXProperties
347+
{
348+
{ "MD5OfMessageSystemAttributes", response.MD5OfMessageSystemAttributes },
349+
{ "MD5OfMessageAttributes", response.MD5OfMessageAttributes },
350+
{ "MD5OfMessageBody", response.MD5OfMessageBody },
351+
{ "SequenceNumber", response.SequenceNumber }
352+
};
351353
return messageQueueResult;
352354
}
353355

@@ -378,11 +380,12 @@ private SimpleQueueMessage SetupSimpleQueueMessage(Message response)
378380
simpleQueueMessage.MessageBody = response.Body;
379381
simpleQueueMessage.MessageHandleId = response.ReceiptHandle;
380382

381-
simpleQueueMessage.MessageAttributes = new GXProperties();
382-
383-
simpleQueueMessage.MessageAttributes.Add("MD5OfMessageAttributes", response.MD5OfMessageAttributes);
384-
simpleQueueMessage.MessageAttributes.Add("MD5OfBody", response.MD5OfBody);
385-
383+
simpleQueueMessage.MessageAttributes = new GXProperties
384+
{
385+
{ "MD5OfMessageAttributes", response.MD5OfMessageAttributes },
386+
{ "MD5OfBody", response.MD5OfBody }
387+
};
388+
386389
foreach (var messageAttribute in response.MessageAttributes)
387390
{
388391
MessageAttributeValue messageAttributeValue = messageAttribute.Value;

‎dotnet/src/dotnetcore/Providers/Messaging/GXQueue/MessageQueueProvider.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ private static void Preprocess(string name, GXProperties properties)
8484
break;
8585
case "AWS_SQS":
8686
className = "GeneXus.Messaging.Queue.AWSQueue";
87-
SetEncryptedProperty(properties, "QUEUE_AWSSQS_QUEUE_URL");
88-
SetEncryptedProperty(properties, "QUEUE_AWSSQS_ACCESS_KEY");
89-
SetEncryptedProperty(properties, "QUEUE_AWSSQS_SECRET_KEY");
90-
SetEncryptedProperty(properties, "QUEUE_AWSSQS_REGION");
87+
SetEncryptedProperty(properties, PropertyConstants.QUEUE_AWSSQS_QUEUE_URL);
88+
SetEncryptedProperty(properties, PropertyConstants.QUEUE_AWSSQS_ACCESS_KEY);
89+
SetEncryptedProperty(properties, PropertyConstants.QUEUE_AWSSQS_SECRET_KEY);
90+
SetEncryptedProperty(properties, PropertyConstants.QUEUE_AWSSQS_REGION);
9191
if (string.IsNullOrEmpty(providerService.ClassName) || !providerService.ClassName.Contains(className))
9292
{
93-
providerService.ClassName = "GeneXus.Messaging.Queue.AWSQueue, GXAmazonSQS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null";
93+
providerService.ClassName = PropertyConstants.AWSSQS_QUEUE_PROVIDERTYPENAME;
9494
}
9595
break;
9696

‎dotnet/src/dotnetcore/Providers/Messaging/GXQueue/PropertyConstants.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ public static class PropertyConstants
1818
public const string QUEUEURI = "QUEUEURI";
1919
public const string AUTHENTICATION_METHOD = "AUTHENTICATION_METHOD";
2020

21+
//AWS SQS
22+
23+
public const string AWSSQS_QUEUE_PROVIDERTYPENAME = "GeneXus.Messaging.Queue.AWSQueue, GXAmazonSQS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null";
24+
public const string QUEUE_AWSSQS_QUEUE_URL = "QUEUE_AWSSQS_QUEUE_URL";
25+
public const string QUEUE_AWSSQS_ACCESS_KEY = "QUEUE_AWSSQS_ACCESS_KEY";
26+
public const string QUEUE_AWSSQS_SECRET_KEY = "QUEUE_AWSSQS_SECRET_KEY";
27+
public const string QUEUE_AWSSQS_REGION = "QUEUE_AWSSQS_REGION";
28+
2129
}
2230
public enum AuthenticationMethod
2331
{

0 commit comments

Comments
 (0)