Skip to content

Commit 7d45c6d

Browse files
committed
Removed SuspendUntilCompletion reactive operator
1 parent 78d132b commit 7d45c6d

File tree

5 files changed

+9
-16
lines changed

5 files changed

+9
-16
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public void CompletionOperatorWithSuspensionCompletesImmediatelyOnCompletedStrea
463463

464464
source.SignalNext(1, new InterruptCount(1));
465465
source.SignalNext(2, new InterruptCount(2));
466-
var completionOrSuspend = source.OfType<int>().Take(1).SuspendUntilCompletion();
466+
var completionOrSuspend = source.OfType<int>().Take(1).Completion(maxWait: TimeSpan.Zero);
467467

468468
completionOrSuspend.IsCompletedSuccessfully.ShouldBeTrue();
469469
}
@@ -476,7 +476,7 @@ public async Task CompletionOperatorWithSuspensionAndTimeoutSucceedsWithImmediat
476476
var stopWatch = new Stopwatch();
477477
stopWatch.Start();
478478

479-
var nextOrSuspend = source.SuspendUntilCompletion(maxWait: TimeSpan.FromSeconds(1));
479+
var nextOrSuspend = source.Completion(maxWait: TimeSpan.FromSeconds(1));
480480
source.SignalNext(1, new InterruptCount(1));
481481
source.SignalNext(2, new InterruptCount(2));
482482

@@ -495,7 +495,7 @@ public async Task CompletionOperatorWithSuspensionAndTimeoutThrowsSuspensionExce
495495
{
496496
var source = new Source(NoOpTimeoutProvider.Instance);
497497

498-
var nextOrSuspend = source.SuspendUntilCompletion(maxWait: TimeSpan.FromMilliseconds(100));
498+
var nextOrSuspend = source.Completion(maxWait: TimeSpan.FromMilliseconds(100));
499499

500500
await Should.ThrowAsync<SuspendInvocationException>(nextOrSuspend);
501501
}
@@ -506,7 +506,7 @@ public async Task CompletionOperatorWithSuspensionThrowsSuspensionExceptionWhenN
506506
var source = new Source(NoOpTimeoutProvider.Instance);
507507

508508
await Should.ThrowAsync<SuspendInvocationException>(
509-
() => source.OfType<int>().SuspendUntilCompletion()
509+
() => source.OfType<int>().Completion(maxWait: TimeSpan.Zero)
510510
);
511511
}
512512

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ protected async Task StartedChildActionInvocationPublishesResultSuccessfully(Tas
382382
await child.Schedule("SomeChildInstance#1", "hallo world");
383383
await child.Schedule("SomeChildInstance#2", "hallo world");
384384

385-
await workflow.Messages.Take(2).SuspendUntilCompletion();
385+
await workflow.Messages.Take(2).Completion(maxWait: TimeSpan.Zero);
386386
}
387387
);
388388

@@ -432,7 +432,7 @@ await workflow.Effect.Capture("ScheduleChildren", async () =>
432432
var messages = await workflow.Messages
433433
.Take(numberOfChildren)
434434
.Select(m => m.ToString()!)
435-
.SuspendUntilCompletion();
435+
.Completion(maxWait: TimeSpan.Zero);
436436

437437
return messages;
438438
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,8 @@ public static async Task<List<T>> ToList<T>(this IReactiveChain<T> s, TimeSpan?
5353
throw new SuspendInvocationException(interruptCount);
5454
}
5555

56-
#region Completion
57-
58-
public static Task<List<T>> SuspendUntilCompletion<T>(this IReactiveChain<T> s, TimeSpan? maxWait = null)
59-
=> s.ToList(maxWait ?? TimeSpan.Zero);
60-
6156
public static Task<List<T>> Completion<T>(this IReactiveChain<T> s, TimeSpan? maxWait = null)
62-
=> s.ToList();
63-
64-
#endregion
57+
=> s.ToList(maxWait);
6558

6659
internal static List<T> Existing<T>(this IReactiveChain<T> s, out bool streamCompleted)
6760
{

Samples/Sample.ConsoleApp/LoanApproval/MessagingApproach/ApproveLoan.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static async Task Execute(LoanApplication loanApplication, Workflow workf
1616
.OfType<CreditCheckOutcome>()
1717
.Take(3)
1818
.TakeUntilTimeout("TimeoutId", expiresAt: loanApplication.Created.AddMinutes(15))
19-
.SuspendUntilCompletion();
19+
.Completion();
2020

2121
if (outcomes.Count < 2)
2222
await MessageBroker.Send(new LoanApplicationRejected(loanApplication));

Samples/Sample.ConsoleApp/WorkDistribution/ProcessOrders.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ await effect.Capture(
3737
await messages
3838
.OfType<FunctionCompletion<string>>()
3939
.Take(orderIds.Count)
40-
.SuspendUntilCompletion();
40+
.Completion();
4141

4242
await effect.Capture(
4343
"Log_ProcessingFinished",

0 commit comments

Comments
 (0)