Orleans Options - new name

KSemenenko · KSemenenko · commit 6c40aa6bacb8 · 2023-05-22T11:00:50.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,8 +17,8 @@
         <RepositoryUrl>https://github.com/managedcode/Orleans.RateLimiting</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/Orleans.RateLimiting</PackageProjectUrl>
         <Product>Managed Code - Orleans RateLimiting</Product>
-        <Version>0.0.4</Version>
-        <PackageVersion>0.0.4</PackageVersion>
+        <Version>0.0.5</Version>
+        <PackageVersion>0.0.5</PackageVersion>
 
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/ManagedCode.Orleans.RateLimiting.Core/Extensions/ServiceCollectionExtensions.cs b/ManagedCode.Orleans.RateLimiting.Core/Extensions/ServiceCollectionExtensions.cs
@@ -7,56 +7,56 @@ namespace ManagedCode.Orleans.RateLimiting.Core.Extensions;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, ConcurrencyLimiterOptions options)
+    public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, ConcurrencyLimiterOptions options)
     {
         collection.AddSingleton(new RateLimiterConfig(name, options));
         return collection;
     }
 
-    public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, FixedWindowRateLimiterOptions options)
+    public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, FixedWindowRateLimiterOptions options)
     {
         collection.AddSingleton(new RateLimiterConfig(name, options));
         return collection;
     }
 
-    public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, SlidingWindowRateLimiterOptions options)
+    public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, SlidingWindowRateLimiterOptions options)
     {
         collection.AddSingleton(new RateLimiterConfig(name, options));
         return collection;
     }
 
-    public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, TokenBucketRateLimiterOptions options)
+    public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, TokenBucketRateLimiterOptions options)
     {
         collection.AddSingleton(new RateLimiterConfig(name, options));
         return collection;
     }
 
 
-    public static IServiceCollection AddConcurrencyLimiterOptions(this IServiceCollection collection, string name, Action<ConcurrencyLimiterOptions> options)
+    public static IServiceCollection AddOrleansConcurrencyLimiterOptions(this IServiceCollection collection, string name, Action<ConcurrencyLimiterOptions> options)
     {
         var option = new ConcurrencyLimiterOptions();
         options.Invoke(option);
-        return collection.AddRateLimiterOptions(name, option);
+        return collection.AddOrleansRateLimiterOptions(name, option);
     }
 
     public static IServiceCollection AddFixedWindowRateLimiterOptions(this IServiceCollection collection, string name, Action<FixedWindowRateLimiterOptions> options)
     {
         var option = new FixedWindowRateLimiterOptions();
         options.Invoke(option);
-        return collection.AddRateLimiterOptions(name, option);
+        return collection.AddOrleansRateLimiterOptions(name, option);
     }
 
     public static IServiceCollection AddSlidingWindowRateLimiterOptions(this IServiceCollection collection, string name, Action<SlidingWindowRateLimiterOptions> options)
     {
         var option = new SlidingWindowRateLimiterOptions();
         options.Invoke(option);
-        return collection.AddRateLimiterOptions(name, option);
+        return collection.AddOrleansRateLimiterOptions(name, option);
     }
 
     public static IServiceCollection AddTokenBucketRateLimiterOptions(this IServiceCollection collection, string name, Action<TokenBucketRateLimiterOptions> options)
     {
         var option = new TokenBucketRateLimiterOptions();
         options.Invoke(option);
-        return collection.AddRateLimiterOptions(name, option);
+        return collection.AddOrleansRateLimiterOptions(name, option);
     }
 }
diff --git a/ManagedCode.Orleans.RateLimiting.Tests/Cluster/TestSiloConfigurations.cs b/ManagedCode.Orleans.RateLimiting.Tests/Cluster/TestSiloConfigurations.cs
@@ -11,20 +11,20 @@ public void Configure(ISiloBuilder siloBuilder)
     {
         siloBuilder.AddOrleansRateLimiting();
 
-        siloBuilder.Services.AddRateLimiterOptions("ConcurrencyLimiterOptions1", new ConcurrencyLimiterOptions
+        siloBuilder.Services.AddOrleansRateLimiterOptions("ConcurrencyLimiterOptions1", new ConcurrencyLimiterOptions
         {
             PermitLimit = 10,
             QueueLimit = 15
         });
 
-        siloBuilder.Services.AddConcurrencyLimiterOptions("ConcurrencyLimiterOptions2", options =>
+        siloBuilder.Services.AddOrleansConcurrencyLimiterOptions("ConcurrencyLimiterOptions2", options =>
         {
             options.PermitLimit = 2;
             options.QueueLimit = 2;
         });
 
 
-        siloBuilder.Services.AddRateLimiterOptions("FixedWindowRateLimiterOptions1", new FixedWindowRateLimiterOptions
+        siloBuilder.Services.AddOrleansRateLimiterOptions("FixedWindowRateLimiterOptions1", new FixedWindowRateLimiterOptions
         {
             PermitLimit = 10,
             QueueLimit = 15,
@@ -39,7 +39,7 @@ public void Configure(ISiloBuilder siloBuilder)
         });
 
 
-        siloBuilder.Services.AddRateLimiterOptions("SlidingWindowRateLimiterOptions1", new SlidingWindowRateLimiterOptions
+        siloBuilder.Services.AddOrleansRateLimiterOptions("SlidingWindowRateLimiterOptions1", new SlidingWindowRateLimiterOptions
         {
             PermitLimit = 10,
             QueueLimit = 15,
@@ -54,7 +54,7 @@ public void Configure(ISiloBuilder siloBuilder)
         });
 
 
-        siloBuilder.Services.AddRateLimiterOptions("TokenBucketRateLimiterOptions1", new TokenBucketRateLimiterOptions
+        siloBuilder.Services.AddOrleansRateLimiterOptions("TokenBucketRateLimiterOptions1", new TokenBucketRateLimiterOptions
         {
             QueueLimit = 10,
             ReplenishmentPeriod = TimeSpan.FromSeconds(1),
diff --git a/ManagedCode.Orleans.RateLimiting.Tests/TestApp/HttpHostProgram.cs b/ManagedCode.Orleans.RateLimiting.Tests/TestApp/HttpHostProgram.cs
@@ -15,21 +15,21 @@ public static void Main(string[] args)
         builder.Services.AddControllers();
         builder.Services.AddSignalR();
 
-        builder.Services.AddRateLimiterOptions("ip", new FixedWindowRateLimiterOptions
+        builder.Services.AddOrleansRateLimiterOptions("ip", new FixedWindowRateLimiterOptions
         {
             QueueLimit = 5,
             PermitLimit = 10,
             Window = TimeSpan.FromSeconds(1)
         });
 
-        builder.Services.AddRateLimiterOptions("Anonymous", new FixedWindowRateLimiterOptions
+        builder.Services.AddOrleansRateLimiterOptions("Anonymous", new FixedWindowRateLimiterOptions
         {
             QueueLimit = 1,
             PermitLimit = 1,
             Window = TimeSpan.FromSeconds(1)
         });
 
-        builder.Services.AddRateLimiterOptions("Authorized", new FixedWindowRateLimiterOptions
+        builder.Services.AddOrleansRateLimiterOptions("Authorized", new FixedWindowRateLimiterOptions
         {
             QueueLimit = 2,
             PermitLimit = 2,

Original file line number	Diff line number	Diff line change
`@@ -7,56 +7,56 @@ namespace ManagedCode.Orleans.RateLimiting.Core.Extensions;`
`7`	`7`
`8`	`8`	`public static class ServiceCollectionExtensions`
`9`	`9`	`{`
`10`		`- public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, ConcurrencyLimiterOptions options)`
	`10`	`+ public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, ConcurrencyLimiterOptions options)`
`11`	`11`	`{`
`12`	`12`	`collection.AddSingleton(new RateLimiterConfig(name, options));`
`13`	`13`	`return collection;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, FixedWindowRateLimiterOptions options)`
	`16`	`+ public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, FixedWindowRateLimiterOptions options)`
`17`	`17`	`{`
`18`	`18`	`collection.AddSingleton(new RateLimiterConfig(name, options));`
`19`	`19`	`return collection;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, SlidingWindowRateLimiterOptions options)`
	`22`	`+ public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, SlidingWindowRateLimiterOptions options)`
`23`	`23`	`{`
`24`	`24`	`collection.AddSingleton(new RateLimiterConfig(name, options));`
`25`	`25`	`return collection;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static IServiceCollection AddRateLimiterOptions(this IServiceCollection collection, string name, TokenBucketRateLimiterOptions options)`
	`28`	`+ public static IServiceCollection AddOrleansRateLimiterOptions(this IServiceCollection collection, string name, TokenBucketRateLimiterOptions options)`
`29`	`29`	`{`
`30`	`30`	`collection.AddSingleton(new RateLimiterConfig(name, options));`
`31`	`31`	`return collection;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`
`35`		`- public static IServiceCollection AddConcurrencyLimiterOptions(this IServiceCollection collection, string name, Action<ConcurrencyLimiterOptions> options)`
	`35`	`+ public static IServiceCollection AddOrleansConcurrencyLimiterOptions(this IServiceCollection collection, string name, Action<ConcurrencyLimiterOptions> options)`
`36`	`36`	`{`
`37`	`37`	`var option = new ConcurrencyLimiterOptions();`
`38`	`38`	`options.Invoke(option);`
`39`		`- return collection.AddRateLimiterOptions(name, option);`
	`39`	`+ return collection.AddOrleansRateLimiterOptions(name, option);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public static IServiceCollection AddFixedWindowRateLimiterOptions(this IServiceCollection collection, string name, Action<FixedWindowRateLimiterOptions> options)`
`43`	`43`	`{`
`44`	`44`	`var option = new FixedWindowRateLimiterOptions();`
`45`	`45`	`options.Invoke(option);`
`46`		`- return collection.AddRateLimiterOptions(name, option);`
	`46`	`+ return collection.AddOrleansRateLimiterOptions(name, option);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public static IServiceCollection AddSlidingWindowRateLimiterOptions(this IServiceCollection collection, string name, Action<SlidingWindowRateLimiterOptions> options)`
`50`	`50`	`{`
`51`	`51`	`var option = new SlidingWindowRateLimiterOptions();`
`52`	`52`	`options.Invoke(option);`
`53`		`- return collection.AddRateLimiterOptions(name, option);`
	`53`	`+ return collection.AddOrleansRateLimiterOptions(name, option);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public static IServiceCollection AddTokenBucketRateLimiterOptions(this IServiceCollection collection, string name, Action<TokenBucketRateLimiterOptions> options)`
`57`	`57`	`{`
`58`	`58`	`var option = new TokenBucketRateLimiterOptions();`
`59`	`59`	`options.Invoke(option);`
`60`		`- return collection.AddRateLimiterOptions(name, option);`
	`60`	`+ return collection.AddOrleansRateLimiterOptions(name, option);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,20 @@ public void Configure(ISiloBuilder siloBuilder)`
`11`	`11`	`{`
`12`	`12`	`siloBuilder.AddOrleansRateLimiting();`
`13`	`13`
`14`		`- siloBuilder.Services.AddRateLimiterOptions("ConcurrencyLimiterOptions1", new ConcurrencyLimiterOptions`
	`14`	`+ siloBuilder.Services.AddOrleansRateLimiterOptions("ConcurrencyLimiterOptions1", new ConcurrencyLimiterOptions`
`15`	`15`	`{`
`16`	`16`	`PermitLimit = 10,`
`17`	`17`	`QueueLimit = 15`
`18`	`18`	`});`
`19`	`19`
`20`		`- siloBuilder.Services.AddConcurrencyLimiterOptions("ConcurrencyLimiterOptions2", options =>`
	`20`	`+ siloBuilder.Services.AddOrleansConcurrencyLimiterOptions("ConcurrencyLimiterOptions2", options =>`
`21`	`21`	`{`
`22`	`22`	`options.PermitLimit = 2;`
`23`	`23`	`options.QueueLimit = 2;`
`24`	`24`	`});`
`25`	`25`
`26`	`26`
`27`		`- siloBuilder.Services.AddRateLimiterOptions("FixedWindowRateLimiterOptions1", new FixedWindowRateLimiterOptions`
	`27`	`+ siloBuilder.Services.AddOrleansRateLimiterOptions("FixedWindowRateLimiterOptions1", new FixedWindowRateLimiterOptions`
`28`	`28`	`{`
`29`	`29`	`PermitLimit = 10,`
`30`	`30`	`QueueLimit = 15,`
`@@ -39,7 +39,7 @@ public void Configure(ISiloBuilder siloBuilder)`
`39`	`39`	`});`
`40`	`40`
`41`	`41`
`42`		`- siloBuilder.Services.AddRateLimiterOptions("SlidingWindowRateLimiterOptions1", new SlidingWindowRateLimiterOptions`
	`42`	`+ siloBuilder.Services.AddOrleansRateLimiterOptions("SlidingWindowRateLimiterOptions1", new SlidingWindowRateLimiterOptions`
`43`	`43`	`{`
`44`	`44`	`PermitLimit = 10,`
`45`	`45`	`QueueLimit = 15,`
`@@ -54,7 +54,7 @@ public void Configure(ISiloBuilder siloBuilder)`
`54`	`54`	`});`
`55`	`55`
`56`	`56`
`57`		`- siloBuilder.Services.AddRateLimiterOptions("TokenBucketRateLimiterOptions1", new TokenBucketRateLimiterOptions`
	`57`	`+ siloBuilder.Services.AddOrleansRateLimiterOptions("TokenBucketRateLimiterOptions1", new TokenBucketRateLimiterOptions`
`58`	`58`	`{`
`59`	`59`	`QueueLimit = 10,`
`60`	`60`	`ReplenishmentPeriod = TimeSpan.FromSeconds(1),`