Cleaned up XmlRepository

Jeff Treuting · Jeff Treuting · commit 9bdcebdb5a86 · 2013-06-14T16:16:21.000-07:00
For some reason, previously we needed to clone the internal list before
using it for the queries, but that didn't seem right anymore.  So I
removed it and made sure all tests still pass.
diff --git a/SharpRepository.XmlRepository/XmlRepositoryBase.cs b/SharpRepository.XmlRepository/XmlRepositoryBase.cs
@@ -11,7 +11,7 @@ namespace SharpRepository.XmlRepository
 {
     public abstract class XmlRepositoryBase<T, TKey> : LinqRepositoryBase<T, TKey> where T : class, new()
     {
-        private IList<T> _items = new List<T>();
+        private List<T> _items = new List<T>();
         private string _storagePath;
 
         /// <summary>
@@ -50,7 +50,7 @@ private void LoadItems()
             reader.Close();
         }
 
-        protected IList<T> Items
+        protected List<T> Items
         {
             get
             {
@@ -60,37 +60,38 @@ protected IList<T> Items
 
         protected override IQueryable<T> BaseQuery(IFetchStrategy<T> fetchStrategy = null)
         {
-            return CloneList(Items).AsQueryable();
+            return Items.AsQueryable();
+            //return CloneList(Items).AsQueryable();
         }
 
         protected override T GetQuery(TKey key)
         {
             return BaseQuery().FirstOrDefault(x => MatchOnPrimaryKey(x, key));
         }
 
-        private static IEnumerable<T> CloneList(IList<T> list)
-        {
-            // when you Google deep copy of generic list every answer uses either the IClonable interface on the T or having the T be Serializable
-            //  since we can't really put those constraints on T I'm going to do it via reflection
-
-            var type = typeof(T);
-            var properties = type.GetProperties();
-
-            var clonedList = new List<T>(list.Count);
-
-            foreach (T item in list)
-            {
-                var newItem = new T();
-                foreach (var propInfo in properties)
-                {
-                    propInfo.SetValue(newItem, propInfo.GetValue(item, null), null);
-                }
-
-                clonedList.Add(newItem);
-            }
-
-            return clonedList;
-        }
+//        private static IEnumerable<T> CloneList(IList<T> list)
+//        {
+//            // when you Google deep copy of generic list every answer uses either the IClonable interface on the T or having the T be Serializable
+//            //  since we can't really put those constraints on T I'm going to do it via reflection
+//
+//            var type = typeof(T);
+//            var properties = type.GetProperties();
+//
+//            var clonedList = new List<T>(list.Count);
+//
+//            foreach (T item in list)
+//            {
+//                var newItem = new T();
+//                foreach (var propInfo in properties)
+//                {
+//                    propInfo.SetValue(newItem, propInfo.GetValue(item, null), null);
+//                }
+//
+//                clonedList.Add(newItem);
+//            }
+//
+//            return clonedList;
+//        }
 
         protected override void AddItem(T entity)
         {
@@ -110,7 +111,7 @@ protected override void DeleteItem(T entity)
             TKey pkValue;
             GetPrimaryKey(entity, out pkValue);
 
-            var index = Items.ToList().FindIndex(x => MatchOnPrimaryKey(x, pkValue));
+            var index = Items.FindIndex(x => MatchOnPrimaryKey(x, pkValue));
             if (index >= 0)
             {
                 Items.RemoveAt(index);
@@ -122,14 +123,14 @@ protected override void UpdateItem(T entity)
             TKey pkValue;
             GetPrimaryKey(entity, out pkValue);
 
-            var index = _items.ToList().FindIndex(x => MatchOnPrimaryKey(x, pkValue));
+            var index = Items.FindIndex(x => MatchOnPrimaryKey(x, pkValue));
             if (index >= 0)
             {
-                _items[index] = entity;
+                Items[index] = entity;
             }
         }
 
-        // need to match on primary key instead of using Equals() since the objects are not the same and are a cloned copy
+        // need to match on primary key instead of using Equals() since the objects are not the same
         private bool MatchOnPrimaryKey(T item, TKey keyValue)
         {
             TKey value;
@@ -140,7 +141,7 @@ protected override void SaveChanges()
         {
             var writer = new StreamWriter(_storagePath, false);
             var serializer = new XmlSerializer(typeof(List<T>));
-            serializer.Serialize(writer, _items);
+            serializer.Serialize(writer, Items);
             writer.Close();
         }
 
@@ -158,10 +159,10 @@ private TKey GeneratePrimaryKey()
 
             if (typeof(TKey) == typeof(string))
             {
-                return (TKey)Convert.ChangeType("ABC"+ Guid.NewGuid().ToString("N"), typeof(TKey));
+                return (TKey)Convert.ChangeType(Guid.NewGuid().ToString("N"), typeof(TKey));
             }
 
-            var last = _items.LastOrDefault() ?? new T();
+            var last = Items.LastOrDefault() ?? new T();
 
             if (typeof(TKey) == typeof(Int32))
             {
