Cleanup the namespaces (#1136)

src/Polly.Core.Benchmarks/Internals/Helper.cs

@@ -1,6 +1,3 @@
-using Polly;
-using Polly.Builder;
-
 #pragma warning disable S4225 // Extension methods should not extend "object"
 
 namespace Polly.Core.Benchmarks;

src/Polly.Core.Tests/Helpers/TestUtils.cs

@@ -1,3 +1,4 @@
+using Polly.Strategy;
 using Polly.Telemetry;
 
 namespace Polly.Core.Tests.Helpers;
@@ -34,6 +35,6 @@ public static async Task AssertWithTimeoutAsync(Func<Task> assertion, TimeSpan t
         }
     }
 
-    public static ResilienceTelemetry CreateResilienceTelemetry(DiagnosticSource source)
+    public static ResilienceStrategyTelemetry CreateResilienceTelemetry(DiagnosticSource source)
         => new(new ResilienceTelemetrySource("dummy-builder", new ResilienceProperties(), "strategy-name", "strategy-type"), source);
 }

src/Polly.Core.Tests/Registry/ResilienceStrategyRegistryTests.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
-using Polly.Builder;
 using Polly.Registry;
 
 namespace Polly.Core.Tests.Registry;

src/Polly.Core.Tests/Builder/ResilienceStrategyBuilderTests.cs → src/Polly.Core.Tests/ResilienceStrategyBuilderTests.cs

@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using Moq;
-using Polly.Builder;
 using Polly.Strategy;
 using Polly.Utils;
 
-namespace Polly.Core.Tests.Builder;
+namespace Polly.Core.Tests;
 
 public class ResilienceStrategyBuilderTests
 {
@@ -246,8 +245,8 @@ public void AddStrategy_CombinePipelines_Ok()
     public void BuildStrategy_EnsureCorrectContext()
     {
         // arrange
-        bool verified1 = false;
-        bool verified2 = false;
+        var verified1 = false;
+        var verified2 = false;
 
         var builder = new ResilienceStrategyBuilder
         {

src/Polly.Core.Tests/Retry/RetryResilienceStrategyBuilderExtensionsTests.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Polly.Builder;
 using Polly.Retry;
 
 namespace Polly.Core.Tests.Retry;

src/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs

@@ -1,14 +1,14 @@
 using Moq;
 using Polly.Retry;
-using Polly.Telemetry;
+using Polly.Strategy;
 
 namespace Polly.Core.Tests.Retry;
 
 public class RetryResilienceStrategyTests
 {
     private readonly RetryStrategyOptions _options = new();
     private readonly FakeTimeProvider _timeProvider = new();
-    private readonly ResilienceTelemetry _telemetry;
+    private readonly ResilienceStrategyTelemetry _telemetry;
     private readonly Mock<DiagnosticSource> _diagnosticSource = new();
 
     public RetryResilienceStrategyTests() => _telemetry = TestUtils.CreateResilienceTelemetry(_diagnosticSource.Object);

src/Polly.Core.Tests/Builder/ResilienceStrategyBuilderContextTests.cs → src/Polly.Core.Tests/Strategy/ResilienceStrategyBuilderContextTests.cs

@@ -1,7 +1,7 @@
 using Moq;
-using Polly.Builder;
+using Polly.Strategy;
 
-namespace Polly.Core.Tests.Builder;
+namespace Polly.Core.Tests.Strategy;
 
 public class ResilienceStrategyBuilderContextTests
 {

src/Polly.Core.Tests/Builder/ResilienceStrategyPipelineTests.cs → src/Polly.Core.Tests/Strategy/ResilienceStrategyPipelineTests.cs

@@ -1,6 +1,6 @@
-using Polly.Builder;
+using Polly.Strategy;
 
-namespace Polly.Core.Tests.Builder;
+namespace Polly.Core.Tests.Strategy;
 
 public class ResilienceStrategyPipelineTests
 {
@@ -29,7 +29,7 @@ public void CreatePipeline_EnsureOriginalStrategiesPreserved()
 
         var pipeline = ResilienceStrategyPipeline.CreatePipeline(strategies);
 
-        for (int i = 0; i < strategies.Length; i++)
+        for (var i = 0; i < strategies.Length; i++)
         {
             pipeline.Strategies[i].Should().BeSameAs(strategies[i]);
         }

src/Polly.Core.Tests/Telemetry/ResilienceTelemetryTests.cs → src/Polly.Core.Tests/Strategy/ResilienceStrategyTelemetryTests.cs

@@ -2,15 +2,15 @@
 using Polly.Strategy;
 using Polly.Telemetry;
 
-namespace Polly.Core.Tests.Telemetry;
+namespace Polly.Core.Tests.Strategy;
 
-public class ResilienceTelemetryTests
+public class ResilienceStrategyTelemetryTests
 {
     private readonly Mock<DiagnosticSource> _diagnosticSource = new(MockBehavior.Strict);
 
-    public ResilienceTelemetryTests() => _sut = new(new ResilienceTelemetrySource("builder", new ResilienceProperties(), "strategy-name", "strategy-type"), _diagnosticSource.Object);
+    public ResilienceStrategyTelemetryTests() => _sut = new(new ResilienceTelemetrySource("builder", new ResilienceProperties(), "strategy-name", "strategy-type"), _diagnosticSource.Object);
 
-    private readonly ResilienceTelemetry _sut;
+    private readonly ResilienceStrategyTelemetry _sut;
 
     [Fact]
     public void Report_NoOutcome_OK()

src/Polly.Core.Tests/Timeout/TimeoutResilienceStrategyBuilderExtensionsTests.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Polly.Builder;
 using Polly.Timeout;
 
 namespace Polly.Core.Tests.Timeout;

src/Polly.Core.Tests/Timeout/TimeoutResilienceStrategyTests.cs

@@ -1,13 +1,13 @@
 using Moq;
 using Polly.Core.Tests.Helpers;
-using Polly.Telemetry;
+using Polly.Strategy;
 using Polly.Timeout;
 
 namespace Polly.Core.Tests.Timeout;
 
 public class TimeoutResilienceStrategyTests : IDisposable
 {
-    private readonly ResilienceTelemetry _telemetry;
+    private readonly ResilienceStrategyTelemetry _telemetry;
     private readonly FakeTimeProvider _timeProvider;
     private readonly TimeoutStrategyOptions _options;
     private readonly CancellationTokenSource _cancellationSource;

src/Polly.Core/Registry/ResilienceStrategyRegistry.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using Polly.Builder;
 
 namespace Polly.Registry;
 

src/Polly.Core/Registry/ResilienceStrategyRegistryOptions.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Polly.Builder;
 
 namespace Polly.Registry;
 

src/Polly.Core/Builder/ResilienceStrategyBuilder.cs → src/Polly.Core/ResilienceStrategyBuilder.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Polly.Strategy;
 
-namespace Polly.Builder;
+namespace Polly;
 
 /// <summary>
 /// A builder that is used to create an instance of <see cref="ResilienceStrategy"/>.

src/Polly.Core/Retry/RetryResilienceStrategy.cs

@@ -1,15 +1,14 @@
 using System;
 using Polly.Strategy;
-using Polly.Telemetry;
 
 namespace Polly.Retry;
 
 internal class RetryResilienceStrategy : ResilienceStrategy
 {
     private readonly TimeProvider _timeProvider;
-    private readonly ResilienceTelemetry _telemetry;
+    private readonly ResilienceStrategyTelemetry _telemetry;
 
-    public RetryResilienceStrategy(RetryStrategyOptions options, TimeProvider timeProvider, ResilienceTelemetry telemetry)
+    public RetryResilienceStrategy(RetryStrategyOptions options, TimeProvider timeProvider, ResilienceStrategyTelemetry telemetry)
     {
         _timeProvider = timeProvider;
         _telemetry = telemetry;

src/Polly.Core/Retry/RetryResilienceStrategyBuilderExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using Polly.Builder;
 using Polly.Retry;
 using Polly.Strategy;
 

src/Polly.Core/Builder/ResilienceStrategyBuilderContext.cs → src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs

@@ -1,6 +1,6 @@
 using Polly.Telemetry;
 
-namespace Polly.Builder;
+namespace Polly.Strategy;
 
 /// <summary>
 /// The context used for building an individual resilience strategy.
@@ -40,7 +40,7 @@ internal ResilienceStrategyBuilderContext(string builderName, ResilienceProperti
     /// <summary>
     /// Gets the resilience telemetry used to report important events.
     /// </summary>
-    public ResilienceTelemetry Telemetry { get; }
+    public ResilienceStrategyTelemetry Telemetry { get; }
 
     /// <summary>
     /// Gets the <see cref="TimeProvider"/> used by this strategy.

src/Polly.Core/Builder/ResilienceStrategyPipeline.cs → src/Polly.Core/Strategy/ResilienceStrategyPipeline.cs

@@ -1,7 +1,7 @@
 using System;
 using static System.Net.Mime.MediaTypeNames;
 
-namespace Polly.Builder;
+namespace Polly.Strategy;
 
 #pragma warning disable S2302 // "nameof" should be used
 

src/Polly.Core/Telemetry/ResilienceTelemetry.cs → src/Polly.Core/Strategy/ResilienceStrategyTelemetry.cs

@@ -1,17 +1,16 @@
-using Polly.Strategy;
-using static Polly.Telemetry.ResilienceTelemetry;
+using Polly.Telemetry;
 
-namespace Polly.Telemetry;
+namespace Polly.Strategy;
 
 /// <summary>
 /// Resilience telemetry is used by individual resilience strategies to report some important events.
 /// </summary>
 /// <remarks>
 /// For example, the timeout strategy reports "OnTimeout" event when the timeout is reached or "OnRetry" for retry strategy.
 /// </remarks>
-public sealed class ResilienceTelemetry
+public sealed class ResilienceStrategyTelemetry
 {
-    internal ResilienceTelemetry(ResilienceTelemetrySource source, DiagnosticSource diagnosticSource)
+    internal ResilienceStrategyTelemetry(ResilienceTelemetrySource source, DiagnosticSource diagnosticSource)
     {
         TelemetrySource = source;
         DiagnosticSource = diagnosticSource;

src/Polly.Core/Telemetry/TelemetryUtil.cs

@@ -1,3 +1,5 @@
+using Polly.Strategy;
+
 namespace Polly.Telemetry;
 
 internal static class TelemetryUtil
@@ -8,7 +10,7 @@ internal static class TelemetryUtil
 
     private static readonly ResiliencePropertyKey<DiagnosticSource> DiagnosticSourceKey = new("DiagnosticSource");
 
-    public static ResilienceTelemetry CreateTelemetry(string builderName, ResilienceProperties builderProperties, string strategyName, string strategyType)
+    public static ResilienceStrategyTelemetry CreateTelemetry(string builderName, ResilienceProperties builderProperties, string strategyName, string strategyType)
     {
         // Allows the user to override the default diagnostic source.
         if (!builderProperties.TryGetValue(DiagnosticSourceKey, out var diagnosticSource))
@@ -18,6 +20,6 @@ public static ResilienceTelemetry CreateTelemetry(string builderName, Resilience
 
         var telemetrySource = new ResilienceTelemetrySource(builderName, builderProperties, strategyName, strategyType);
 
-        return new ResilienceTelemetry(telemetrySource, diagnosticSource);
+        return new ResilienceStrategyTelemetry(telemetrySource, diagnosticSource);
     }
 }

src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Threading.Tasks;
-using Polly.Telemetry;
+using Polly.Strategy;
 
 namespace Polly.Timeout;
 
 internal sealed class TimeoutResilienceStrategy : ResilienceStrategy
 {
     private readonly TimeProvider _timeProvider;
-    private readonly ResilienceTelemetry _telemetry;
+    private readonly ResilienceStrategyTelemetry _telemetry;
 
-    public TimeoutResilienceStrategy(TimeoutStrategyOptions options, TimeProvider timeProvider, ResilienceTelemetry telemetry)
+    public TimeoutResilienceStrategy(TimeoutStrategyOptions options, TimeProvider timeProvider, ResilienceStrategyTelemetry telemetry)
     {
         DefaultTimeout = options.Timeout;
         TimeoutGenerator = options.TimeoutGenerator.CreateHandler();

src/Polly.Core/Timeout/TimeoutResilienceStrategyBuilderExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using Polly.Builder;
 using Polly.Strategy;
 using Polly.Timeout;
 

src/Polly.Extensions.Tests/DependencyInjection/PollyServiceCollectionExtensionTests.cs

@@ -1,8 +1,8 @@
 using System.Globalization;
 using Microsoft.Extensions.DependencyInjection;
-using Polly.Builder;
 using Polly.Extensions.DependencyInjection;
 using Polly.Registry;
+using Polly.Strategy;
 
 namespace Polly.Extensions.Tests.DependencyInjection;
 

src/Polly.Extensions/DependencyInjection/AddResilienceStrategyContext.cs

@@ -1,5 +1,3 @@
-using Polly.Builder;
-
 namespace Polly.Extensions.DependencyInjection;
 
 /// <summary>

src/Polly.Extensions/DependencyInjection/PollyServiceCollectionExtensions.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Polly.Builder;
 using Polly.Registry;
 using Polly.Utils;
 

src/Polly.RateLimiting.Tests/RateLimiterResilienceStrategyBuilderExtensionsTests.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.RateLimiting;
 using Moq;
-using Polly.Builder;
 using Xunit;
 
 namespace Polly.RateLimiting.Tests;

src/Polly.RateLimiting.Tests/RateLimiterResilienceStrategyTests.cs

@@ -2,7 +2,6 @@
 using System.Threading.RateLimiting;
 using Moq;
 using Moq.Protected;
-using Polly.Builder;
 using Polly.Strategy;
 
 namespace Polly.RateLimiting.Tests;

src/Polly.RateLimiting/RateLimiterResilienceStrategy.cs

@@ -1,14 +1,13 @@
 using System.Threading.RateLimiting;
 using Polly.Strategy;
-using Polly.Telemetry;
 
 namespace Polly.RateLimiting;
 
 internal sealed class RateLimiterResilienceStrategy : ResilienceStrategy
 {
-    private readonly ResilienceTelemetry _telemetry;
+    private readonly ResilienceStrategyTelemetry _telemetry;
 
-    public RateLimiterResilienceStrategy(RateLimiter limiter, NoOutcomeEvent<OnRateLimiterRejectedArguments> @event, ResilienceTelemetry telemetry)
+    public RateLimiterResilienceStrategy(RateLimiter limiter, NoOutcomeEvent<OnRateLimiterRejectedArguments> @event, ResilienceStrategyTelemetry telemetry)
     {
         Limiter = limiter;
         OnLeaseRejected = @event.CreateHandler();

src/Polly.RateLimiting/RateLimiterResilienceStrategyBuilderExtensions.cs

@@ -1,5 +1,4 @@
 using System.Threading.RateLimiting;
-using Polly.Builder;
 using Polly.RateLimiting;
 using Polly.Strategy;
 using Polly.Utils;