From dd47d115116196c6e8ad6a6bbf76218860c22c70 Mon Sep 17 00:00:00 2001
From: wwwlicious <773dcf03@opayq.com>
Date: Tue, 14 Aug 2018 22:18:36 +0100
Subject: [PATCH] #4 WIP - quick tidy

---
 .../AppSettingsLimitProvider.cs                            | 7 ++-----
 src/ServiceStack.RateLimit.Redis/AttributeLimitProvider.cs | 7 ++-----
 src/ServiceStack.RateLimit.Redis/LimitProviderConstants.cs | 2 +-
 src/ServiceStack.RateLimit.Redis/LimitRateAttribute.cs     | 3 +--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/ServiceStack.RateLimit.Redis/AppSettingsLimitProvider.cs b/src/ServiceStack.RateLimit.Redis/AppSettingsLimitProvider.cs
index c42a309..d2292c1 100644
--- 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
index e5f0700..b67f856 100644
--- 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
index 68e6ad4..00f1516 100644
--- 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
index 492d586..8d82c14 100644
--- 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
                 {