Merge pull request #47 from catcherwong/dotnetcore

Simplify the usages of Transcoder and KeyTransformer.

Author: cnblogs-dudu

Enyim.Caching/Configuration/MemcachedClientConfiguration.cs

@@ -17,15 +17,17 @@ public class MemcachedClientConfiguration : IMemcachedClientConfiguration
         // these are lazy initialized in the getters
         private Type nodeLocator;
         private ITranscoder _transcoder;
-        private IMemcachedKeyTransformer keyTransformer;
+        private IMemcachedKeyTransformer _keyTransformer;
         private ILogger<MemcachedClientConfiguration> _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="T:MemcachedClientConfiguration"/> class.
         /// </summary>
         public MemcachedClientConfiguration(
             ILoggerFactory loggerFactory,
-            IOptions<MemcachedClientOptions> optionsAccessor)
+            IOptions<MemcachedClientOptions> optionsAccessor,
+            ITranscoder transcoder = null,
+            IMemcachedKeyTransformer keyTransformer = null)
         {
             if (optionsAccessor == null)
             {
@@ -46,7 +48,7 @@ public MemcachedClientConfiguration(
                 else
                 {
                     Servers.Add(new DnsEndPoint(server.Address, server.Port));
-                }                
+                }
             }
 
             SocketPool = new SocketPoolConfiguration();
@@ -61,8 +63,8 @@ public MemcachedClientConfiguration(
                 SocketPool.MaxPoolSize = options.SocketPool.MaxPoolSize;
                 _logger.LogInformation($"{nameof(SocketPool.MaxPoolSize)}: {SocketPool.MaxPoolSize}");
 
-                SocketPool.ConnectionTimeout = options.SocketPool.ConnectionTimeout;                
-                _logger.LogInformation($"{nameof(SocketPool.ConnectionTimeout)}: {SocketPool.ConnectionTimeout}");                              
+                SocketPool.ConnectionTimeout = options.SocketPool.ConnectionTimeout;
+                _logger.LogInformation($"{nameof(SocketPool.ConnectionTimeout)}: {SocketPool.ConnectionTimeout}");
 
                 SocketPool.ReceiveTimeout = options.SocketPool.ReceiveTimeout;
                 _logger.LogInformation($"{nameof(SocketPool.ReceiveTimeout)}: {SocketPool.ReceiveTimeout}");
@@ -104,7 +106,7 @@ public MemcachedClientConfiguration(
                 }
             }
 
-            if(!string.IsNullOrEmpty(options.KeyTransformer))
+            if (!string.IsNullOrEmpty(options.KeyTransformer))
             {
                 try
                 {
@@ -115,18 +117,23 @@ public MemcachedClientConfiguration(
                         _logger.LogDebug($"Use '{options.KeyTransformer}' KeyTransformer");
                     }
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     _logger.LogError(new EventId(), ex, $"Unable to load '{options.KeyTransformer}' KeyTransformer");
-                }                
+                }
+            }
+            else if (keyTransformer != null)
+            {
+                this._keyTransformer = keyTransformer;
+                _logger.LogDebug($"Use KeyTransformer Type : '{keyTransformer.ToString()}'");
             }
 
-            if(NodeLocator == null)
+            if (NodeLocator == null)
             {
                 NodeLocator = options.Servers.Count > 1 ? typeof(DefaultNodeLocator) : typeof(SingleNodeLocator);
             }
 
-            if(!string.IsNullOrEmpty(options.Transcoder))
+            if (!string.IsNullOrEmpty(options.Transcoder))
             {
                 try
                 {
@@ -145,140 +152,145 @@ public MemcachedClientConfiguration(
                     _logger.LogError(new EventId(), ex, $"Unable to load '{options.Transcoder}'");
                 }
             }
+            else if (transcoder != null)
+            {
+                this._transcoder = transcoder;
+                _logger.LogDebug($"Use Transcoder Type : '{transcoder.ToString()}'");
+            }
 
             if (options.NodeLocatorFactory != null)
             {
                 NodeLocatorFactory = options.NodeLocatorFactory;
             }
-        }   
-
-		/// <summary>
-		/// Adds a new server to the pool.
-		/// </summary>
-		/// <param name="address">The address and the port of the server in the format 'host:port'.</param>
-		public void AddServer(string address)
-		{
-			this.Servers.Add(ConfigurationHelper.ResolveToEndPoint(address));
-		}
-
-		/// <summary>
-		/// Adds a new server to the pool.
-		/// </summary>
-		/// <param name="address">The host name or IP address of the server.</param>
-		/// <param name="port">The port number of the memcached instance.</param>
-		public void AddServer(string host, int port)
-		{
-			this.Servers.Add(ConfigurationHelper.ResolveToEndPoint(host, port));
-		}
-
-		/// <summary>
-		/// Gets a list of <see cref="T:IPEndPoint"/> each representing a Memcached server in the pool.
-		/// </summary>
-		public IList<EndPoint> Servers { get; private set; }
-
-		/// <summary>
-		/// Gets the configuration of the socket pool.
-		/// </summary>
-		public ISocketPoolConfiguration SocketPool { get; private set; }
-
-		/// <summary>
-		/// Gets the authentication settings.
-		/// </summary>
-		public IAuthenticationConfiguration Authentication { get; private set; }
-
-		/// <summary>
-		/// Gets or sets the <see cref="T:Enyim.Caching.Memcached.IMemcachedKeyTransformer"/> which will be used to convert item keys for Memcached.
-		/// </summary>
-		public IMemcachedKeyTransformer KeyTransformer
-		{
-			get { return this.keyTransformer ?? (this.keyTransformer = new DefaultKeyTransformer()); }
-			set { this.keyTransformer = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the Type of the <see cref="T:Enyim.Caching.Memcached.IMemcachedNodeLocator"/> which will be used to assign items to Memcached nodes.
-		/// </summary>
-		/// <remarks>If both <see cref="M:NodeLocator"/> and  <see cref="M:NodeLocatorFactory"/> are assigned then the latter takes precedence.</remarks>
-		public Type NodeLocator
-		{
-			get { return this.nodeLocator; }
-			set
-			{
-				ConfigurationHelper.CheckForInterface(value, typeof(IMemcachedNodeLocator));
-				this.nodeLocator = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the NodeLocatorFactory instance which will be used to create a new IMemcachedNodeLocator instances.
-		/// </summary>
-		/// <remarks>If both <see cref="M:NodeLocator"/> and  <see cref="M:NodeLocatorFactory"/> are assigned then the latter takes precedence.</remarks>
-		public IProviderFactory<IMemcachedNodeLocator> NodeLocatorFactory { get; set; }
-
-		/// <summary>
-		/// Gets or sets the <see cref="T:Enyim.Caching.Memcached.ITranscoder"/> which will be used serialize or deserialize items.
-		/// </summary>
-		public ITranscoder Transcoder
-		{
-			get { return _transcoder ?? (_transcoder = new DefaultTranscoder()); }
-			set { _transcoder = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the type of the communication between client and server.
-		/// </summary>
-		public MemcachedProtocol Protocol { get; set; }
-
-		#region [ interface                     ]
-
-		IList<System.Net.EndPoint> IMemcachedClientConfiguration.Servers
-		{
-			get { return this.Servers; }
-		}
-
-		ISocketPoolConfiguration IMemcachedClientConfiguration.SocketPool
-		{
-			get { return this.SocketPool; }
-		}
-
-		IAuthenticationConfiguration IMemcachedClientConfiguration.Authentication
-		{
-			get { return this.Authentication; }
-		} 
+        }
+
+        /// <summary>
+        /// Adds a new server to the pool.
+        /// </summary>
+        /// <param name="address">The address and the port of the server in the format 'host:port'.</param>
+        public void AddServer(string address)
+        {
+            this.Servers.Add(ConfigurationHelper.ResolveToEndPoint(address));
+        }
+
+        /// <summary>
+        /// Adds a new server to the pool.
+        /// </summary>
+        /// <param name="address">The host name or IP address of the server.</param>
+        /// <param name="port">The port number of the memcached instance.</param>
+        public void AddServer(string host, int port)
+        {
+            this.Servers.Add(ConfigurationHelper.ResolveToEndPoint(host, port));
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="T:IPEndPoint"/> each representing a Memcached server in the pool.
+        /// </summary>
+        public IList<EndPoint> Servers { get; private set; }
+
+        /// <summary>
+        /// Gets the configuration of the socket pool.
+        /// </summary>
+        public ISocketPoolConfiguration SocketPool { get; private set; }
+
+        /// <summary>
+        /// Gets the authentication settings.
+        /// </summary>
+        public IAuthenticationConfiguration Authentication { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="T:Enyim.Caching.Memcached.IMemcachedKeyTransformer"/> which will be used to convert item keys for Memcached.
+        /// </summary>
+        public IMemcachedKeyTransformer KeyTransformer
+        {
+            get { return this._keyTransformer ?? (this._keyTransformer = new DefaultKeyTransformer()); }
+            set { this._keyTransformer = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of the <see cref="T:Enyim.Caching.Memcached.IMemcachedNodeLocator"/> which will be used to assign items to Memcached nodes.
+        /// </summary>
+        /// <remarks>If both <see cref="M:NodeLocator"/> and  <see cref="M:NodeLocatorFactory"/> are assigned then the latter takes precedence.</remarks>
+        public Type NodeLocator
+        {
+            get { return this.nodeLocator; }
+            set
+            {
+                ConfigurationHelper.CheckForInterface(value, typeof(IMemcachedNodeLocator));
+                this.nodeLocator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the NodeLocatorFactory instance which will be used to create a new IMemcachedNodeLocator instances.
+        /// </summary>
+        /// <remarks>If both <see cref="M:NodeLocator"/> and  <see cref="M:NodeLocatorFactory"/> are assigned then the latter takes precedence.</remarks>
+        public IProviderFactory<IMemcachedNodeLocator> NodeLocatorFactory { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="T:Enyim.Caching.Memcached.ITranscoder"/> which will be used serialize or deserialize items.
+        /// </summary>
+        public ITranscoder Transcoder
+        {
+            get { return _transcoder ?? (_transcoder = new DefaultTranscoder()); }
+            set { _transcoder = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the communication between client and server.
+        /// </summary>
+        public MemcachedProtocol Protocol { get; set; }
+
+        #region [ interface                     ]
+
+        IList<System.Net.EndPoint> IMemcachedClientConfiguration.Servers
+        {
+            get { return this.Servers; }
+        }
+
+        ISocketPoolConfiguration IMemcachedClientConfiguration.SocketPool
+        {
+            get { return this.SocketPool; }
+        }
+
+        IAuthenticationConfiguration IMemcachedClientConfiguration.Authentication
+        {
+            get { return this.Authentication; }
+        }
 
         IMemcachedKeyTransformer IMemcachedClientConfiguration.CreateKeyTransformer()
-		{
-			return this.KeyTransformer;
-		}
+        {
+            return this.KeyTransformer;
+        }
 
-		IMemcachedNodeLocator IMemcachedClientConfiguration.CreateNodeLocator()
-		{
-			var f = this.NodeLocatorFactory;
-			if (f != null) return f.Create();
+        IMemcachedNodeLocator IMemcachedClientConfiguration.CreateNodeLocator()
+        {
+            var f = this.NodeLocatorFactory;
+            if (f != null) return f.Create();
 
-			return this.NodeLocator == null
-					? new SingleNodeLocator() 
+            return this.NodeLocator == null
+                    ? new SingleNodeLocator()
                     : (IMemcachedNodeLocator)FastActivator.Create(this.NodeLocator);
-		}
-
-		ITranscoder IMemcachedClientConfiguration.CreateTranscoder()
-		{
-			return this.Transcoder;
-		}
-
-		IServerPool IMemcachedClientConfiguration.CreatePool()
-		{
-			switch (this.Protocol)
-			{
-				case MemcachedProtocol.Text: return new DefaultServerPool(this, new Memcached.Protocol.Text.TextOperationFactory(), _logger);
-				case MemcachedProtocol.Binary: return new BinaryPool(this, _logger);
-			}
-
-			throw new ArgumentOutOfRangeException("Unknown protocol: " + (int)this.Protocol);
-		}		
-
-		#endregion
-	}
+        }
+
+        ITranscoder IMemcachedClientConfiguration.CreateTranscoder()
+        {
+            return this.Transcoder;
+        }
+
+        IServerPool IMemcachedClientConfiguration.CreatePool()
+        {
+            switch (this.Protocol)
+            {
+                case MemcachedProtocol.Text: return new DefaultServerPool(this, new Memcached.Protocol.Text.TextOperationFactory(), _logger);
+                case MemcachedProtocol.Binary: return new BinaryPool(this, _logger);
+            }
+
+            throw new ArgumentOutOfRangeException("Unknown protocol: " + (int)this.Protocol);
+        }
+
+        #endregion
+    }
 }
 
 #region [ License information          ]

Enyim.Caching/EnyimMemcachedServiceCollectionExtensions.cs

@@ -1,12 +1,11 @@
 using Enyim.Caching;
 using Enyim.Caching.Configuration;
+using Enyim.Caching.Memcached;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -46,7 +45,10 @@ private static IServiceCollection AddEnyimMemcached(IServiceCollection services,
         {
             services.AddOptions();
             configure(services);
-            services.AddTransient<IMemcachedClientConfiguration, MemcachedClientConfiguration>();
+
+            services.TryAddSingleton<ITranscoder, DefaultTranscoder>();
+            services.TryAddSingleton<IMemcachedKeyTransformer, DefaultKeyTransformer>();
+            services.TryAddTransient<IMemcachedClientConfiguration, MemcachedClientConfiguration>();
             services.AddSingleton<MemcachedClient, MemcachedClient>();
 
             services.AddSingleton<IMemcachedClient>(factory => factory.GetService<MemcachedClient>());