Skip to content

Commit 2904695

Browse files
committed
review comments and simplifying a test to remove race condition
1 parent 0443a44 commit 2904695

6 files changed

Lines changed: 5 additions & 6 deletions

File tree

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/DataSourceSynchronizerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public DataSourceSynchronizerAdapter(DataSourceFactory dataSourceFactory) {
6363

6464
@Override
6565
public String name() {
66-
return "AdaptedSynchronizer(FDv1)";
66+
return "AdaptedSynchronizer(V1->V2)";
6767
}
6868

6969
@Override

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/PollingInitializerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public PollingInitializerImpl(FDv2Requestor requestor, LDLogger logger, Selector
1818

1919
@Override
2020
public String name() {
21-
return "PollingInitializer(FDv2)";
21+
return "PollingInitializer(V2)";
2222
}
2323

2424
@Override

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/PollingSynchronizerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public PollingSynchronizerImpl(
3838

3939
@Override
4040
public String name() {
41-
return "PollingSynchronizer(FDv2)";
41+
return "PollingSynchronizer(V2)";
4242
}
4343

4444
private void doPoll() {

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/StreamingSynchronizerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public StreamingSynchronizerImpl(
9696

9797
@Override
9898
public String name() {
99-
return "StreamingSynchronizer(FDv2)";
99+
return "StreamingSynchronizer(V2)";
100100
}
101101

102102
private void startStream() {

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/integrations/TestDataV2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ private final class TestDataV2SynchronizerImpl implements Synchronizer {
297297

298298
@Override
299299
public String name() {
300-
return "TestDataV2";
300+
return "TestData(V2)";
301301
}
302302

303303
void put(FDv2SourceResult result, CompletableFuture<Void> completion) {

lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/FDv2DataSourceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2783,7 +2783,6 @@ public void orchestrationLogging_logsSynchronizerStartingStatusInterruptedAndShu
27832783
),
27842784
false
27852785
));
2786-
q.put(FDv2SourceResult.changeSet(makeChangeSet(true), false));
27872786
q.put(FDv2SourceResult.shutdown());
27882787
ImmutableList<FDv2DataSource.DataSourceFactory<Synchronizer>> synchronizers = ImmutableList.of(
27892788
() -> new MockQueuedSynchronizer(q, "primary-sync")

0 commit comments

Comments
 (0)