Use common base class for Local and Session storage implementations (#48)

* introduce new Storage base class

* update LocalStorage and SessionStorage to use new base class

* move the method constants to inside the Storage base class

Author: celluj34

src/Blazor.Extensions.Storage/Constants.cs

@@ -1,15 +1,5 @@
 namespace Blazor.Extensions
 {
-    internal class MethodNames
-    {
-        public const string LENGTH_METHOD = "BlazorExtensions.Storage.Length";
-        public const string KEY_METHOD = "BlazorExtensions.Storage.Key";
-        public const string GET_ITEM_METHOD = "BlazorExtensions.Storage.GetItem";
-        public const string SET_ITEM_METHOD = "BlazorExtensions.Storage.SetItem";
-        public const string REMOVE_ITEM_METHOD = "BlazorExtensions.Storage.RemoveItem";
-        public const string CLEAR_METHOD = "BlazorExtensions.Storage.Clear";
-    }
-
     internal class StorageTypeNames
     {
         public const string SESSION_STORAGE = "sessionStorage";

src/Blazor.Extensions.Storage/LocalStorage.cs

@@ -1,44 +1,10 @@
 using Blazor.Extensions.Storage.Interfaces;
 using Microsoft.JSInterop;
-using System;
-using System.Threading.Tasks;
 
 namespace Blazor.Extensions.Storage
 {
-    internal class LocalStorage : ILocalStorage
+    internal class LocalStorage : Storage, ILocalStorage
     {
-        private readonly IJSRuntime runtime;
-
-        public ValueTask<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.LOCAL_STORAGE);
-
-        public ValueTask Clear() => this.runtime.InvokeVoidAsync(MethodNames.CLEAR_METHOD, StorageTypeNames.LOCAL_STORAGE);
-
-        public LocalStorage(IJSRuntime runtime)
-        {
-            this.runtime = runtime;
-        }
-
-        public ValueTask<TItem> GetItem<TItem>(string key)
-        {
-            if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
-
-            return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);
-        }
-
-        public ValueTask<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.LOCAL_STORAGE, index);
-
-        public ValueTask RemoveItem(string key)
-        {
-            if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
-
-            return this.runtime.InvokeVoidAsync(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key);
-        }
-
-        public ValueTask SetItem<TItem>(string key, TItem item)
-        {
-            if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
-
-            return this.runtime.InvokeVoidAsync(MethodNames.SET_ITEM_METHOD, StorageTypeNames.LOCAL_STORAGE, key, item);
-        }
+        public LocalStorage(IJSRuntime runtime) : base(runtime, StorageTypeNames.LOCAL_STORAGE) {}
     }
-}
+}

src/Blazor.Extensions.Storage/SessionStorage.cs

@@ -1,44 +1,10 @@
 using Blazor.Extensions.Storage.Interfaces;
 using Microsoft.JSInterop;
-using System;
-using System.Threading.Tasks;
 
 namespace Blazor.Extensions.Storage
 {
-    internal class SessionStorage : ISessionStorage
+    internal class SessionStorage : Storage, ISessionStorage
     {
-        private readonly IJSRuntime runtime;
-
-        public ValueTask<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, StorageTypeNames.SESSION_STORAGE);
-
-        public ValueTask Clear() => this.runtime.InvokeVoidAsync(MethodNames.CLEAR_METHOD, StorageTypeNames.SESSION_STORAGE);
-
-        public SessionStorage(IJSRuntime runtime)
-        {
-            this.runtime = runtime;
-        }
-
-        public ValueTask<TItem> GetItem<TItem>(string key)
-        {
-            if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
-
-            return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);
-        }
-
-        public ValueTask<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, StorageTypeNames.SESSION_STORAGE, index);
-
-        public ValueTask RemoveItem(string key)
-        {
-            if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
-
-            return this.runtime.InvokeVoidAsync(MethodNames.REMOVE_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key);
-        }
-
-        public ValueTask SetItem<TItem>(string key, TItem item)
-        {
-            if (string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
-
-            return this.runtime.InvokeVoidAsync(MethodNames.SET_ITEM_METHOD, StorageTypeNames.SESSION_STORAGE, key, item);
-        }
+        public SessionStorage(IJSRuntime runtime) : base(runtime, StorageTypeNames.SESSION_STORAGE) {}
     }
-}
+}

src/Blazor.Extensions.Storage/Storage.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Threading.Tasks;
+using Blazor.Extensions.Storage.Interfaces;
+using Microsoft.JSInterop;
+
+namespace Blazor.Extensions.Storage
+{
+    internal abstract class Storage : IStorage
+    {
+        private readonly IJSRuntime runtime;
+        private readonly string storageName;
+
+        protected Storage(IJSRuntime runtime, string storageName)
+        {
+            this.runtime = runtime;
+            this.storageName = storageName;
+        }
+
+        public ValueTask<int> Length() => this.runtime.InvokeAsync<int>(MethodNames.LENGTH_METHOD, this.storageName);
+
+        public ValueTask Clear() => this.runtime.InvokeVoidAsync(MethodNames.CLEAR_METHOD, this.storageName);
+
+        public ValueTask<TItem> GetItem<TItem>(string key)
+        {
+            if(string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
+
+            return this.runtime.InvokeAsync<TItem>(MethodNames.GET_ITEM_METHOD, this.storageName, key);
+        }
+
+        public ValueTask<string> Key(int index) => this.runtime.InvokeAsync<string>(MethodNames.KEY_METHOD, this.storageName, index);
+
+        public ValueTask RemoveItem(string key)
+        {
+            if(string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
+
+            return this.runtime.InvokeVoidAsync(MethodNames.REMOVE_ITEM_METHOD, this.storageName, key);
+        }
+
+        public ValueTask SetItem<TItem>(string key, TItem item)
+        {
+            if(string.IsNullOrWhiteSpace(key)) throw new ArgumentNullException(nameof(key));
+
+            return this.runtime.InvokeVoidAsync(MethodNames.SET_ITEM_METHOD, this.storageName, key, item);
+        }
+
+        private class MethodNames
+        {
+            public const string LENGTH_METHOD = "BlazorExtensions.Storage.Length";
+            public const string KEY_METHOD = "BlazorExtensions.Storage.Key";
+            public const string GET_ITEM_METHOD = "BlazorExtensions.Storage.GetItem";
+            public const string SET_ITEM_METHOD = "BlazorExtensions.Storage.SetItem";
+            public const string REMOVE_ITEM_METHOD = "BlazorExtensions.Storage.RemoveItem";
+            public const string CLEAR_METHOD = "BlazorExtensions.Storage.Clear";
+        }
+    }
+}