Skip to content

Commit 8326ea6

Browse files
committed
Simplify state data
1 parent d0f37a6 commit 8326ea6

File tree

6 files changed

+14
-20
lines changed

6 files changed

+14
-20
lines changed

pkgs/sdk/server/src/Internal/DataSources/CompositeDataSource/IDataSourceObserver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace LaunchDarkly.Sdk.Server.Internal.DataSources
1111
/// </summary>
1212
internal interface IDataSourceObserver
1313
{
14-
void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted);
14+
void Apply(ChangeSet<ItemDescriptor> changeSet);
1515

1616
/// <param name="newState">the data source state</param>
1717
/// <param name="newError">information about a new error, if any</param>

pkgs/sdk/server/src/Internal/DataSources/CompositeDataSource/ObservableDataSourceUpdates.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ internal sealed class ObservableDataSourceUpdates : IDataSourceUpdatesV2
2222
{
2323
private readonly IDataSourceUpdatesV2 _primary;
2424
private readonly IReadOnlyList<IDataSourceObserver> _secondaries;
25-
private readonly bool _isLast;
2625

2726
/// <summary>
2827
/// Creates a new <see cref="ObservableDataSourceUpdates"/> instance.
@@ -34,7 +33,6 @@ public ObservableDataSourceUpdates(IDataSourceUpdatesV2 primary, IReadOnlyList<I
3433
{
3534
_primary = primary ?? throw new ArgumentNullException(nameof(primary));
3635
_secondaries = secondaries ?? throw new ArgumentNullException(nameof(secondaries));
37-
_isLast = isLast;
3836
}
3937

4038
/// <inheritdoc/>
@@ -67,7 +65,7 @@ public bool Apply(ChangeSet<ItemDescriptor> changeSet)
6765
// Then invoke on the secondaries
6866
foreach (var secondary in _secondaries)
6967
{
70-
secondary.Apply(changeSet, _isLast);
68+
secondary.Apply(changeSet);
7169
}
7270

7371
return primarySucceeded;

pkgs/sdk/server/src/Internal/FDv2DataSources/FDv2DataSource.CompositeObserver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public CompositeObserver(params IDataSourceObserver[] observers)
1919
_observers = observers ?? throw new ArgumentNullException(nameof(observers));
2020
}
2121

22-
public void Apply(DataStoreTypes.ChangeSet<DataStoreTypes.ItemDescriptor> changeSet, bool exhausted)
22+
public void Apply(DataStoreTypes.ChangeSet<DataStoreTypes.ItemDescriptor> changeSet)
2323
{
2424
foreach (var dataSourceObserver in _observers)
2525
{
26-
dataSourceObserver.Apply(changeSet, exhausted);
26+
dataSourceObserver.Apply(changeSet);
2727
}
2828
}
2929

pkgs/sdk/server/src/Internal/FDv2DataSources/FDv2DataSource.InitializationTracker.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,16 +230,12 @@ private void DetermineState(Action action)
230230
}
231231
}
232232

233-
public void Apply(DataStoreTypes.ChangeSet<DataStoreTypes.ItemDescriptor> changeSet, bool exhausted,
233+
public void Apply(DataStoreTypes.ChangeSet<DataStoreTypes.ItemDescriptor> changeSet,
234234
DataSourceCategory category)
235235
{
236236
if (!changeSet.Selector.IsEmpty) DetermineState(Action.SelectorReceived);
237237

238238
DetermineState(Action.DataReceived);
239-
if (category == DataSourceCategory.Initializers && exhausted)
240-
{
241-
DetermineState(Action.InitializersExhausted);
242-
}
243239
}
244240

245241
public void UpdateStatus(DataSourceState newState, DataSourceStatus.ErrorInfo? newError,

pkgs/sdk/server/src/Internal/FDv2DataSources/FDv2DataSource.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void UpdateStatus(DataSourceState newState, DataSourceStatus.ErrorInfo? n
149149
}
150150
}
151151

152-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
152+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
153153
{
154154
if (!changeSet.Selector.IsEmpty)
155155
{
@@ -263,7 +263,7 @@ private void CancelPendingFallbackTask()
263263
_interruptedFallbackTask = null;
264264
}
265265

266-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
266+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
267267
{
268268
lock (_lock)
269269
{
@@ -297,7 +297,7 @@ public void UpdateStatus(DataSourceState newState, DataSourceStatus.ErrorInfo? n
297297
}
298298
}
299299

300-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
300+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
301301
{
302302
// If this change has a selector, then we know we can move out of the current phase.
303303
// This doesn't look at the type of the changeset (Full, Partial, None), because having
@@ -332,7 +332,7 @@ public void UpdateStatus(DataSourceState newState, DataSourceStatus.ErrorInfo? n
332332
}
333333
}
334334

335-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
335+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
336336
{
337337
// this FDv1 fallback action applier doesn't care about apply, it only looks for the FDv1Fallback flag in the errors
338338
}
@@ -361,9 +361,9 @@ public InitializationObserver(InitializationTracker initializationTracker, DataS
361361
_category = category;
362362
}
363363

364-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
364+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
365365
{
366-
_initializationTracker.Apply(changeSet, exhausted, _category);
366+
_initializationTracker.Apply(changeSet, _category);
367367
}
368368

369369
public void UpdateStatus(DataSourceState newState, DataSourceStatus.ErrorInfo? newError)

pkgs/sdk/server/test/Internal/DataSources/CompositeDataSource/CompositeSourceTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ public void Dispose()
520520
// Nothing to dispose
521521
}
522522

523-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
523+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
524524
{
525525
_capturingUpdates.Apply(changeSet);
526526
}
@@ -563,7 +563,7 @@ public void Dispose()
563563
// Nothing to dispose
564564
}
565565

566-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
566+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
567567
{
568568
_capturingUpdates.Apply(changeSet);
569569
}
@@ -651,7 +651,7 @@ public void Dispose()
651651
// Nothing to dispose
652652
}
653653

654-
public void Apply(ChangeSet<ItemDescriptor> changeSet, bool exhausted)
654+
public void Apply(ChangeSet<ItemDescriptor> changeSet)
655655
{
656656
_capturingUpdates.Apply(changeSet);
657657
}

0 commit comments

Comments
 (0)