Allowed the json repository to make use of the in-memory file based repository

Author: johelvisguzman

src/DotNetToolkit.Repository.InMemory/InMemoryRepositoryBase.cs

@@ -29,7 +29,7 @@ public abstract class InMemoryRepositoryBase<TEntity, TKey> : RepositoryBase<TEn
         /// <summary>
         /// Gets or sets the name of the database.
         /// </summary>
-        protected string DatabaseName { get; set; }
+        internal string DatabaseName { get; set; }
 
         #endregion
 
@@ -49,15 +49,6 @@ protected InMemoryRepositoryBase(string databaseName = null)
 
         #region Protected Methods
 
-        /// <summary>
-        /// Ensures the in-memory store is completely deleted.
-        /// </summary>
-        protected void EnsureDeleted()
-        {
-            _context.Clear();
-            InMemoryCache<TEntity, TKey>.Instance.GetContext(DatabaseName).Clear();
-        }
-
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
@@ -77,6 +68,19 @@ protected virtual void Dispose(bool disposing)
 
         #endregion
 
+        #region Internal Methods
+
+        /// <summary>
+        /// Ensures the in-memory store is completely deleted.
+        /// </summary>
+        internal void EnsureDeleted()
+        {
+            _context.Clear();
+            InMemoryCache<TEntity, TKey>.Instance.GetContext(DatabaseName).Clear();
+        }
+
+        #endregion
+
         #region	Private Methods
 
         /// <summary>

src/DotNetToolkit.Repository.Json/DotNetToolkit.Repository.Json.csproj

@@ -18,19 +18,4 @@
     <ProjectReference Include="..\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>

src/DotNetToolkit.Repository.Json/JsonRepositoryBase.cs

@@ -3,110 +3,57 @@
     using InMemory;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Serialization;
-    using Properties;
-    using System;
     using System.Collections.Generic;
-    using System.Globalization;
     using System.IO;
 
     /// <summary>
     /// Represents a repository for storing entities as an json formatted file.
     /// </summary>
-    public abstract class JsonRepositoryBase<TEntity, TKey> : InMemoryRepositoryBase<TEntity, TKey> where TEntity : class
+    public abstract class JsonRepositoryBase<TEntity, TKey> : InMemoryFileBasedRepositoryBase<TEntity, TKey> where TEntity : class
     {
-        #region Fields
-
-        private const string FileExtension = ".json";
-
-        #endregion
-
         #region Constructors
 
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonRepositoryBase{TEntity, TKey}"/> class.
         /// </summary>
         /// <param name="filePath">The file path.</param>
-        protected JsonRepositoryBase(string filePath)
+        protected JsonRepositoryBase(string filePath) : base(filePath)
         {
-            if (string.IsNullOrEmpty(filePath))
-                throw new ArgumentNullException(nameof(filePath));
-
-            // Ensures we have a valid file
-            var fileName = filePath;
-
-            if (Directory.Exists(filePath))
-            {
-                if (!fileName.EndsWith(@"\"))
-                    fileName += @"\";
-
-                fileName += $"{GetType().Name}{FileExtension}";
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(Path.GetExtension(fileName)))
-                    fileName += FileExtension;
-
-                if (!Path.GetExtension(fileName).Equals(FileExtension))
-                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.InvalidFileExtension, fileName, FileExtension));
-
-                if (fileName.IndexOfAny(Path.GetInvalidFileNameChars()) < 0)
-                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.InvalidFilePath, fileName));
-            }
+        }
 
-            DatabaseName = fileName;
+        #endregion
 
-            // Creates the file if does not exist
-            if (!File.Exists(DatabaseName))
-            {
-                File.Create(DatabaseName).Dispose();
-            }
-            // Otherwise, try to get the data from the file
-            else
-            {
-                // Adds the data from the file into memory
-                using (var stream = new FileStream(DatabaseName, FileMode.Open, FileAccess.Read))
-                using (var reader = new StreamReader(stream))
-                {
-                    var serializer = new JsonSerializer();
-                    var entities = (List<TEntity>)serializer.Deserialize(reader, typeof(List<TEntity>));
+        #region Overrides of InMemoryFileBasedRepositoryBase<TEntity,TKey>
 
-                    EnsureDeleted();
+        /// <summary>
+        /// Gets the file extension.
+        /// </summary>
+        protected override string FileExtension { get; } = ".json";
 
-                    entities.ForEach(AddItem);
+        /// <summary>
+        /// A protected overridable method for loading the entities from the specified stream reader.
+        /// </summary>
+        protected override IEnumerable<TEntity> OnLoaded(StreamReader reader)
+        {
+            var serializer = new JsonSerializer();
+            var entities = (List<TEntity>)serializer.Deserialize(reader, typeof(List<TEntity>));
 
-                    base.SaveChanges();
-                }
-            }
+            return entities;
         }
 
-        #endregion
-
-        #region Overrides of InMemoryRepositoryBase<TEntity,TKey>
-
         /// <summary>
-        /// A protected overridable method for saving changes made in the current unit of work in the repository.
+        /// A protected overridable method for saving the entities to the specified stream writer.
         /// </summary>
-        protected override void SaveChanges()
+        protected override void OnSaved(StreamWriter writer, IEnumerable<TEntity> entities)
         {
-            using (var stream = new FileStream(DatabaseName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Delete))
+            var serializer = new JsonSerializer
             {
-                // Saves the data into memory
-                base.SaveChanges();
-
-                // Puts from memory into the file
-                using (var writer = new StreamWriter(stream))
-                {
-                    var entities = GetQuery();
-                    var serializer = new JsonSerializer
-                    {
-                        Formatting = Formatting.Indented,
-                        ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                        TypeNameHandling = TypeNameHandling.All
-                    };
+                Formatting = Formatting.Indented,
+                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                TypeNameHandling = TypeNameHandling.All
+            };
 
-                    serializer.Serialize(writer, entities);
-                }
-            }
+            serializer.Serialize(writer, entities);
         }
 
         #endregion