From a4899d74adb9d9a9d560abdb2e9c6b6c06615b88 Mon Sep 17 00:00:00 2001
From: Carl Meyertons <cmeyertons@servicetitan.com>
Date: Mon, 16 Oct 2023 09:56:18 -0500
Subject: [PATCH] Changing prop to ContextPool, returning pool instead of
 entire builder.

---
 src/Polly.Core/PublicAPI.Unshipped.txt                      | 4 ++--
 src/Polly.Core/Registry/RegistryPipelineComponentBuilder.cs | 6 +++---
 .../Registry/ResiliencePipelineRegistry.TResult.cs          | 4 ++--
 src/Polly.Core/Registry/ResiliencePipelineRegistry.cs       | 4 ++--
 src/Polly.Core/ResiliencePipelineBuilder.TResult.cs         | 2 +-
 src/Polly.Core/ResiliencePipelineBuilder.cs                 | 2 +-
 src/Polly.Core/ResiliencePipelineBuilderBase.cs             | 2 +-
 .../Issues/IssuesTests.DynamicContextPool_1687.cs           | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Polly.Core/PublicAPI.Unshipped.txt b/src/Polly.Core/PublicAPI.Unshipped.txt
index 634bc6e399..7db4f94a0b 100644
--- a/src/Polly.Core/PublicAPI.Unshipped.txt
+++ b/src/Polly.Core/PublicAPI.Unshipped.txt
@@ -1,3 +1,3 @@
 #nullable enable
-Polly.ResiliencePipelineBuilderBase.ResilienceContextPool.get -> Polly.ResilienceContextPool?
-Polly.ResiliencePipelineBuilderBase.ResilienceContextPool.set -> void
+Polly.ResiliencePipelineBuilderBase.ContextPool.get -> Polly.ResilienceContextPool?
+Polly.ResiliencePipelineBuilderBase.ContextPool.set -> void
diff --git a/src/Polly.Core/Registry/RegistryPipelineComponentBuilder.cs b/src/Polly.Core/Registry/RegistryPipelineComponentBuilder.cs
index 4fb2f96186..6a3c0a0075 100644
--- a/src/Polly.Core/Registry/RegistryPipelineComponentBuilder.cs
+++ b/src/Polly.Core/Registry/RegistryPipelineComponentBuilder.cs
@@ -30,14 +30,14 @@ public RegistryPipelineComponentBuilder(
         _configure = configure;
     }
 
-    internal (TBuilder builder, PipelineComponent component) CreateComponent()
+    internal (ResilienceContextPool? contextPool, PipelineComponent component) CreateComponent()
     {
         var builder = CreateBuilder();
         var component = builder.ComponentFactory();
 
         if (builder.ReloadTokens.Count == 0)
         {
-            return (builder.Instance, component);
+            return (builder.Instance.ContextPool, component);
         }
 
         component = PipelineComponentFactory.CreateReloadable(
@@ -48,7 +48,7 @@ public RegistryPipelineComponentBuilder(
                 return new ReloadableComponent.Entry(builder.ComponentFactory(), builder.ReloadTokens, builder.Telemetry);
             });
 
-        return (builder.Instance, component);
+        return (builder.Instance.ContextPool, component);
     }
 
     private Builder CreateBuilder()
diff --git a/src/Polly.Core/Registry/ResiliencePipelineRegistry.TResult.cs b/src/Polly.Core/Registry/ResiliencePipelineRegistry.TResult.cs
index 2dfaf70257..847ae57e18 100644
--- a/src/Polly.Core/Registry/ResiliencePipelineRegistry.TResult.cs
+++ b/src/Polly.Core/Registry/ResiliencePipelineRegistry.TResult.cs
@@ -58,9 +58,9 @@ public ResiliencePipeline<TResult> GetOrAdd(TKey key, Action<ResiliencePipelineB
                     _instanceNameFormatter?.Invoke(k),
                     configure);
 
-                (var builder, var component) = componentBuilder.CreateComponent();
+                (var contextPool, var component) = componentBuilder.CreateComponent();
 
-                return new ResiliencePipeline<TResult>(component, DisposeBehavior.Reject, builder.ResilienceContextPool);
+                return new ResiliencePipeline<TResult>(component, DisposeBehavior.Reject, contextPool);
             });
         }
 
diff --git a/src/Polly.Core/Registry/ResiliencePipelineRegistry.cs b/src/Polly.Core/Registry/ResiliencePipelineRegistry.cs
index 529f8a31e9..bc7cc68b02 100644
--- a/src/Polly.Core/Registry/ResiliencePipelineRegistry.cs
+++ b/src/Polly.Core/Registry/ResiliencePipelineRegistry.cs
@@ -132,9 +132,9 @@ public ResiliencePipeline GetOrAddPipeline(TKey key, Action<ResiliencePipelineBu
                 configure)
             ;
 
-            (var builder, var component) = componentBuilder.CreateComponent();
+            (var contextPool, var component) = componentBuilder.CreateComponent();
 
-            return new ResiliencePipeline(component, DisposeBehavior.Reject, builder.ResilienceContextPool);
+            return new ResiliencePipeline(component, DisposeBehavior.Reject, contextPool);
         });
     }
 
diff --git a/src/Polly.Core/ResiliencePipelineBuilder.TResult.cs b/src/Polly.Core/ResiliencePipelineBuilder.TResult.cs
index 709c0d28ed..5def95aa9e 100644
--- a/src/Polly.Core/ResiliencePipelineBuilder.TResult.cs
+++ b/src/Polly.Core/ResiliencePipelineBuilder.TResult.cs
@@ -30,5 +30,5 @@ internal ResiliencePipelineBuilder(ResiliencePipelineBuilderBase other)
     /// </summary>
     /// <returns>An instance of <see cref="ResiliencePipeline{TResult}"/>.</returns>
     /// <exception cref="ValidationException">Thrown when this builder has invalid configuration.</exception>
-    public ResiliencePipeline<TResult> Build() => new(BuildPipelineComponent(), DisposeBehavior.Allow, ResilienceContextPool);
+    public ResiliencePipeline<TResult> Build() => new(BuildPipelineComponent(), DisposeBehavior.Allow, ContextPool);
 }
diff --git a/src/Polly.Core/ResiliencePipelineBuilder.cs b/src/Polly.Core/ResiliencePipelineBuilder.cs
index 2c32ccb269..613b1584b7 100644
--- a/src/Polly.Core/ResiliencePipelineBuilder.cs
+++ b/src/Polly.Core/ResiliencePipelineBuilder.cs
@@ -17,5 +17,5 @@ public sealed class ResiliencePipelineBuilder : ResiliencePipelineBuilderBase
     /// </summary>
     /// <returns>An instance of <see cref="ResiliencePipeline"/>.</returns>
     /// <exception cref="ValidationException">Thrown when this builder has invalid configuration.</exception>
-    public ResiliencePipeline Build() => new(BuildPipelineComponent(), DisposeBehavior.Allow, ResilienceContextPool);
+    public ResiliencePipeline Build() => new(BuildPipelineComponent(), DisposeBehavior.Allow, ContextPool);
 }
diff --git a/src/Polly.Core/ResiliencePipelineBuilderBase.cs b/src/Polly.Core/ResiliencePipelineBuilderBase.cs
index 1c778223f6..c44bf38d8f 100644
--- a/src/Polly.Core/ResiliencePipelineBuilderBase.cs
+++ b/src/Polly.Core/ResiliencePipelineBuilderBase.cs
@@ -64,7 +64,7 @@ private protected ResiliencePipelineBuilderBase(ResiliencePipelineBuilderBase ot
     /// <value>
     /// If the default value of <see langword="null"/> is used, <see cref="ResilienceContextPool.Shared"/> will be used.
     /// </value>
-    public ResilienceContextPool? ResilienceContextPool { get; set; }
+    public ResilienceContextPool? ContextPool { get; set; }
 
     /// <summary>
     /// Gets or sets a <see cref="System.TimeProvider"/> that is used by strategies that work with time.
diff --git a/test/Polly.Extensions.Tests/Issues/IssuesTests.DynamicContextPool_1687.cs b/test/Polly.Extensions.Tests/Issues/IssuesTests.DynamicContextPool_1687.cs
index c230a2bcfd..ab5ccb1d9d 100644
--- a/test/Polly.Extensions.Tests/Issues/IssuesTests.DynamicContextPool_1687.cs
+++ b/test/Polly.Extensions.Tests/Issues/IssuesTests.DynamicContextPool_1687.cs
@@ -46,12 +46,12 @@ public async Task DynamicContextPool_1687()
 
         services.AddResiliencePipelineRegistry<string>(options => options.BuilderFactory = () => new ResiliencePipelineBuilder
         {
-            ResilienceContextPool = pool,
+            ContextPool = pool,
         });
 
         services.AddResiliencePipeline(key, builder =>
         {
-            builder.ResilienceContextPool.Should().Be(pool);
+            builder.ContextPool.Should().Be(pool);
             builder.AddStrategy(strategy);
         });