Merge pull request #51 from cnblogs/simplify-calling-AddEnyimMemcached

cnblogs-dudu · web-flow · commit 1f4d1234055d · 2018-05-23T16:03:53.000+08:00
Add a simpler method to AddEnyimMemcached
diff --git a/Enyim.Caching/Enyim.Caching.csproj b/Enyim.Caching/Enyim.Caching.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>EnyimMemcachedCore is a Memcached client library for .NET Core. Usage: Add services.AddEnyimMemcached(...) and app.UseEnyimMemcached() in Startup. Add IMemcachedClient into constructor.</Description>
-    <VersionPrefix>2.1.0.7</VersionPrefix>
+    <VersionPrefix>2.1.1</VersionPrefix>
     <Authors>cnblogs.com</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/Enyim.Caching/EnyimMemcachedServiceCollectionExtensions.cs b/Enyim.Caching/EnyimMemcachedServiceCollectionExtensions.cs
@@ -26,7 +26,22 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi
             return AddEnyimMemcached(services, s => s.Configure(setupAction));
         }
 
-        public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfiguration configuration)
+        public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfigurationSection configurationSection)
+        {
+            if (services == null)
+            {
+                throw new ArgumentNullException(nameof(services));
+            }
+
+            if (configurationSection == null)
+            {
+                throw new ArgumentNullException(nameof(configurationSection));
+            }
+
+            return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configurationSection));
+        }
+
+        public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfiguration configuration, string sectionKey = "enyimMemcached")
         {
             if (services == null)
             {
@@ -38,7 +53,7 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi
                 throw new ArgumentNullException(nameof(configuration));
             }
 
-            return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configuration));
+            return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configuration.GetSection(sectionKey)));
         }
 
         private static IServiceCollection AddEnyimMemcached(IServiceCollection services, Action<IServiceCollection> configure)
diff --git a/SampleWebApp/Startup.cs b/SampleWebApp/Startup.cs
@@ -32,7 +32,9 @@ public Startup(IHostingEnvironment env)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));
+            services.AddEnyimMemcached(Configuration);
+            //services.AddEnyimMemcached(Configuration, "enyimMemcached");
+            //services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,22 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi`
`26`	`26`	`return AddEnyimMemcached(services, s => s.Configure(setupAction));`
`27`	`27`	`}`
`28`	`28`
`29`		`- public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfiguration configuration)`
	`29`	`+ public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfigurationSection configurationSection)`
	`30`	`+ {`
	`31`	`+ if (services == null)`
	`32`	`+ {`
	`33`	`+ throw new ArgumentNullException(nameof(services));`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ if (configurationSection == null)`
	`37`	`+ {`
	`38`	`+ throw new ArgumentNullException(nameof(configurationSection));`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configurationSection));`
	`42`	`+ }`
	`43`	`+`
	`44`	`+ public static IServiceCollection AddEnyimMemcached(this IServiceCollection services, IConfiguration configuration, string sectionKey = "enyimMemcached")`
`30`	`45`	`{`
`31`	`46`	`if (services == null)`
`32`	`47`	`{`
`@@ -38,7 +53,7 @@ public static IServiceCollection AddEnyimMemcached(this IServiceCollection servi`
`38`	`53`	`throw new ArgumentNullException(nameof(configuration));`
`39`	`54`	`}`
`40`	`55`
`41`		`- return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configuration));`
	`56`	`+ return AddEnyimMemcached(services, s => s.Configure<MemcachedClientOptions>(configuration.GetSection(sectionKey)));`
`42`	`57`	`}`
`43`	`58`
`44`	`59`	`private static IServiceCollection AddEnyimMemcached(IServiceCollection services, Action<IServiceCollection> configure)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ public Startup(IHostingEnvironment env)`
`32`	`32`
`33`	`33`	`public void ConfigureServices(IServiceCollection services)`
`34`	`34`	`{`
`35`		`- services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));`
	`35`	`+ services.AddEnyimMemcached(Configuration);`
	`36`	`+ //services.AddEnyimMemcached(Configuration, "enyimMemcached");`
	`37`	`+ //services.AddEnyimMemcached(Configuration.GetSection("enyimMemcached"));`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)`