Replaced ObjectDataCollection with a ConcurrentDictionary

christophano · May 24, 2018 · 26c5c03 · 26c5c03
1 parent cb18ba4
commit 26c5c03
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 232 deletions.
diff --git a/Effort.Extra.EF6.StrongName/Effort.Extra.EF6.StrongName.csproj b/Effort.Extra.EF6.StrongName/Effort.Extra.EF6.StrongName.csproj
@@ -152,9 +152,6 @@
     <Compile Include="..\Effort.Extra\ObjectData.cs">
       <Link>ObjectData.cs</Link>
     </Compile>
-    <Compile Include="..\Effort.Extra\ObjectDataCollection.cs">
-      <Link>ObjectDataCollection.cs</Link>
-    </Compile>
     <Compile Include="..\Effort.Extra\ObjectDataLoader.cs">
       <Link>ObjectDataLoader.cs</Link>
     </Compile>

diff --git a/Effort.Extra.EF6.Tests/Effort.Extra.EF6.Tests.csproj b/Effort.Extra.EF6.Tests/Effort.Extra.EF6.Tests.csproj
@@ -132,9 +132,6 @@
     <Compile Include="..\Effort.Extra.Tests\ObjectData.cs">
       <Link>ObjectData.cs</Link>
     </Compile>
-    <Compile Include="..\Effort.Extra.Tests\ObjectDataCollection.cs">
-      <Link>ObjectDataCollection.cs</Link>
-    </Compile>
     <Compile Include="..\Effort.Extra.Tests\ObjectDataLoader.cs">
       <Link>ObjectDataLoader.cs</Link>
     </Compile>

diff --git a/Effort.Extra.EF6/Effort.Extra.EF6.csproj b/Effort.Extra.EF6/Effort.Extra.EF6.csproj
@@ -146,9 +146,6 @@
     <Compile Include="..\Effort.Extra\ObjectData.cs">
       <Link>ObjectData.cs</Link>
     </Compile>
-    <Compile Include="..\Effort.Extra\ObjectDataCollection.cs">
-      <Link>ObjectDataCollection.cs</Link>
-    </Compile>
     <Compile Include="..\Effort.Extra\ObjectDataLoader.cs">
       <Link>ObjectDataLoader.cs</Link>
     </Compile>

diff --git a/Effort.Extra.StrongName/Effort.Extra.StrongName.csproj b/Effort.Extra.StrongName/Effort.Extra.StrongName.csproj
@@ -147,9 +147,6 @@
     <Compile Include="..\Effort.Extra\ObjectData.cs">
       <Link>ObjectData.cs</Link>
     </Compile>
-    <Compile Include="..\Effort.Extra\ObjectDataCollection.cs">
-      <Link>ObjectDataCollection.cs</Link>
-    </Compile>
     <Compile Include="..\Effort.Extra\ObjectDataLoader.cs">
       <Link>ObjectDataLoader.cs</Link>
     </Compile>

diff --git a/Effort.Extra.Tests/Effort.Extra.Tests.csproj b/Effort.Extra.Tests/Effort.Extra.Tests.csproj
@@ -163,7 +163,6 @@
     <Compile Include="Builder.cs" />
     <Compile Include="PersonWithAttribute.cs" />
     <Compile Include="ObjectData.cs" />
-    <Compile Include="ObjectDataCollection.cs" />
     <Compile Include="ObjectDataLoader.cs" />
     <Compile Include="ObjectDataLoaderFactory.cs" />
     <Compile Include="ObjectTableDataLoader.cs" />

diff --git a/Effort.Extra.Tests/ObjectDataCollection.cs b/Effort.Extra.Tests/ObjectDataCollection.cs
diff --git a/Effort.Extra/Effort.Extra.csproj b/Effort.Extra/Effort.Extra.csproj
@@ -142,7 +142,6 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="ObjectData.cs" />
-    <Compile Include="ObjectDataCollection.cs" />
     <Compile Include="ObjectDataLoader.cs" />
     <Compile Include="ObjectDataLoaderFactory.cs" />
     <Compile Include="ObjectDataTable`1.cs" />

diff --git a/Effort.Extra/ObjectDataCollection.cs b/Effort.Extra/ObjectDataCollection.cs
diff --git a/Effort.Extra/ObjectDataLoader.cs b/Effort.Extra/ObjectDataLoader.cs
@@ -2,6 +2,7 @@
 namespace Effort.Extra
 {
     using System;
+    using System.Collections.Concurrent;
     using System.Collections.Generic;
     using Effort.DataLoaders;
 
@@ -10,7 +11,7 @@ namespace Effort.Extra
     /// </summary>
     public class ObjectDataLoader : IDataLoader
     {
-        private static readonly ObjectDataCollection DataCollection = new ObjectDataCollection();
+        private static readonly ConcurrentDictionary<Guid, ObjectData> DataCollection = new ConcurrentDictionary<Guid, ObjectData>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectDataLoader"/> class.
@@ -25,7 +26,7 @@ public ObjectDataLoader(ObjectData data)
         {
             if (data == null) throw new ArgumentNullException(nameof(data));
             Argument = data.Identifier.ToString();
-            DataCollection.AddOrUpdate(data);
+            DataCollection.AddOrUpdate(data.Identifier, data, (key, value) => data);
         }
 
         /// <summary>
@@ -50,11 +51,9 @@ public ObjectDataLoader(ObjectData data)
         /// </exception>
         public ITableDataLoaderFactory CreateTableDataLoaderFactory()
         {
-            Guid id;
-            if (Guid.TryParse(Argument, out id))
+            if (Guid.TryParse(Argument, out var id))
             {
-                ObjectData data;
-                if (DataCollection.TryGetValue(id, out data))
+                if (DataCollection.TryGetValue(id, out var data))
                 {
                     return new ObjectDataLoaderFactory(data);
                 }