Feedback again

Author: wtgodbe

src/Middleware/RateLimiting/src/DefaultCombinedLease.cs

@@ -7,11 +7,11 @@ namespace Microsoft.AspNetCore.RateLimiting;
 
 internal sealed class DefaultCombinedLease : RateLimitLease
 {
-    private readonly RateLimitLease? _globalLease;
+    private readonly RateLimitLease _globalLease;
     private readonly RateLimitLease _endpointLease;
     private HashSet<string>? _metadataNames;
 
-    public DefaultCombinedLease(RateLimitLease? globalLease, RateLimitLease endpointLease)
+    public DefaultCombinedLease(RateLimitLease globalLease, RateLimitLease endpointLease)
     {
         _globalLease = globalLease;
         _endpointLease = endpointLease;
@@ -26,12 +26,9 @@ public override IEnumerable<string> MetadataNames
             if (_metadataNames is null)
             {
                 _metadataNames = new HashSet<string>();
-                if (_globalLease is not null)
+                foreach (var metadataName in _globalLease.MetadataNames)
                 {
-                    foreach (var metadataName in _globalLease.MetadataNames)
-                    {
-                        _metadataNames.Add(metadataName);
-                    }
+                    _metadataNames.Add(metadataName);
                 }
                 foreach (var metadataName in _endpointLease.MetadataNames)
                 {
@@ -51,12 +48,9 @@ public override bool TryGetMetadata(string metadataName, out object? metadata)
         {
             return true;
         }
-        if (_globalLease is not null)
+        if (_globalLease.TryGetMetadata(metadataName, out metadata))
         {
-            if (_globalLease.TryGetMetadata(metadataName, out metadata))
-            {
-                return true;
-            }
+            return true;
         }
 
         metadata = null;
@@ -82,11 +76,11 @@ protected override void Dispose(bool disposing)
 
         try
         {
-            _globalLease?.Dispose();
+            _globalLease.Dispose();
         }
         catch (Exception ex)
         {
-            exceptions ??= new List<Exception>();
+            exceptions ??= new List<Exception>(1);
             exceptions.Add(ex);
         }
 

src/Middleware/RateLimiting/src/DefaultKeyType.cs

@@ -5,13 +5,17 @@ namespace Microsoft.AspNetCore.RateLimiting;
 
 internal struct DefaultKeyType
 {
-    public DefaultKeyType(string policyName, object? key)
+    public DefaultKeyType(string policyName, object? key, object? factory = null)
     {
         PolicyName = policyName;
         Key = key;
+        Factory = factory;
     }
 
     public string PolicyName { get; }
 
     public object? Key { get; }
+
+    // This is really a Func<TPartitionKey, RateLimiter>
+    public object? Factory { get; }
 }

src/Middleware/RateLimiting/src/DefaultKeyTypeEqualityComparer.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.RateLimiting;
+
 internal class DefaultKeyTypeEqualityComparer : IEqualityComparer<DefaultKeyType>
 {
     public bool Equals(DefaultKeyType x, DefaultKeyType y)
@@ -12,7 +13,7 @@ public bool Equals(DefaultKeyType x, DefaultKeyType y)
         var yKey = y.Key;
         if (xKey == null && yKey == null)
         {
-            return true;
+            return x.PolicyName.Equals(y.PolicyName);
         }
         else if (xKey == null || yKey == null)
         {

src/Middleware/RateLimiting/src/DefaultRateLimiterPolicy.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.RateLimiting;
+
 internal sealed class DefaultRateLimiterPolicy : IRateLimiterPolicy<DefaultKeyType>
 {
     private readonly Func<HttpContext, RateLimitPartition<DefaultKeyType>> _partitioner;

src/Middleware/RateLimiting/src/LeaseContext.cs

@@ -4,6 +4,7 @@
 using System.Threading.RateLimiting;
 
 namespace Microsoft.AspNetCore.RateLimiting;
+
 internal struct LeaseContext : IDisposable
 {
     public bool? GlobalRejected { get; init; }

src/Middleware/RateLimiting/src/PolicyNameKey.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace Microsoft.AspNetCore.RateLimiting;
+
 internal sealed class PolicyNameKey
 {
     public required string PolicyName { get; init; }

src/Middleware/RateLimiting/src/PolicyTypeInfo.cs

@@ -9,16 +9,16 @@ namespace Microsoft.AspNetCore.RateLimiting;
 internal class RateLimiterMetadata : IRateLimiterMetadata
 {
     /// <summary>
-    /// Creates a new instance of <see cref="RateLimiterMetadata"/> using the specified limiter.
+    /// Creates a new instance of <see cref="RateLimiterMetadata"/> using the specified policy.
     /// </summary>
-    /// <param name="policyName">The name of the limiter which needs to be applied.</param>
+    /// <param name="policyName">The name of the policy which needs to be applied.</param>
     public RateLimiterMetadata(string policyName)
     {
         PolicyName = policyName;
     }
 
     /// <summary>
-    /// The name of the limiter which needs to be applied.
+    /// The name of the policy which needs to be applied.
     /// </summary>
     public string PolicyName { get; }
 }

src/Middleware/RateLimiting/src/RateLimiterMetadata.cs

@@ -13,13 +13,10 @@ namespace Microsoft.AspNetCore.RateLimiting;
 /// </summary>
 public sealed class RateLimiterOptions
 {
-    // Stores all of the keys for each partition so that we reuse the same objects.
-    internal IDictionary<string, ISet<DefaultKeyType>> _partitionKeys = new Dictionary<string, ISet<DefaultKeyType>>();
-
-    internal IDictionary<string, DefaultRateLimiterPolicy> PolicyMap { get; }
+    internal Dictionary<string, DefaultRateLimiterPolicy> PolicyMap { get; }
         = new Dictionary<string, DefaultRateLimiterPolicy>(StringComparer.Ordinal);
 
-    internal IDictionary<string, Func<IServiceProvider, DefaultRateLimiterPolicy>> UnactivatedPolicyMap { get; }
+    internal Dictionary<string, Func<IServiceProvider, DefaultRateLimiterPolicy>> UnactivatedPolicyMap { get; }
         = new Dictionary<string, Func<IServiceProvider, DefaultRateLimiterPolicy>>(StringComparer.Ordinal);
 
     /// <summary>
@@ -115,8 +112,8 @@ private static Func<HttpContext, RateLimitPartition<DefaultKeyType>> ConvertPart
         return (context =>
         {
             RateLimitPartition<TPartitionKey> partition = partitioner(context);
-            var partitionKey = new DefaultKeyType(policyName, partition.PartitionKey);
-            return new RateLimitPartition<DefaultKeyType>(partitionKey, key => partition.Factory(partition.PartitionKey));
+            var partitionKey = new DefaultKeyType(policyName, partition.PartitionKey, partition.Factory);
+            return new RateLimitPartition<DefaultKeyType>(partitionKey, key => ((Func<TPartitionKey, RateLimiter>)partitionKey.Factory!)((TPartitionKey)partitionKey.Key!));
         });
     }
 

src/Middleware/RateLimiting/src/RateLimiterOptions.cs

@@ -130,8 +130,7 @@ private LeaseContext CombinedAcquire(HttpContext context)
             globalLease?.Dispose();
             throw;
         }
-
-        return new LeaseContext() { Lease = new DefaultCombinedLease(globalLease, endpointLease)};
+        return globalLease is null ? new LeaseContext() { Lease = endpointLease } : new LeaseContext() { Lease = new DefaultCombinedLease(globalLease, endpointLease) };
     }
 
     private async ValueTask<LeaseContext> CombinedWaitAsync(HttpContext context, CancellationToken cancellationToken)
@@ -163,7 +162,7 @@ private async ValueTask<LeaseContext> CombinedWaitAsync(HttpContext context, Can
             throw;
         }
 
-        return new LeaseContext() { Lease = new DefaultCombinedLease(globalLease, endpointLease) };
+        return globalLease is null ? new LeaseContext() { Lease = endpointLease } : new LeaseContext() { Lease = new DefaultCombinedLease(globalLease, endpointLease) };
     }
 
     // Create the endpoint-specific PartitionedRateLimiter