#4 WIP - quick tidy

wwwlicious · Aug 14, 2018 · dd47d11 · dd47d11
1 parent ada8791
commit dd47d11
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/src/ServiceStack.RateLimit.Redis/AppSettingsLimitProvider.cs b/src/ServiceStack.RateLimit.Redis/AppSettingsLimitProvider.cs
@@ -19,11 +19,8 @@ public class AppSettingsLimitProvider : ILimitProvider
 
         public AppSettingsLimitProvider(ILimitKeyGenerator keyGenerator, IAppSettings appSettings)
         {
-            keyGenerator.ThrowIfNull(nameof(keyGenerator));
-            appSettings.ThrowIfNull(nameof(appSettings));
-
-            this.keyGenerator = keyGenerator;
-            this.appSettings = appSettings;
+            this.keyGenerator = keyGenerator.ThrowIfNull(nameof(keyGenerator));
+            this.appSettings = appSettings.ThrowIfNull(nameof(appSettings));
         }
 
         public Limits GetLimits(IRequest request)

diff --git a/src/ServiceStack.RateLimit.Redis/AttributeLimitProvider.cs b/src/ServiceStack.RateLimit.Redis/AttributeLimitProvider.cs
@@ -15,15 +15,12 @@ public class AttributeLimitProvider : ILimitProvider
 
         public AttributeLimitProvider(IAppSettings appSettings)
         {
-            appSettings.ThrowIfNull(nameof(appSettings));
-
-            this.appSettings = appSettings;
+            this.appSettings = appSettings.ThrowIfNull(nameof(appSettings));
         }
 
         public Limits GetLimits(IRequest request)
         {
-            var limits = request.Items.GetValueOrDefault(LimitRateAttribute.RequestItemName) as Limits;
-            if (limits != null)
+            if (request.Items.GetValueOrDefault(LimitRateAttribute.RequestItemName) is Limits limits)
             {
                 return limits;
             }

diff --git a/src/ServiceStack.RateLimit.Redis/LimitProviderConstants.cs b/src/ServiceStack.RateLimit.Redis/LimitProviderConstants.cs
@@ -12,7 +12,7 @@ public class LimitProviderConstants
         public const int DefaultPerMinute = 10;
         public const int DefaultPerHour = 30;
 
-        public static readonly LimitGroup DefaultLimits=new LimitGroup
+        public static readonly LimitGroup DefaultLimits = new LimitGroup
         {
             Limits = new List<LimitPerSecond>
             {

diff --git a/src/ServiceStack.RateLimit.Redis/LimitRateAttribute.cs b/src/ServiceStack.RateLimit.Redis/LimitRateAttribute.cs
@@ -63,8 +63,7 @@ public LimitRateAttribute(LimitType type, int limit, int seconds)
 
         public override void Execute(IRequest req, IResponse res, object requestDto)
         {
-            var limits = req.Items.GetValueOrDefault(RequestItemName) as Limits;
-            if (limits == null)
+            if (!(req.Items.GetValueOrDefault(RequestItemName) is Limits limits))
             {
                 req.Items[RequestItemName] = new Limits
                 {