From 2960a3b1a27cba67ce1b0452f4cfcecddcb1c5bd Mon Sep 17 00:00:00 2001 From: Malpp Date: Fri, 5 Apr 2024 19:05:14 -0400 Subject: [PATCH] Fix typos in SQSStorage.cs (#8933) --- .../Storage/SQSStorage.cs | 20 +++++++++---------- .../Streams/SQSAdapterReceiver.cs | 2 +- .../Streaming/SQSAdapterTests.cs | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/AWS/Orleans.Streaming.SQS/Storage/SQSStorage.cs b/src/AWS/Orleans.Streaming.SQS/Storage/SQSStorage.cs index 84b5669e3d..e4e73d1265 100644 --- a/src/AWS/Orleans.Streaming.SQS/Storage/SQSStorage.cs +++ b/src/AWS/Orleans.Streaming.SQS/Storage/SQSStorage.cs @@ -20,7 +20,7 @@ internal class SQSStorage /// /// Maximum number of messages allowed by SQS to peak per request /// - public const int MAX_NUMBER_OF_MESSAGE_TO_PEAK = 10; + public const int MAX_NUMBER_OF_MESSAGE_TO_PEEK = 10; private const string AccessKeyPropertyName = "AccessKey"; private const string SecretKeyPropertyName = "SecretKey"; private const string ServicePropertyName = "Service"; @@ -53,28 +53,28 @@ public SQSStorage(ILoggerFactory loggerFactory, string queueName, string connect private void ParseDataConnectionString(string dataConnectionString) { - var parameters = dataConnectionString.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + var parameters = dataConnectionString.Split(';', StringSplitOptions.RemoveEmptyEntries); - var serviceConfig = parameters.Where(p => p.Contains(ServicePropertyName)).FirstOrDefault(); + var serviceConfig = parameters.FirstOrDefault(p => p.Contains(ServicePropertyName)); if (!string.IsNullOrWhiteSpace(serviceConfig)) { - var value = serviceConfig.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries); + var value = serviceConfig.Split('=', StringSplitOptions.RemoveEmptyEntries); if (value.Length == 2 && !string.IsNullOrWhiteSpace(value[1])) service = value[1]; } - var secretKeyConfig = parameters.Where(p => p.Contains(SecretKeyPropertyName)).FirstOrDefault(); + var secretKeyConfig = parameters.FirstOrDefault(p => p.Contains(SecretKeyPropertyName)); if (!string.IsNullOrWhiteSpace(secretKeyConfig)) { - var value = secretKeyConfig.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries); + var value = secretKeyConfig.Split('=', StringSplitOptions.RemoveEmptyEntries); if (value.Length == 2 && !string.IsNullOrWhiteSpace(value[1])) secretKey = value[1]; } - var accessKeyConfig = parameters.Where(p => p.Contains(AccessKeyPropertyName)).FirstOrDefault(); + var accessKeyConfig = parameters.FirstOrDefault(p => p.Contains(AccessKeyPropertyName)); if (!string.IsNullOrWhiteSpace(accessKeyConfig)) { - var value = accessKeyConfig.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries); + var value = accessKeyConfig.Split('=', StringSplitOptions.RemoveEmptyEntries); if (value.Length == 2 && !string.IsNullOrWhiteSpace(value[1])) accessKey = value[1]; } @@ -192,7 +192,7 @@ public async Task> GetMessages(int count = 1) if (count < 1) throw new ArgumentOutOfRangeException(nameof(count)); - var request = new ReceiveMessageRequest { QueueUrl = queueUrl, MaxNumberOfMessages = count <= MAX_NUMBER_OF_MESSAGE_TO_PEAK ? count : MAX_NUMBER_OF_MESSAGE_TO_PEAK }; + var request = new ReceiveMessageRequest { QueueUrl = queueUrl, MaxNumberOfMessages = count <= MAX_NUMBER_OF_MESSAGE_TO_PEEK ? count : MAX_NUMBER_OF_MESSAGE_TO_PEEK }; var response = await sqsClient.ReceiveMessageAsync(request); return response.Messages; } @@ -226,7 +226,7 @@ public async Task DeleteMessage(SQSMessage message) } catch (Exception exc) { - ReportErrorAndRethrow(exc, "GetMessages", ErrorCode.StreamProviderManagerBase); + ReportErrorAndRethrow(exc, "DeleteMessage", ErrorCode.StreamProviderManagerBase); } } diff --git a/src/AWS/Orleans.Streaming.SQS/Streams/SQSAdapterReceiver.cs b/src/AWS/Orleans.Streaming.SQS/Streams/SQSAdapterReceiver.cs index c97440964d..649ea1e064 100644 --- a/src/AWS/Orleans.Streaming.SQS/Streams/SQSAdapterReceiver.cs +++ b/src/AWS/Orleans.Streaming.SQS/Streams/SQSAdapterReceiver.cs @@ -78,7 +78,7 @@ public async Task> GetQueueMessagesAsync(int maxCount) if (queueRef == null) return new List(); int count = maxCount < 0 || maxCount == QueueAdapterConstants.UNLIMITED_GET_QUEUE_MSG ? - SQSStorage.MAX_NUMBER_OF_MESSAGE_TO_PEAK : Math.Min(maxCount, SQSStorage.MAX_NUMBER_OF_MESSAGE_TO_PEAK); + SQSStorage.MAX_NUMBER_OF_MESSAGE_TO_PEEK : Math.Min(maxCount, SQSStorage.MAX_NUMBER_OF_MESSAGE_TO_PEEK); var task = queueRef.GetMessages(count); outstandingTask = task; diff --git a/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs b/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs index c48ce4716f..62dfe83e2e 100644 --- a/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs +++ b/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs @@ -94,7 +94,7 @@ private async Task SendAndReceiveFromQueueAdapter(IQueueAdapterFactory adapterFa { while (receivedBatches < NumBatches) { - var messages = receiver.GetQueueMessagesAsync(SQSStorage.MAX_NUMBER_OF_MESSAGE_TO_PEAK).Result.ToArray(); + var messages = receiver.GetQueueMessagesAsync(SQSStorage.MAX_NUMBER_OF_MESSAGE_TO_PEEK).Result.ToArray(); if (!messages.Any()) { continue;