From 11f84b28c5fb7e02ef0f208914498fc10df9ea7f Mon Sep 17 00:00:00 2001
From: Martin Tomka <martintomka@microsoft.com>
Date: Mon, 22 Apr 2024 16:51:03 +0200
Subject: [PATCH] Rebase and cleanup the PR

---
 src/Polly.Core/PublicAPI.Shipped.txt                         | 1 -
 src/Polly.Core/PublicAPI.Unshipped.txt                       | 1 +
 src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategy.cs        | 2 +-
 src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategyOptions.cs | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Polly.Core/PublicAPI.Shipped.txt b/src/Polly.Core/PublicAPI.Shipped.txt
index 8564f3e84a..4b6d74f543 100644
--- a/src/Polly.Core/PublicAPI.Shipped.txt
+++ b/src/Polly.Core/PublicAPI.Shipped.txt
@@ -421,7 +421,6 @@ Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>
 Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>.ChaosOutcomeStrategyOptions() -> void
 Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>.OnOutcomeInjected.get -> System.Func<Polly.Simmy.Outcomes.OnOutcomeInjectedArguments<TResult>, System.Threading.Tasks.ValueTask>?
 Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>.OnOutcomeInjected.set -> void
-Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>.OutcomeGenerator.get -> System.Func<Polly.Simmy.Outcomes.OutcomeGeneratorArguments, System.Threading.Tasks.ValueTask<Polly.Outcome<TResult>?>>!
 Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>.OutcomeGenerator.set -> void
 Polly.Simmy.Outcomes.OnOutcomeInjectedArguments<TResult>
 Polly.Simmy.Outcomes.OnOutcomeInjectedArguments<TResult>.Context.get -> Polly.ResilienceContext!
diff --git a/src/Polly.Core/PublicAPI.Unshipped.txt b/src/Polly.Core/PublicAPI.Unshipped.txt
index e49c0f73fd..3e36df902b 100644
--- a/src/Polly.Core/PublicAPI.Unshipped.txt
+++ b/src/Polly.Core/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Polly.Simmy.Outcomes.ChaosOutcomeStrategyOptions<TResult>.OutcomeGenerator.get -> System.Func<Polly.Simmy.Outcomes.OutcomeGeneratorArguments, System.Threading.Tasks.ValueTask<Polly.Outcome<TResult>?>>?
 static Polly.ResiliencePipelineBuilderExtensions.AddStrategy(this Polly.ResiliencePipelineBuilder! builder, System.Func<Polly.StrategyBuilderContext!, Polly.ResilienceStrategy<object!>!>! factory) -> Polly.ResiliencePipelineBuilder!
 static Polly.ResiliencePipelineBuilderExtensions.AddStrategy<TBuilder>(this TBuilder! builder, System.Func<Polly.StrategyBuilderContext!, Polly.ResilienceStrategy!>! factory) -> TBuilder!
 static Polly.ResiliencePipelineBuilderExtensions.AddStrategy<TResult>(this Polly.ResiliencePipelineBuilder<TResult>! builder, System.Func<Polly.StrategyBuilderContext!, Polly.ResilienceStrategy<TResult>!>! factory) -> Polly.ResiliencePipelineBuilder<TResult>!
diff --git a/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategy.cs b/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategy.cs
index 0f9a2e44d0..e9f224bfb0 100644
--- a/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategy.cs
+++ b/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategy.cs
@@ -13,7 +13,7 @@ public ChaosOutcomeStrategy(ChaosOutcomeStrategyOptions<T> options, ResilienceSt
     {
         _telemetry = telemetry;
         _onOutcomeInjected = options.OnOutcomeInjected;
-        _outcomeGenerator = options.OutcomeGenerator;
+        _outcomeGenerator = options.OutcomeGenerator!;
     }
 
     protected internal override async ValueTask<Outcome<T>> ExecuteCore<TState>(Func<ResilienceContext, TState, ValueTask<Outcome<T>>> callback, ResilienceContext context, TState state)
diff --git a/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategyOptions.cs b/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategyOptions.cs
index cf5f8a2085..6c5e664277 100644
--- a/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategyOptions.cs
+++ b/src/Polly.Core/Simmy/Outcomes/ChaosOutcomeStrategyOptions.cs
@@ -28,5 +28,5 @@ public class ChaosOutcomeStrategyOptions<TResult> : ChaosStrategyOptions
     /// Defaults to <see langword="null"/>. This property is required.
     /// </value>
     [Required]
-    public Func<OutcomeGeneratorArguments, ValueTask<Outcome<TResult>?>> OutcomeGenerator { get; set; } = default!;
+    public Func<OutcomeGeneratorArguments, ValueTask<Outcome<TResult>?>>? OutcomeGenerator { get; set; }
 }