Use interfaces for Polly retry policies (#20821)

jacobilsoe · web-flow · commit 7f40ce0dd80d · 2025-03-12T16:49:03.000+08:00
This enables use of ResiliencePipelineBuilder which returns the
interface when calling AsSyncPolicy / AsAsyncPolicy
diff --git a/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache
@@ -19,23 +19,23 @@ namespace {{packageName}}.Client
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
 {{/useRestSharp}}
 {{#useHttpClient}}
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<HttpResponseMessage> RetryPolicy { get; set; }
+        public static ISyncPolicy<HttpResponseMessage> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
 {{/useHttpClient}}
     }
 }
diff --git a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -22,11 +22,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<HttpResponseMessage> RetryPolicy { get; set; }
+        public static ISyncPolicy<HttpResponseMessage> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<HttpResponseMessage> RetryPolicy { get; set; }
+        public static ISyncPolicy<HttpResponseMessage> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<RestResponse> RetryPolicy { get; set; }
+        public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ public static class RetryConfiguration`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// Retry policy`
`24`	`24`	`/// </summary>`
`25`		`- public static Policy<RestResponse> RetryPolicy { get; set; }`
	`25`	`+ public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }`
`26`	`26`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Async retry policy`
`29`	`29`	`/// </summary>`
`30`		`- public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }`
	`30`	`+ public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ public static class RetryConfiguration`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Retry policy`
`23`	`23`	`/// </summary>`
`24`		`- public static Policy<RestResponse> RetryPolicy { get; set; }`
	`24`	`+ public static ISyncPolicy<RestResponse> RetryPolicy { get; set; }`
`25`	`25`
`26`	`26`	`/// <summary>`
`27`	`27`	`/// Async retry policy`
`28`	`28`	`/// </summary>`
`29`		`- public static AsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }`
	`29`	`+ public static IAsyncPolicy<RestResponse> AsyncRetryPolicy { get; set; }`
`30`	`30`	`}`
`31`	`31`	`}`