args ns (#157)

* args

* clean

Author: bitfaster

BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 using BitFaster.Caching.Synchronized;
 using FluentAssertions;
 using Xunit;

BitFaster.Caching.UnitTests/ScopedAsyncCacheTestBase.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 using FluentAssertions;
 using Xunit;
 

BitFaster.Caching.UnitTests/ScopedCacheTestBase.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 using FluentAssertions;
 using Xunit;
 

BitFaster.Caching/CacheEventProxyBase.cs

@@ -3,14 +3,14 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 
 namespace BitFaster.Caching
 {
     public abstract class CacheEventProxyBase<K, TInner, TOuter> : ICacheEvents<K, TOuter>
     {
         private readonly ICacheEvents<K, TInner> events;
-        private event EventHandler<Lru.ItemRemovedEventArgs<K, TOuter>> itemRemovedProxy;
+
+        private event EventHandler<ItemRemovedEventArgs<K, TOuter>> itemRemovedProxy;
 
         public CacheEventProxyBase(ICacheEvents<K, TInner> events)
         {
@@ -19,19 +19,19 @@ public CacheEventProxyBase(ICacheEvents<K, TInner> events)
 
         public bool IsEnabled => this.events.IsEnabled;
 
-        public event EventHandler<Lru.ItemRemovedEventArgs<K, TOuter>> ItemRemoved
+        public event EventHandler<ItemRemovedEventArgs<K, TOuter>> ItemRemoved
         {
             add { this.Register(value); }
             remove { this.UnRegister(value); }
         }
 
-        private void Register(EventHandler<Lru.ItemRemovedEventArgs<K, TOuter>> value)
+        private void Register(EventHandler<ItemRemovedEventArgs<K, TOuter>> value)
         {
             itemRemovedProxy += value;
             events.ItemRemoved += OnItemRemoved;
         }
 
-        private void UnRegister(EventHandler<Lru.ItemRemovedEventArgs<K, TOuter>> value)
+        private void UnRegister(EventHandler<ItemRemovedEventArgs<K, TOuter>> value)
         {
             this.itemRemovedProxy -= value;
 
@@ -41,7 +41,7 @@ private void UnRegister(EventHandler<Lru.ItemRemovedEventArgs<K, TOuter>> value)
             }
         }
 
-        private void OnItemRemoved(object sender, Lru.ItemRemovedEventArgs<K, TInner> args)
+        private void OnItemRemoved(object sender, ItemRemovedEventArgs<K, TInner> args)
         {
             itemRemovedProxy(sender, TranslateOnRemoved(args));
         }

BitFaster.Caching/ICacheEvents.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 
 namespace BitFaster.Caching
 {

BitFaster.Caching/Lru/ItemRemovedEventArgs.cs renamed to BitFaster.Caching/ItemRemovedEventArgs.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Lru
+namespace BitFaster.Caching
 {
     /// <summary>
     /// Provides data for the ItemRemoved event.
@@ -21,9 +21,9 @@ public class ItemRemovedEventArgs<K, V> : EventArgs
         /// <param name="reason">The reason the item was removed from the cache.</param>
         public ItemRemovedEventArgs(K key, V value, ItemRemovedReason reason)
         {
-            this.Key = key;
-            this.Value = value;
-            this.Reason = reason;
+            Key = key;
+            Value = value;
+            Reason = reason;
         }
 
         /// <summary>

BitFaster.Caching/Lru/ItemRemovedReason.cs renamed to BitFaster.Caching/ItemRemovedReason.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Lru
+namespace BitFaster.Caching
 {
     /// <summary>
     /// Specifies the reason an item was removed from the Cache.

BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 
 namespace BitFaster.Caching.Synchronized
 {
@@ -86,7 +85,7 @@ public EventProxy(ICacheEvents<K, AsyncAtomicFactory<K, V>> inner)
 
             protected override ItemRemovedEventArgs<K, V> TranslateOnRemoved(ItemRemovedEventArgs<K, AsyncAtomicFactory<K, V>> inner)
             {
-                return new Lru.ItemRemovedEventArgs<K, V>(inner.Key, inner.Value.ValueIfCreated, inner.Reason);
+                return new ItemRemovedEventArgs<K, V>(inner.Key, inner.Value.ValueIfCreated, inner.Reason);
             }
         }
     }

BitFaster.Caching/Synchronized/AtomicFactoryCache.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 
 namespace BitFaster.Caching.Synchronized
 {
@@ -91,7 +90,7 @@ public EventProxy(ICacheEvents<K, AtomicFactory<K, V>> inner)
 
             protected override ItemRemovedEventArgs<K, V> TranslateOnRemoved(ItemRemovedEventArgs<K, AtomicFactory<K, V>> inner)
             {
-                return new Lru.ItemRemovedEventArgs<K, V>(inner.Key, inner.Value.ValueIfCreated, inner.Reason);
+                return new ItemRemovedEventArgs<K, V>(inner.Key, inner.Value.ValueIfCreated, inner.Reason);
             }
         }
     }

BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs

@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 
 namespace BitFaster.Caching.Synchronized
 {
@@ -104,7 +103,7 @@ public EventProxy(ICacheEvents<K, ScopedAsyncAtomicFactory<K, V>> inner)
 
             protected override ItemRemovedEventArgs<K, Scoped<V>> TranslateOnRemoved(ItemRemovedEventArgs<K, ScopedAsyncAtomicFactory<K, V>> inner)
             {
-                return new Lru.ItemRemovedEventArgs<K, Scoped<V>>(inner.Key, inner.Value.ScopeIfCreated, inner.Reason);
+                return new ItemRemovedEventArgs<K, Scoped<V>>(inner.Key, inner.Value.ScopeIfCreated, inner.Reason);
             }
         }
     }