Code cleanup

src/DotNetCore.CAP.AmazonSQS/AmazonSQSConsumerClientFactory.cs

@@ -1,31 +1,31 @@
 // Copyright (c) .NET Core Community. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using DotNetCore.CAP.Transport;
 using Microsoft.Extensions.Options;
 
-namespace DotNetCore.CAP.AmazonSQS
+namespace DotNetCore.CAP.AmazonSQS;
+
+internal sealed class AmazonSQSConsumerClientFactory : IConsumerClientFactory
 {
-    internal sealed class AmazonSQSConsumerClientFactory : IConsumerClientFactory
+    private readonly IOptions<AmazonSQSOptions> _amazonSQSOptions;
+
+    public AmazonSQSConsumerClientFactory(IOptions<AmazonSQSOptions> amazonSQSOptions)
     {
-        private readonly IOptions<AmazonSQSOptions> _amazonSQSOptions;
+        _amazonSQSOptions = amazonSQSOptions;
+    }
 
-        public AmazonSQSConsumerClientFactory(IOptions<AmazonSQSOptions> amazonSQSOptions)
+    public IConsumerClient Create(string groupId)
+    {
+        try
         {
-            _amazonSQSOptions = amazonSQSOptions;
+            var client = new AmazonSQSConsumerClient(groupId, _amazonSQSOptions);
+            return client;
         }
-
-        public IConsumerClient Create(string groupId)
+        catch (Exception e)
         {
-            try
-            {
-               var client = new AmazonSQSConsumerClient(groupId, _amazonSQSOptions);
-               return client;
-            }
-            catch (System.Exception e)
-            {
-                throw new BrokerConnectionException(e);
-            }
+            throw new BrokerConnectionException(e);
         }
     }
 }

src/DotNetCore.CAP.AmazonSQS/CAP.AmazonSQSOptions.cs

@@ -5,24 +5,22 @@
 using Amazon.Runtime;
 
 // ReSharper disable once CheckNamespace
-namespace DotNetCore.CAP
-{
-    // ReSharper disable once InconsistentNaming
-    public class AmazonSQSOptions
-    {
-        public RegionEndpoint Region { get; set; } = default!;
+namespace DotNetCore.CAP;
 
-        public AWSCredentials? Credentials { get; set; }
+// ReSharper disable once InconsistentNaming
+public class AmazonSQSOptions
+{
+    public RegionEndpoint Region { get; set; } = default!;
 
-        /// <summary>
-        /// Overrides Service Url deduced from AWS Region. To use in local development environments like localstack.
-        /// </summary>
-        public string? SNSServiceUrl { get; set; }
+    public AWSCredentials? Credentials { get; set; }
 
-        /// <summary>
-        /// Overrides Service Url deduced from AWS Region. To use in local development environments like localstack.
-        /// </summary>
-        public string? SQSServiceUrl { get; set; }
+    /// <summary>
+    /// Overrides Service Url deduced from AWS Region. To use in local development environments like localstack.
+    /// </summary>
+    public string? SNSServiceUrl { get; set; }
 
-    }
+    /// <summary>
+    /// Overrides Service Url deduced from AWS Region. To use in local development environments like localstack.
+    /// </summary>
+    public string? SQSServiceUrl { get; set; }
 }

src/DotNetCore.CAP.AmazonSQS/CAP.AmazonSQSOptionsExtension.cs

@@ -7,24 +7,23 @@
 using Microsoft.Extensions.DependencyInjection;
 
 // ReSharper disable once CheckNamespace
-namespace DotNetCore.CAP
+namespace DotNetCore.CAP;
+
+internal sealed class AmazonSQSOptionsExtension : ICapOptionsExtension
 {
-    internal sealed class AmazonSQSOptionsExtension : ICapOptionsExtension
+    private readonly Action<AmazonSQSOptions> _configure;
+
+    public AmazonSQSOptionsExtension(Action<AmazonSQSOptions> configure)
     {
-        private readonly Action<AmazonSQSOptions> _configure;
+        _configure = configure;
+    }
 
-        public AmazonSQSOptionsExtension(Action<AmazonSQSOptions> configure)
-        {
-            _configure = configure;
-        }
+    public void AddServices(IServiceCollection services)
+    {
+        services.AddSingleton(new CapMessageQueueMakerService("Amazon SQS"));
 
-        public void AddServices(IServiceCollection services)
-        {
-            services.AddSingleton(new CapMessageQueueMakerService("Amazon SQS"));
-
-            services.Configure(_configure);
-            services.AddSingleton<ITransport, AmazonSQSTransport>();
-            services.AddSingleton<IConsumerClientFactory, AmazonSQSConsumerClientFactory>();
-        }
+        services.Configure(_configure);
+        services.AddSingleton<ITransport, AmazonSQSTransport>();
+        services.AddSingleton<IConsumerClientFactory, AmazonSQSConsumerClientFactory>();
     }
 }

src/DotNetCore.CAP.AmazonSQS/CAP.Options.Extensions.cs

@@ -6,25 +6,21 @@
 using DotNetCore.CAP;
 
 // ReSharper disable once CheckNamespace
-namespace Microsoft.Extensions.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class CapOptionsExtensions
 {
-    public static class CapOptionsExtensions
+    public static CapOptions UseAmazonSQS(this CapOptions options, RegionEndpoint region)
     {
-        public static CapOptions UseAmazonSQS(this CapOptions options, RegionEndpoint region)
-        {
-            return options.UseAmazonSQS(opt => { opt.Region =  region; });
-        }
+        return options.UseAmazonSQS(opt => { opt.Region = region; });
+    }
 
-        public static CapOptions UseAmazonSQS(this CapOptions options, Action<AmazonSQSOptions> configure)
-        {
-            if (configure == null)
-            {
-                throw new ArgumentNullException(nameof(configure));
-            }
+    public static CapOptions UseAmazonSQS(this CapOptions options, Action<AmazonSQSOptions> configure)
+    {
+        if (configure == null) throw new ArgumentNullException(nameof(configure));
 
-            options.RegisterExtension(new AmazonSQSOptionsExtension(configure));
+        options.RegisterExtension(new AmazonSQSOptionsExtension(configure));
 
-            return options;
-        }
+        return options;
     }
 }