Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move the routing API from Hedging to root folder #4097

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Move the routing API from Hedging to root folder #4097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...crosoft.Extensions.Http.Resilience/Hedging/HedgingHttpClientBuilderExtensions.Standard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
using Microsoft.Extensions.Resilience.Internal;
using Microsoft.Shared.Diagnostics;

Expand Down
2 changes: 1 addition & 1 deletion ...t.Extensions.Http.Resilience/Hedging/Internals/HttpResiliencePipelineBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Http.Resilience.Internal.Routing;
using Microsoft.Extensions.Http.Resilience.Routing.Internal;
using Microsoft.Extensions.Resilience.Internal;

namespace Microsoft.Extensions.Http.Resilience.Internal;
Expand Down
0 ...tp.Resilience/Hedging/Routing/Endpoint.cs → ...sions.Http.Resilience/Routing/Endpoint.cs
View file
Open in desktop
File renamed without changes.
0 ...silience/Hedging/Routing/EndpointGroup.cs → ....Http.Resilience/Routing/EndpointGroup.cs
View file
Open in desktop
File renamed without changes.
0 ...edging/Routing/IRequestRoutingStrategy.cs → ...lience/Routing/IRequestRoutingStrategy.cs
View file
Open in desktop
File renamed without changes.
0 ...Routing/IRequestRoutingStrategyFactory.cs → ...Routing/IRequestRoutingStrategyFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...edging/Routing/IRoutingStrategyBuilder.cs → ...lience/Routing/IRoutingStrategyBuilder.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../Routing/DefaultRoutingStrategyFactory.cs → ...Internal/DefaultRoutingStrategyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using Microsoft.Extensions.DependencyInjection;

namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
namespace Microsoft.Extensions.Http.Resilience.Routing.Internal;

internal sealed class DefaultRoutingStrategyFactory<TRoutingStrategy> : IRequestRoutingStrategyFactory
where TRoutingStrategy : IRequestRoutingStrategy
Expand Down
2 changes: 1 addition & 1 deletion ...g/IPooledRequestRoutingStrategyFactory.cs → ...l/IPooledRequestRoutingStrategyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/// <inheritdoc/>
internal interface IPooledRequestRoutingStrategyFactory : IRequestRoutingStrategyFactory
Expand Down
0 ...s/OrderedGroupsRoutingOptionsValidator.cs → ...s/OrderedGroupsRoutingOptionsValidator.cs
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...redGroups/OrderedGroupsRoutingStrategy.cs → ...redGroups/OrderedGroupsRoutingStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Http.Resilience.Internal;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.OrderedGroups;

internal sealed class OrderedGroupsRoutingStrategy : IRequestRoutingStrategy, IResettable
{
Expand Down
2 changes: 1 addition & 1 deletion ...ps/OrderedGroupsRoutingStrategyFactory.cs → ...ps/OrderedGroupsRoutingStrategyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options;

namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.OrderedGroups;

internal sealed class OrderedGroupsRoutingStrategyFactory : PooledRoutingStrategyFactory<OrderedGroupsRoutingStrategy, OrderedGroupsRoutingOptions>
{
Expand Down
2 changes: 1 addition & 1 deletion ...s/Routing/PooledRoutingStrategyFactory.cs → .../Internal/PooledRoutingStrategyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

internal abstract class PooledRoutingStrategyFactory<T, TOptions> : IPooledRequestRoutingStrategyFactory
where T : class, IRequestRoutingStrategy, IResettable
Expand Down
3 changes: 2 additions & 1 deletion ...edging/Internals/Routing/RoutingHelper.cs → ...ilience/Routing/Internal/RoutingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

internal static class RoutingHelper
{
Expand Down
3 changes: 2 additions & 1 deletion ...edging/Internals/Routing/RoutingPolicy.cs → ...ilience/Routing/Internal/RoutingPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <summary>
/// Adds routing support to an inner policy.
Expand Down
2 changes: 1 addition & 1 deletion ...ternals/Routing/RoutingStrategyBuilder.cs → ...outing/Internal/RoutingStrategyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using Microsoft.Extensions.DependencyInjection;

namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
namespace Microsoft.Extensions.Http.Resilience.Routing.Internal;

internal sealed class RoutingStrategyBuilder : IRoutingStrategyBuilder
{
Expand Down
0 .../WeightedGroupsRoutingOptionsValidator.cs → .../WeightedGroupsRoutingOptionsValidator.cs
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...edGroups/WeightedGroupsRoutingStrategy.cs → ...edGroups/WeightedGroupsRoutingStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Http.Resilience.Internal;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.WeightedGroups;

internal sealed class WeightedGroupsRoutingStrategy : IRequestRoutingStrategy, IResettable
{
Expand Down
2 changes: 1 addition & 1 deletion ...s/WeightedGroupsRoutingStrategyFactory.cs → ...s/WeightedGroupsRoutingStrategyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options;

namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
namespace Microsoft.Extensions.Http.Resilience.Routing.Internal.WeightedGroups;

internal sealed class WeightedGroupsRoutingStrategyFactory : PooledRoutingStrategyFactory<WeightedGroupsRoutingStrategy, WeightedGroupsRoutingOptions>
{
Expand Down
0 ...ng/Routing/OrderedGroupsRoutingOptions.cs → ...ce/Routing/OrderedGroupsRoutingOptions.cs
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ...uting/RoutingStrategyBuilderExtensions.cs → ...uting/RoutingStrategyBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.OrderedGroups;
using Microsoft.Extensions.Http.Resilience.Routing.Internal.WeightedGroups;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Validation;
Expand Down
0 ...ience/Hedging/Routing/WeightedEndpoint.cs → ...tp.Resilience/Routing/WeightedEndpoint.cs
View file
Open in desktop
File renamed without changes.
0 .../Hedging/Routing/WeightedEndpointGroup.cs → ...silience/Routing/WeightedEndpointGroup.cs
View file
Open in desktop
File renamed without changes.
0 ...ing/Routing/WeightedGroupSelectionMode.cs → ...nce/Routing/WeightedGroupSelectionMode.cs
View file
Open in desktop
File renamed without changes.
0 ...g/Routing/WeightedGroupsRoutingOptions.cs → ...e/Routing/WeightedGroupsRoutingOptions.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
using Microsoft.Extensions.Telemetry.Metering;
using Moq;
using Polly;
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/StandardHedgingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
using Microsoft.Extensions.Http.Resilience.Test.Hedgings.Helpers;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Resilience;
Expand Down
5 changes: 3 additions & 2 deletions ...nal/DefaultRoutingStrategyFactoryTests.cs → ...ing/DefaultRoutingStrategyFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@

using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Http.Resilience.Internal.Routing;
using Microsoft.Extensions.Http.Resilience.Routing.Internal;
using Microsoft.Extensions.Http.Resilience.Test.Hedging.Internals;
using Moq;
using Xunit;

namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Internals;
namespace Microsoft.Extensions.Http.Resilience.Test.Routing;

public sealed class DefaultRoutingStrategyFactoryTests : IDisposable
{
Expand Down
4 changes: 2 additions & 2 deletions ...ing/Routing/OrderedRoutingStrategyTest.cs → ...sts/Routing/OrderedRoutingStrategyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
using System.Linq;
using FluentAssertions;
using Microsoft.Extensions.Http.Resilience.Internal;
using Microsoft.Extensions.Http.Resilience.Internal.Routing;
using Microsoft.Extensions.Http.Resilience.Routing.Internal.OrderedGroups;
using Moq;
using Xunit;

namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Routing;
namespace Microsoft.Extensions.Http.Resilience.Test.Routing;

public class OrderedRoutingStrategyTest : RoutingStrategyTest
{
Expand Down
8 changes: 4 additions & 4 deletions ...sts/Hedging/Internal/RoutingHelperTest.cs → ...lience.Tests/Routing/RoutingHelperTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
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;
using Moq;
using Xunit;

namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Internals;
namespace Microsoft.Extensions.Http.Resilience.Test.Routing;

public class RoutingHelperTest
{
Expand All @@ -20,7 +20,7 @@ public void SelectEndpoint_Ok(double nextResult, int expectedEndpoint)
var randomizer = new Mock<IRandomizer>(MockBehavior.Strict);
randomizer.Setup(v => v.NextDouble(10)).Returns(nextResult);

var result = RoutingHelper.SelectByWeight(new List<int> { 1, 2, 3, 4 }, v => v, randomizer.Object);
var result = new List<int> { 1, 2, 3, 4 }.SelectByWeight(v => v, randomizer.Object);

Assert.Equal(expectedEndpoint, result);
}
Expand All @@ -31,6 +31,6 @@ public void SelectEndpoint_Invalid()
var randomizer = new Mock<IRandomizer>(MockBehavior.Strict);
randomizer.Setup(v => v.NextDouble(10)).Returns(10000);

Assert.Throws<InvalidOperationException>(() => RoutingHelper.SelectByWeight(new List<int> { 1, 2, 3, 4 }, v => v, randomizer.Object));
Assert.Throws<InvalidOperationException>(() => new List<int> { 1, 2, 3, 4 }.SelectByWeight(v => v, randomizer.Object));
}
}
4 changes: 2 additions & 2 deletions ...ts/Hedging/Routing/RoutingStrategyTest.cs → ...ence.Tests/Routing/RoutingStrategyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
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;
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
{
Expand Down
4 changes: 2 additions & 2 deletions ...ng/Routing/WeightedRoutingStrategyTest.cs → ...ts/Routing/WeightedRoutingStrategyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
using System.Linq;
using FluentAssertions;
using Microsoft.Extensions.Http.Resilience.Internal;
using Microsoft.Extensions.Http.Resilience.Internal.Routing;
using Microsoft.Extensions.Http.Resilience.Routing.Internal.WeightedGroups;
using Moq;
using Xunit;

namespace Microsoft.Extensions.Http.Resilience.Test.Hedging.Routing;
namespace Microsoft.Extensions.Http.Resilience.Test.Routing;

public class WeightedRoutingStrategyTest : RoutingStrategyTest
{
Expand Down