Skip to content

Commit 5baee94

Browse files
authored
Finalize the API review (#1528)
* Finalize the API review * kill mutant * Grammar
1 parent a0be561 commit 5baee94

File tree

53 files changed

+198
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+198
-205
lines changed

bench/Polly.Core.Benchmarks/CreationBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void Fallback_V8()
1818
new ResiliencePipelineBuilder<string>()
1919
.AddFallback(new()
2020
{
21-
FallbackAction = _ => Outcome.FromResultAsTask("fallback")
21+
FallbackAction = _ => Outcome.FromResultAsValueTask("fallback")
2222
})
2323
.Build();
2424
}

bench/Polly.Core.Benchmarks/PredicateBenchmark.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ public class PredicateBenchmark
1414
{
1515
ShouldHandle = args => args.Outcome switch
1616
{
17-
{ Result: { StatusCode: HttpStatusCode.InternalServerError } } => PredicateResult.True,
18-
{ Exception: HttpRequestException } => PredicateResult.True,
19-
{ Exception: IOException } => PredicateResult.True,
20-
{ Exception: InvalidOperationException } => PredicateResult.False,
21-
_ => PredicateResult.False,
17+
{ Result: { StatusCode: HttpStatusCode.InternalServerError } } => PredicateResult.True(),
18+
{ Exception: HttpRequestException } => PredicateResult.True(),
19+
{ Exception: IOException } => PredicateResult.True(),
20+
{ Exception: InvalidOperationException } => PredicateResult.False(),
21+
_ => PredicateResult.False(),
2222
}
2323
};
2424

bench/Polly.Core.Benchmarks/ResiliencePipelineBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ResiliencePipelineBenchmark
1010
public async ValueTask ExecuteOutcomeAsync()
1111
{
1212
var context = ResilienceContextPool.Shared.Get();
13-
await ResiliencePipeline.Empty.ExecuteOutcomeAsync((_, _) => Outcome.FromResultAsTask("dummy"), context, "state").ConfigureAwait(false);
13+
await ResiliencePipeline.Empty.ExecuteOutcomeAsync((_, _) => Outcome.FromResultAsValueTask("dummy"), context, "state").ConfigureAwait(false);
1414
ResilienceContextPool.Shared.Return(context);
1515
}
1616

bench/Polly.Core.Benchmarks/TelemetryBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void Prepare()
3333
public async ValueTask Execute()
3434
{
3535
var context = ResilienceContextPool.Shared.Get();
36-
await _pipeline!.ExecuteOutcomeAsync((_, _) => Outcome.FromResultAsTask("dummy"), context, "state").ConfigureAwait(false);
36+
await _pipeline!.ExecuteOutcomeAsync((_, _) => Outcome.FromResultAsValueTask("dummy"), context, "state").ConfigureAwait(false);
3737
ResilienceContextPool.Shared.Return(context);
3838
}
3939

bench/Polly.Core.Benchmarks/Utils/Helper.CircuitBreaker.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public static object CreateOpenedCircuitBreaker(PollyVersion version, bool handl
77
var manualControl = new CircuitBreakerManualControl();
88
var options = new CircuitBreakerStrategyOptions
99
{
10-
ShouldHandle = _ => PredicateResult.True,
10+
ShouldHandle = _ => PredicateResult.True(),
1111
ManualControl = manualControl,
1212
};
1313

@@ -54,9 +54,9 @@ public static object CreateCircuitBreaker(PollyVersion technology)
5454
BreakDuration = TimeSpan.FromSeconds(5),
5555
ShouldHandle = args => args.Outcome switch
5656
{
57-
{ Exception: InvalidOperationException } => PredicateResult.True,
58-
{ Result: string result } when result == Failure => PredicateResult.True,
59-
_ => PredicateResult.False
57+
{ Exception: InvalidOperationException } => PredicateResult.True(),
58+
{ Result: string result } when result == Failure => PredicateResult.True(),
59+
_ => PredicateResult.False()
6060
}
6161
});
6262
}),

bench/Polly.Core.Benchmarks/Utils/Helper.Hedging.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static ResiliencePipeline<string> CreateHedging()
1313
builder.AddHedging(new HedgingStrategyOptions<string>
1414
{
1515
ShouldHandle = args => new ValueTask<bool>(args.Outcome.Result == Failure),
16-
ActionGenerator = args => () => Outcome.FromResultAsTask("hedged response"),
16+
ActionGenerator = args => () => Outcome.FromResultAsValueTask("hedged response"),
1717
});
1818
});
1919
}

bench/Polly.Core.Benchmarks/Utils/Helper.MultipleStrategies.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ internal static partial class Helper
2929
Delay = TimeSpan.FromSeconds(1),
3030
ShouldHandle = args => args.Outcome switch
3131
{
32-
{ Exception: InvalidOperationException } => PredicateResult.True,
33-
{ Result: string result } when result == Failure => PredicateResult.True,
34-
_ => PredicateResult.False
32+
{ Exception: InvalidOperationException } => PredicateResult.True(),
33+
{ Result: string result } when result == Failure => PredicateResult.True(),
34+
_ => PredicateResult.False()
3535
}
3636
})
3737
.AddTimeout(TimeSpan.FromSeconds(1))
@@ -43,9 +43,9 @@ internal static partial class Helper
4343
BreakDuration = TimeSpan.FromSeconds(5),
4444
ShouldHandle = args => args.Outcome switch
4545
{
46-
{ Exception: InvalidOperationException } => PredicateResult.True,
47-
{ Result: string result } when result == Failure => PredicateResult.True,
48-
_ => PredicateResult.False
46+
{ Exception: InvalidOperationException } => PredicateResult.True(),
47+
{ Result: string result } when result == Failure => PredicateResult.True(),
48+
_ => PredicateResult.False()
4949
}
5050
});
5151

@@ -73,9 +73,9 @@ public static ResiliencePipeline CreateNonGenericStrategyPipeline(bool telemetry
7373
Delay = TimeSpan.FromSeconds(1),
7474
ShouldHandle = args => args.Outcome switch
7575
{
76-
{ Exception: InvalidOperationException } => PredicateResult.True,
77-
{ Result: string result } when result == Failure => PredicateResult.True,
78-
_ => PredicateResult.False
76+
{ Exception: InvalidOperationException } => PredicateResult.True(),
77+
{ Result: string result } when result == Failure => PredicateResult.True(),
78+
_ => PredicateResult.False()
7979
}
8080
})
8181
.AddTimeout(TimeSpan.FromSeconds(1))
@@ -87,9 +87,9 @@ public static ResiliencePipeline CreateNonGenericStrategyPipeline(bool telemetry
8787
BreakDuration = TimeSpan.FromSeconds(5),
8888
ShouldHandle = args => args.Outcome switch
8989
{
90-
{ Exception: InvalidOperationException } => PredicateResult.True,
91-
{ Result: string result } when result == Failure => PredicateResult.True,
92-
_ => PredicateResult.False
90+
{ Exception: InvalidOperationException } => PredicateResult.True(),
91+
{ Result: string result } when result == Failure => PredicateResult.True(),
92+
_ => PredicateResult.False()
9393
}
9494
});
9595

bench/Polly.Core.Benchmarks/Utils/Helper.Retry.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public static object CreateRetry(PollyVersion technology)
2323
Delay = delay,
2424
ShouldHandle = args => args.Outcome switch
2525
{
26-
{ Exception: InvalidOperationException } => PredicateResult.True,
27-
{ Result: string result } when result == Failure => PredicateResult.True,
28-
_ => PredicateResult.False
26+
{ Exception: InvalidOperationException } => PredicateResult.True(),
27+
{ Result: string result } when result == Failure => PredicateResult.True(),
28+
_ => PredicateResult.False()
2929
},
3030
OnRetry = _ => default
3131
});

bench/Polly.Core.Benchmarks/Utils/Helper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static async ValueTask ExecuteAsync(this object obj, PollyVersion version
1515
var context = ResilienceContextPool.Shared.Get();
1616

1717
await ((ResiliencePipeline<string>)obj).ExecuteOutcomeAsync(
18-
static (_, _) => Outcome.FromResultAsTask("dummy"),
18+
static (_, _) => Outcome.FromResultAsValueTask("dummy"),
1919
context,
2020
string.Empty).ConfigureAwait(false);
2121

src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,9 @@ private void SetLastHandledOutcome_NeedsLock(Outcome<T> outcome)
298298
{
299299
_breakingException = new BrokenCircuitException(BrokenCircuitException.DefaultMessage, exception);
300300
}
301-
else if (outcome.TryGetResult(out var result))
301+
else
302302
{
303-
_breakingException = new BrokenCircuitException<T>(BrokenCircuitException.DefaultMessage, result!);
303+
_breakingException = new BrokenCircuitException(BrokenCircuitException.DefaultMessage);
304304
}
305305
}
306306

0 commit comments

Comments
 (0)