Use Polly.Core

Update to the new Polly v8 API.
justeattakeaway · Nov 15, 2023 · 0336c93 · 0336c93
1 parent 03bdfec
commit 0336c93
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,7 +12,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Newtonsoft.Json.Schema" Version="3.0.15" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
-    <PackageVersion Include="Polly" Version="8.2.0" />
+    <PackageVersion Include="Polly.Core" Version="8.2.0" />
     <PackageVersion Include="Refit" Version="7.0.0" />
     <PackageVersion Include="ReportGenerator" Version="5.2.0" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ using var client = options.CreateHttpClient();
 // The value of json will be: {"Id":1, "Link":"https://www.just-eat.co.uk/privacy-policy"}
 string json = await client.GetStringAsync("https://public.je-apis.com/terms");
 ```
-<sup><a href='/tests/HttpClientInterception.Tests/Examples.cs#L43-L65' title='Snippet source file'>snippet source</a> | <a href='#snippet-minimal-example' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/tests/HttpClientInterception.Tests/Examples.cs#L44-L66' title='Snippet source file'>snippet source</a> | <a href='#snippet-minimal-example' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 `HttpRequestInterceptionBuilder` objects are mutable, so properties can be freely changed once a particular setup has been registered with an instance of `HttpClientInterceptorOptions` as the state is captured at the point of registration. This allows multiple responses and paths to be configured from a single `HttpRequestInterceptionBuilder` instance where multiple registrations against a common hostname.
@@ -143,7 +143,7 @@ var client = options.CreateHttpClient();
 await Assert.ThrowsAsync<HttpRequestException>(
     () => client.GetStringAsync("http://public.je-apis.com"));
 ```
-<sup><a href='/tests/HttpClientInterception.Tests/Examples.cs#L22-L37' title='Snippet source file'>snippet source</a> | <a href='#snippet-fault-injection' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/tests/HttpClientInterception.Tests/Examples.cs#L23-L38' title='Snippet source file'>snippet source</a> | <a href='#snippet-fault-injection' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 #### Registering Request Interception When Using IHttpClientFactory

diff --git a/tests/HttpClientInterception.Tests/Examples.cs b/tests/HttpClientInterception.Tests/Examples.cs
@@ -7,6 +7,7 @@
 using JustEat.HttpClientInterception.GitHub;
 using Newtonsoft.Json.Linq;
 using Polly;
+using Polly.Retry;
 using Refit;
 
 namespace JustEat.HttpClientInterception;
@@ -734,16 +735,20 @@ static bool IsHttpGetForJustEatGitHubOrg(HttpRequestMessage request)
 
         var service = RestService.For<IGitHub>(options.CreateHttpClient("https://api.github.com"));
 
-        // Configure a Polly retry policy that will retry an HTTP request up to three times
-        // if the HTTP request fails due to an HTTP 429 response from the server.
+        // Configure a Polly resilience pipeline that will retry an HTTP request up to three
+        // times if the HTTP request fails due to an HTTP 429 response from the server.
         int retryCount = 3;
-
-        var policy = Policy
-            .Handle<ApiException>((ex) => ex.StatusCode == HttpStatusCode.TooManyRequests)
-            .RetryAsync(retryCount);
+        var context = ResilienceContextPool.Shared.Get();
+        var pipeline = new ResiliencePipelineBuilder()
+            .AddRetry(new RetryStrategyOptions()
+            {
+                ShouldHandle = new PredicateBuilder().Handle<ApiException>((ex) => ex.StatusCode == HttpStatusCode.TooManyRequests),
+                MaxRetryAttempts = 3,
+            })
+            .Build();
 
         // Act
-        Organization actual = await policy.ExecuteAsync(() => service.GetOrganizationAsync("justeattakeaway"));
+        Organization actual = await pipeline.ExecuteAsync(async (_) => await service.GetOrganizationAsync("justeattakeaway"), context);
 
         // Assert
         actual.ShouldNotBeNull();

diff --git a/tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj b/tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Newtonsoft.Json.Schema" />
     <PackageReference Include="NSubstitute" />
-    <PackageReference Include="Polly" />
+    <PackageReference Include="Polly.Core" />
     <PackageReference Include="Refit" />
     <PackageReference Include="Shouldly" />
     <PackageReference Include="xunit" />