Move the routing API from Hedging to root folder

dotnet · Jun 21, 2023 · ae4a4b5 · ae4a4b5
1 parent 1f7da6f
commit ae4a4b5
Show file tree

Hide file tree

Showing 31 changed files with 29 additions and 17 deletions.
diff --git a/...crosoft.Extensions.Http.Resilience/Hedging/HedgingHttpClientBuilderExtensions.Standard.cs b/...crosoft.Extensions.Http.Resilience/Hedging/HedgingHttpClientBuilderExtensions.Standard.cs
@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Http.Resilience.Internal;
 using Microsoft.Extensions.Http.Resilience.Internal.Routing;
 using Microsoft.Extensions.Http.Resilience.Internal.Validators;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.Resilience.Internal;
 using Microsoft.Shared.Diagnostics;
 

diff --git a/...t.Extensions.Http.Resilience/Hedging/Internals/HttpResiliencePipelineBuilderExtensions.cs b/...t.Extensions.Http.Resilience/Hedging/Internals/HttpResiliencePipelineBuilderExtensions.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Http.Resilience.Internal.Routing;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.Resilience.Internal;
 
 namespace Microsoft.Extensions.Http.Resilience.Internal;

diff --git a/...tp.Resilience/Hedging/Routing/Endpoint.cs → ...sions.Http.Resilience/Routing/Endpoint.cs b/...tp.Resilience/Hedging/Routing/Endpoint.cs → ...sions.Http.Resilience/Routing/Endpoint.cs
diff --git a/...silience/Hedging/Routing/EndpointGroup.cs → ....Http.Resilience/Routing/EndpointGroup.cs b/...silience/Hedging/Routing/EndpointGroup.cs → ....Http.Resilience/Routing/EndpointGroup.cs
diff --git a/...edging/Routing/IRequestRoutingStrategy.cs → ...lience/Routing/IRequestRoutingStrategy.cs b/...edging/Routing/IRequestRoutingStrategy.cs → ...lience/Routing/IRequestRoutingStrategy.cs
diff --git a/...Routing/IRequestRoutingStrategyFactory.cs → ...Routing/IRequestRoutingStrategyFactory.cs b/...Routing/IRequestRoutingStrategyFactory.cs → ...Routing/IRequestRoutingStrategyFactory.cs
diff --git a/...edging/Routing/IRoutingStrategyBuilder.cs → ...lience/Routing/IRoutingStrategyBuilder.cs b/...edging/Routing/IRoutingStrategyBuilder.cs → ...lience/Routing/IRoutingStrategyBuilder.cs
diff --git a/.../Routing/DefaultRoutingStrategyFactory.cs → .../Routing/DefaultRoutingStrategyFactory.cs b/.../Routing/DefaultRoutingStrategyFactory.cs → .../Routing/DefaultRoutingStrategyFactory.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 
 internal sealed class DefaultRoutingStrategyFactory<TRoutingStrategy> : IRequestRoutingStrategyFactory
     where TRoutingStrategy : IRequestRoutingStrategy

diff --git a/...g/IPooledRequestRoutingStrategyFactory.cs → ...g/IPooledRequestRoutingStrategyFactory.cs b/...g/IPooledRequestRoutingStrategyFactory.cs → ...g/IPooledRequestRoutingStrategyFactory.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 
 /// <inheritdoc/>
 internal interface IPooledRequestRoutingStrategyFactory : IRequestRoutingStrategyFactory

diff --git a/...s/OrderedGroupsRoutingOptionsValidator.cs → ...s/OrderedGroupsRoutingOptionsValidator.cs b/...s/OrderedGroupsRoutingOptionsValidator.cs → ...s/OrderedGroupsRoutingOptionsValidator.cs
diff --git a/...redGroups/OrderedGroupsRoutingStrategy.cs → ...redGroups/OrderedGroupsRoutingStrategy.cs b/...redGroups/OrderedGroupsRoutingStrategy.cs → ...redGroups/OrderedGroupsRoutingStrategy.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Http.Resilience.Internal;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing.OrderedGroups;
 
 internal sealed class OrderedGroupsRoutingStrategy : IRequestRoutingStrategy, IResettable
 {

diff --git a/...ps/OrderedGroupsRoutingStrategyFactory.cs → ...ps/OrderedGroupsRoutingStrategyFactory.cs b/...ps/OrderedGroupsRoutingStrategyFactory.cs → ...ps/OrderedGroupsRoutingStrategyFactory.cs
@@ -1,10 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing.OrderedGroups;
 
 internal sealed class OrderedGroupsRoutingStrategyFactory : PooledRoutingStrategyFactory<OrderedGroupsRoutingStrategy, OrderedGroupsRoutingOptions>
 {

diff --git a/...s/Routing/PooledRoutingStrategyFactory.cs → ...l/Routing/PooledRoutingStrategyFactory.cs b/...s/Routing/PooledRoutingStrategyFactory.cs → ...l/Routing/PooledRoutingStrategyFactory.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 
 internal abstract class PooledRoutingStrategyFactory<T, TOptions> : IPooledRequestRoutingStrategyFactory
     where T : class, IRequestRoutingStrategy, IResettable

diff --git a/...edging/Internals/Routing/RoutingHelper.cs → ...Routing/Internal/Routing/RoutingHelper.cs b/...edging/Internals/Routing/RoutingHelper.cs → ...Routing/Internal/Routing/RoutingHelper.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.Http.Resilience.Internal;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 
 internal static class RoutingHelper
 {

diff --git a/...edging/Internals/Routing/RoutingPolicy.cs → ...Routing/Internal/Routing/RoutingPolicy.cs b/...edging/Internals/Routing/RoutingPolicy.cs → ...Routing/Internal/Routing/RoutingPolicy.cs
@@ -5,10 +5,11 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Http.Resilience.Internal;
 using Microsoft.Shared.Diagnostics;
 using Polly;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 
 /// <summary>
 /// Adds routing support to an inner policy.

diff --git a/...ternals/Routing/RoutingStrategyBuilder.cs → ...nternal/Routing/RoutingStrategyBuilder.cs b/...ternals/Routing/RoutingStrategyBuilder.cs → ...nternal/Routing/RoutingStrategyBuilder.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 
 internal sealed class RoutingStrategyBuilder : IRoutingStrategyBuilder
 {

diff --git a/.../WeightedGroupsRoutingOptionsValidator.cs → .../WeightedGroupsRoutingOptionsValidator.cs b/.../WeightedGroupsRoutingOptionsValidator.cs → .../WeightedGroupsRoutingOptionsValidator.cs
diff --git a/...edGroups/WeightedGroupsRoutingStrategy.cs → ...edGroups/WeightedGroupsRoutingStrategy.cs b/...edGroups/WeightedGroupsRoutingStrategy.cs → ...edGroups/WeightedGroupsRoutingStrategy.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Http.Resilience.Internal;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing.WeightedGroups;
 
 internal sealed class WeightedGroupsRoutingStrategy : IRequestRoutingStrategy, IResettable
 {

diff --git a/...s/WeightedGroupsRoutingStrategyFactory.cs → ...s/WeightedGroupsRoutingStrategyFactory.cs b/...s/WeightedGroupsRoutingStrategyFactory.cs → ...s/WeightedGroupsRoutingStrategyFactory.cs
@@ -1,10 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing.WeightedGroups;
 
 internal sealed class WeightedGroupsRoutingStrategyFactory : PooledRoutingStrategyFactory<WeightedGroupsRoutingStrategy, WeightedGroupsRoutingOptions>
 {

diff --git a/...ng/Routing/OrderedGroupsRoutingOptions.cs → ...ce/Routing/OrderedGroupsRoutingOptions.cs b/...ng/Routing/OrderedGroupsRoutingOptions.cs → ...ce/Routing/OrderedGroupsRoutingOptions.cs
diff --git a/...uting/RoutingStrategyBuilderExtensions.cs → ...uting/RoutingStrategyBuilderExtensions.cs b/...uting/RoutingStrategyBuilderExtensions.cs → ...uting/RoutingStrategyBuilderExtensions.cs
@@ -8,6 +8,8 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience.Internal;
 using Microsoft.Extensions.Http.Resilience.Internal.Routing;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing.OrderedGroups;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing.WeightedGroups;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options.Validation;

diff --git a/...ience/Hedging/Routing/WeightedEndpoint.cs → ...tp.Resilience/Routing/WeightedEndpoint.cs b/...ience/Hedging/Routing/WeightedEndpoint.cs → ...tp.Resilience/Routing/WeightedEndpoint.cs
diff --git a/.../Hedging/Routing/WeightedEndpointGroup.cs → ...silience/Routing/WeightedEndpointGroup.cs b/.../Hedging/Routing/WeightedEndpointGroup.cs → ...silience/Routing/WeightedEndpointGroup.cs
diff --git a/...ing/Routing/WeightedGroupSelectionMode.cs → ...nce/Routing/WeightedGroupSelectionMode.cs b/...ing/Routing/WeightedGroupSelectionMode.cs → ...nce/Routing/WeightedGroupSelectionMode.cs
diff --git a/...g/Routing/WeightedGroupsRoutingOptions.cs → ...e/Routing/WeightedGroupsRoutingOptions.cs b/...g/Routing/WeightedGroupsRoutingOptions.cs → ...e/Routing/WeightedGroupsRoutingOptions.cs
diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs
@@ -13,7 +13,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience.Internal;
-using Microsoft.Extensions.Http.Resilience.Internal.Routing;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.Telemetry.Metering;
 using Moq;
 using Polly;

diff --git a/...ibraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/Internal/RoutingHelperTest.cs b/...ibraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/Internal/RoutingHelperTest.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Http.Resilience.Internal;
-using Microsoft.Extensions.Http.Resilience.Internal.Routing;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Moq;
 using Xunit;
 

diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs
@@ -12,7 +12,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience.Internal;
-using Microsoft.Extensions.Http.Resilience.Internal.Routing;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.Http.Resilience.Test.Hedgings.Helpers;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Resilience;

diff --git a/...ing/Routing/OrderedRoutingStrategyTest.cs → ...sts/Routing/OrderedRoutingStrategyTest.cs b/...ing/Routing/OrderedRoutingStrategyTest.cs → ...sts/Routing/OrderedRoutingStrategyTest.cs
@@ -10,7 +10,7 @@
 using Moq;
 using Xunit;
 
-namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Test.Routing;
 
 public class OrderedRoutingStrategyTest : RoutingStrategyTest
 {

diff --git a/...ts/Hedging/Routing/RoutingStrategyTest.cs → ...ence.Tests/Routing/RoutingStrategyTest.cs b/...ts/Hedging/Routing/RoutingStrategyTest.cs → ...ence.Tests/Routing/RoutingStrategyTest.cs
@@ -10,12 +10,13 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http.Resilience.Internal;
 using Microsoft.Extensions.Http.Resilience.Internal.Routing;
+using Microsoft.Extensions.Http.Resilience.Routing.Internal.Routing;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
-namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Test.Routing;
 
 public abstract class RoutingStrategyTest
 {

diff --git a/...ng/Routing/WeightedRoutingStrategyTest.cs → ...ts/Routing/WeightedRoutingStrategyTest.cs b/...ng/Routing/WeightedRoutingStrategyTest.cs → ...ts/Routing/WeightedRoutingStrategyTest.cs
@@ -10,7 +10,7 @@
 using Moq;
 using Xunit;
 
-namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Routing;
+namespace Microsoft.Extensions.Http.Resilience.Test.Routing;
 
 public class WeightedRoutingStrategyTest : RoutingStrategyTest
 {