ThreeMammals#398 refactored MemoryHttpClientCache to stop it holding …

…onto references (ThreeMammals#448)

global.json

@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "2.1.4"
+    "version": "2.1.300"
   }
 }

src/Ocelot/Requester/IHttpClientCache.cs

@@ -4,7 +4,7 @@
 
     public interface IHttpClientCache
     {
-        IHttpClient Get(string id);
-        void Set(string id, IHttpClient handler, TimeSpan expirationTime);
+        IHttpClient Get(string key);
+        void Set(string key, IHttpClient handler, TimeSpan expirationTime);
     }
 }

src/Ocelot/Requester/MemoryHttpClientCache.cs

@@ -1,40 +1,26 @@
-namespace Ocelot.Requester
-{
-    using System;
+namespace Ocelot.Requester
+{
+    using System;
     using System.Collections.Concurrent;
-
-    public class MemoryHttpClientCache : IHttpClientCache
-    {
-        private readonly ConcurrentDictionary<string, ConcurrentQueue<IHttpClient>> _httpClientsCache;
-
-        public MemoryHttpClientCache()
-        {
-            _httpClientsCache = new ConcurrentDictionary<string, ConcurrentQueue<IHttpClient>>();
+
+    public class MemoryHttpClientCache : IHttpClientCache
+    {
+        private readonly ConcurrentDictionary<string, IHttpClient> _httpClientsCache;
+
+        public MemoryHttpClientCache()
+        {
+            _httpClientsCache = new ConcurrentDictionary<string, IHttpClient>();
         }
-
-        public void Set(string id, IHttpClient client, TimeSpan expirationTime)
-        {
-            if (_httpClientsCache.TryGetValue(id, out var connectionQueue))
-            {
-                connectionQueue.Enqueue(client);
-            }
-            else
-            {
-                connectionQueue = new ConcurrentQueue<IHttpClient>();
-                connectionQueue.Enqueue(client);
-                _httpClientsCache.TryAdd(id, connectionQueue);
-            }
-        }
-
-        public IHttpClient Get(string id)
-        {
-            IHttpClient client= null;
-            if (_httpClientsCache.TryGetValue(id, out var connectionQueue))
-            {
-                connectionQueue.TryDequeue(out client);
-            }
-
-            return client;
-        }      
-    }
-}
+
+        public void Set(string key, IHttpClient client, TimeSpan expirationTime)
+        {
+            _httpClientsCache.AddOrUpdate(key, client, (k, oldValue) => client);
+        }
+
+        public IHttpClient Get(string key)
+        {
+            //todo handle error?
+            return _httpClientsCache.TryGetValue(key, out var client) ? client : null;
+        }      
+    }
+}