diff --git a/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs b/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs index 6ac998c9..1c80c2aa 100644 --- a/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs +++ b/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; diff --git a/BitFaster.Caching.UnitTests/ScopedAsyncCacheTestBase.cs b/BitFaster.Caching.UnitTests/ScopedAsyncCacheTestBase.cs index 556701c1..be7cdd7b 100644 --- a/BitFaster.Caching.UnitTests/ScopedAsyncCacheTestBase.cs +++ b/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; diff --git a/BitFaster.Caching.UnitTests/ScopedCacheTestBase.cs b/BitFaster.Caching.UnitTests/ScopedCacheTestBase.cs index d0c014bc..539fa390 100644 --- a/BitFaster.Caching.UnitTests/ScopedCacheTestBase.cs +++ b/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; diff --git a/BitFaster.Caching/CacheEventProxyBase.cs b/BitFaster.Caching/CacheEventProxyBase.cs index f8114324..4dc01cc2 100644 --- a/BitFaster.Caching/CacheEventProxyBase.cs +++ b/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 : ICacheEvents { private readonly ICacheEvents events; - private event EventHandler> itemRemovedProxy; + + private event EventHandler> itemRemovedProxy; public CacheEventProxyBase(ICacheEvents events) { @@ -19,19 +19,19 @@ public CacheEventProxyBase(ICacheEvents events) public bool IsEnabled => this.events.IsEnabled; - public event EventHandler> ItemRemoved + public event EventHandler> ItemRemoved { add { this.Register(value); } remove { this.UnRegister(value); } } - private void Register(EventHandler> value) + private void Register(EventHandler> value) { itemRemovedProxy += value; events.ItemRemoved += OnItemRemoved; } - private void UnRegister(EventHandler> value) + private void UnRegister(EventHandler> value) { this.itemRemovedProxy -= value; @@ -41,7 +41,7 @@ private void UnRegister(EventHandler> value) } } - private void OnItemRemoved(object sender, Lru.ItemRemovedEventArgs args) + private void OnItemRemoved(object sender, ItemRemovedEventArgs args) { itemRemovedProxy(sender, TranslateOnRemoved(args)); } diff --git a/BitFaster.Caching/ICacheEvents.cs b/BitFaster.Caching/ICacheEvents.cs index aa39ef0f..6cd7a14d 100644 --- a/BitFaster.Caching/ICacheEvents.cs +++ b/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 { diff --git a/BitFaster.Caching/Lru/ItemRemovedEventArgs.cs b/BitFaster.Caching/ItemRemovedEventArgs.cs similarity index 91% rename from BitFaster.Caching/Lru/ItemRemovedEventArgs.cs rename to BitFaster.Caching/ItemRemovedEventArgs.cs index b1103ec1..d4c23de8 100644 --- a/BitFaster.Caching/Lru/ItemRemovedEventArgs.cs +++ b/BitFaster.Caching/ItemRemovedEventArgs.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace BitFaster.Caching.Lru +namespace BitFaster.Caching { /// /// Provides data for the ItemRemoved event. @@ -21,9 +21,9 @@ public class ItemRemovedEventArgs : EventArgs /// The reason the item was removed from the cache. public ItemRemovedEventArgs(K key, V value, ItemRemovedReason reason) { - this.Key = key; - this.Value = value; - this.Reason = reason; + Key = key; + Value = value; + Reason = reason; } /// diff --git a/BitFaster.Caching/Lru/ItemRemovedReason.cs b/BitFaster.Caching/ItemRemovedReason.cs similarity index 96% rename from BitFaster.Caching/Lru/ItemRemovedReason.cs rename to BitFaster.Caching/ItemRemovedReason.cs index 8c2c6b18..48744ed7 100644 --- a/BitFaster.Caching/Lru/ItemRemovedReason.cs +++ b/BitFaster.Caching/ItemRemovedReason.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace BitFaster.Caching.Lru +namespace BitFaster.Caching { /// /// Specifies the reason an item was removed from the Cache. diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs b/BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs index ae015686..2ebd7589 100644 --- a/BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs +++ b/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> inner) protected override ItemRemovedEventArgs TranslateOnRemoved(ItemRemovedEventArgs> inner) { - return new Lru.ItemRemovedEventArgs(inner.Key, inner.Value.ValueIfCreated, inner.Reason); + return new ItemRemovedEventArgs(inner.Key, inner.Value.ValueIfCreated, inner.Reason); } } } diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryCache.cs b/BitFaster.Caching/Synchronized/AtomicFactoryCache.cs index df03b91f..867f6e08 100644 --- a/BitFaster.Caching/Synchronized/AtomicFactoryCache.cs +++ b/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> inner) protected override ItemRemovedEventArgs TranslateOnRemoved(ItemRemovedEventArgs> inner) { - return new Lru.ItemRemovedEventArgs(inner.Key, inner.Value.ValueIfCreated, inner.Reason); + return new ItemRemovedEventArgs(inner.Key, inner.Value.ValueIfCreated, inner.Reason); } } } diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs b/BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs index c717c713..b07de119 100644 --- a/BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs +++ b/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> inner) protected override ItemRemovedEventArgs> TranslateOnRemoved(ItemRemovedEventArgs> inner) { - return new Lru.ItemRemovedEventArgs>(inner.Key, inner.Value.ScopeIfCreated, inner.Reason); + return new ItemRemovedEventArgs>(inner.Key, inner.Value.ScopeIfCreated, inner.Reason); } } } diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs b/BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs index 62f85883..746d7670 100644 --- a/BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs +++ b/BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs @@ -4,7 +4,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using BitFaster.Caching.Lru; namespace BitFaster.Caching.Synchronized { @@ -102,7 +101,7 @@ public EventProxy(ICacheEvents> inner) protected override ItemRemovedEventArgs> TranslateOnRemoved(ItemRemovedEventArgs> inner) { - return new Lru.ItemRemovedEventArgs>(inner.Key, inner.Value.ScopeIfCreated, inner.Reason); + return new ItemRemovedEventArgs>(inner.Key, inner.Value.ScopeIfCreated, inner.Reason); } } }