Skip to content

Commit ad387e9

Browse files
committed
Removed SuspendUntilFirstOrNone reactive operator
1 parent d5fe7f7 commit ad387e9

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

Core/Cleipnir.ResilientFunctions.Tests/ReactiveTests/LeafOperatorsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public async Task FirstOperatorWithSuspensionAndTimeoutEventReturnTimeoutOptionW
144144
var nextOrSuspend = await source
145145
.OfType<string>()
146146
.TakeUntilTimeout(timeoutEventId, expiresAt)
147-
.SuspendUntilFirstOrNone();
147+
.FirstOrNone(TimeSpan.Zero);
148148

149149
nextOrSuspend.HasValue.ShouldBeFalse();
150150
}
@@ -163,7 +163,7 @@ public async Task FirstOperatorWithSuspensionAndTimeoutEventReturnsValueOnSignal
163163
var nextOrSuspend = await source
164164
.OfType<string>()
165165
.TakeUntilTimeout(timeoutEventId, expiresAt)
166-
.SuspendUntilFirstOrNone();
166+
.FirstOrNone(TimeSpan.Zero);
167167

168168
nextOrSuspend.HasValue.ShouldBeTrue();
169169
nextOrSuspend.Value.ShouldBe("hallo");

Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/RFunctionTests/MessagingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public async Task TimeoutEventCausesSuspendedFunctionToBeReInvoked(Task<IFunctio
9494
var timeoutOption = await messages
9595
.OfType<string>()
9696
.TakeUntilTimeout("timeoutId1", expiresIn: TimeSpan.FromMilliseconds(250))
97-
.SuspendUntilFirstOrNone();
97+
.FirstOrNone(TimeSpan.Zero);
9898

9999
var timeoutEvent = messages
100100
.OfType<TimeoutEvent>()

Core/Cleipnir.ResilientFunctions/Reactive/Extensions/LeafOperators.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@ internal static List<T> Existing<T>(this IReactiveChain<T> s, out bool streamCom
8484
}
8585

8686
#region First
87-
public static Task<Option<T>> SuspendUntilFirstOrNone<T>(this IReactiveChain<T> s, TimeSpan? maxWait = null)
88-
=> SuspendUntilFirsts(s, count: 1, maxWait)
89-
.SelectAsync(emits => emits.Any()
90-
? new Option<T>(emits.Single())
91-
: Option<T>.NoValue
92-
);
9387
public static Task<List<T>> SuspendUntilFirsts<T>(this IReactiveChain<T> s, int count, TimeSpan? maxWait = null)
9488
=> s.Take(count).ToList(maxWait: maxWait ?? TimeSpan.Zero);
9589

Samples/Sample.ConsoleApp/SupportTicket/Saga.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ await MessageBroker.Send(
2727
.OfType<SupportTicketTaken>()
2828
.Where(t => int.Parse(t.RequestId) == i)
2929
.TakeUntilTimeout($"TimeoutId{i}", expiresIn: TimeSpan.FromMinutes(15))
30-
.SuspendUntilFirstOrNone();
30+
.FirstOrNone(TimeSpan.Zero);
3131

3232
if (supportTicketTakenOption.HasValue)
3333
return;

0 commit comments

Comments
 (0)