Skip to content

Commit dda77f8

Browse files
Code analysis fixes.
Signed-off-by: JP LEGER <[email protected]>
1 parent 6feed91 commit dda77f8

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

src/Messaging/SQS/README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The plugin is configured in the Messaging section of `appsettings.json` / `appse
9696

9797
```json
9898
"messaging": {
99-
"publisherServiceAssemblyName": "Monai.Deploy.Messaging.SQS.SQSMessagePublisherService, Monai.Deploy.Messaging",
99+
"publisherServiceAssemblyName": "Monai.Deploy.Messaging.SQS.SqsMessagePublisherService, Monai.Deploy.Messaging",
100100
"subscriberServiceAssemblyName": "Monai.Deploy.Messaging.SQS.SqsMessageSubscriberService, Monai.Deploy.Messaging",
101101
"publisherSettings": {
102102
"bucketName": "monai-minio",

src/Messaging/SQS/SQSMessagePublisherService.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
namespace Monai.Deploy.Messaging.SQS
1616
{
17-
public class SQSMessagePublisherService : IMessageBrokerPublisherService
17+
public class SqsMessagePublisherService : IMessageBrokerPublisherService
1818
{
1919
private const int PersistentDeliveryMode = 2;
2020

21-
private readonly ILogger<SQSMessagePublisherService> _logger;
21+
private readonly ILogger<SqsMessagePublisherService> _logger;
2222
private readonly string? _accessKey;
2323
private readonly string? _accessToken;
2424
private readonly string _environmentId = string.Empty;
@@ -32,8 +32,8 @@ public class SQSMessagePublisherService : IMessageBrokerPublisherService
3232
private readonly AmazonS3Client? _s3Client;
3333
private readonly AmazonSQSExtendedClient? _sqSExtendedClient;
3434

35-
public SQSMessagePublisherService(IOptions<MessageBrokerServiceConfiguration> options,
36-
ILogger<SQSMessagePublisherService> logger)
35+
public SqsMessagePublisherService(IOptions<MessageBrokerServiceConfiguration> options,
36+
ILogger<SqsMessagePublisherService> logger)
3737
{
3838
Guard.Against.Null(options, nameof(options));
3939

@@ -42,8 +42,6 @@ public SQSMessagePublisherService(IOptions<MessageBrokerServiceConfiguration> op
4242
var configuration = options.Value;
4343
ValidateConfiguration(configuration);
4444

45-
46-
//This 2 config entries are mandatory.
4745
_queueName = configuration.PublisherSettings[SQSConfigurationKeys.WorkflowRequestQueue];
4846
_bucketName = configuration.PublisherSettings[SQSConfigurationKeys.BucketName];
4947

@@ -176,7 +174,7 @@ public Task Publish(string topic, Monai.Deploy.Messaging.Messages.Message messag
176174
{
177175
SendMessageResponse sqsresp = _sqSExtendedClient.SendMessageAsync(sendMessageRequest).Result;
178176
}
179-
catch(Exception e)
177+
catch (Exception e)
180178
{
181179
_logger.LogError($"The message could not be posted to the queue {queueName} : \n {e.Message}");
182180
}

src/Messaging/SQS/SQSMessageSubscriberService.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,13 @@ public void SubscribeAsync(string[] topics, string queue, Func<MessageReceivedEv
188188

189189
public void Acknowledge(MessageBase message)
190190
{
191-
//We will use this to delelete the message from the SQS qeue.
191+
//No Acknowleddgement necessary with SQS. To delete the processed message is sufficient.
192192
}
193193

194194
public void Reject(MessageBase message, bool requeue = true)
195195
{
196196
Guard.Against.Null(message, nameof(message));
197197

198-
199198
}
200199

201200
protected virtual void Dispose(bool disposing)
@@ -206,7 +205,6 @@ protected virtual void Dispose(bool disposing)
206205
{
207206

208207
}
209-
210208
_disposedValue = true;
211209
}
212210
}
@@ -232,7 +230,7 @@ private static MessageReceivedEventArgs CreateMessage(Amazon.SQS.Model.Message m
232230
return new MessageReceivedEventArgs(
233231
new Monai.Deploy.Messaging.Messages.Message(
234232
body: Encoding.UTF8.GetBytes(msg.Body),
235-
messageDescription: "desc1",
233+
messageDescription: msg.MessageAttributes["ContentType"].ToString(),
236234
messageId: bodyobj["MessageId"].ToString(),
237235
applicationId: msg.Attributes["SenderId"],
238236
contentType: msg.MessageAttributes["ContentType"].ToString(),

0 commit comments

Comments
 (0)