Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,18 @@ private HttpProperties makeHttpConfig(LDConfig config) {
return ComponentsImpl.toHttpProperties(config.http.build(new ClientContext(SDK_KEY)));
}

@Test
public void emptySelectorOmitsBasisOnNextPoll() throws Exception {
try (HttpServer server = HttpServer.start(Handlers.all(
Handlers.header("Connection", "close"), Handlers.bodyJson(VALID_EVENTS_JSON)));
DefaultFDv2Requestor requestor = makeRequestor(server)) {
requestor.Poll(Selector.make(1, "initial")).get(5, TimeUnit.SECONDS);
assertThat(server.getRecorder().requireRequest().getQuery(), containsString("basis=initial"));
requestor.Poll(Selector.EMPTY).get(5, TimeUnit.SECONDS);
assertNull(server.getRecorder().requireRequest().getQuery());
}
}

@Test
public void successfulRequestWithEvents() throws Exception {
Handler resp = Handlers.bodyJson(VALID_EVENTS_JSON);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,30 @@ private static String makeEvent(String type, String data) {
return "event: " + type + "\ndata: " + data;
}

@Test
public void emptySelectorSendsNoBasis() throws Exception {
String intent = makeEvent("server-intent",
"{\"payloads\":[{\"id\":\"current\",\"target\":1,\"intentCode\":\"xfer-full\",\"reason\":\"payload-missing\"}]}");
String transferred = makeEvent("payload-transferred", "{\"state\":\"current\",\"version\":1}");
try (HttpServer server = HttpServer.start(Handlers.all(
Handlers.SSE.start(), Handlers.SSE.event(intent), Handlers.SSE.event(transferred),
Handlers.SSE.leaveOpen()))) {
HttpProperties httpProperties = toHttpProperties(clientContext("sdk-key", baseConfig().build()).getHttp());
StreamingSynchronizerImpl synchronizer = new StreamingSynchronizerImpl(
httpProperties, server.getUri(), "/stream", testLogger, mockSelectorSource(), executor,
null, Duration.ofMillis(100), StreamingSynchronizerImpl.RESET_THRESHOLD, Thread.NORM_PRIORITY, null);
try {
FDv2SourceResult result = synchronizer.next().get(5, TimeUnit.SECONDS);
assertEquals(SourceResultType.CHANGE_SET, result.getResultType());
assertEquals(ChangeSetType.Full, result.getChangeSet().getType());
assertEquals(Selector.make(1, "current"), result.getChangeSet().getSelector());
assertNull(server.getRecorder().requireRequest().getQuery());
} finally {
synchronizer.close();
}
}
}

@Test
public void receivesMultipleChangesets() throws Exception {
String serverIntent = makeEvent("server-intent", "{\"payloads\":[{\"id\":\"payload-1\",\"target\":100,\"intentCode\":\"xfer-full\",\"reason\":\"payload-missing\"}]}");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private IFDv2ProtocolAction payloadTransferred(PayloadTransferred payload) {
FDv2ChangeSet changeset = new FDv2ChangeSet(
changeSetType,
new ArrayList<>(changes),
Selector.make(payload.getVersion(), payload.getState()));
payload.getState().isEmpty() ? Selector.EMPTY : Selector.make(payload.getVersion(), payload.getState()));
state = FDv2ProtocolState.CHANGES;
changes.clear();
return new FDv2ActionChangeset(changeset);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.launchdarkly.sdk.internal.fdv2.sources;

import com.google.gson.JsonElement;
import com.launchdarkly.sdk.fdv2.Selector;
import com.launchdarkly.sdk.internal.BaseInternalTest;
import com.launchdarkly.sdk.internal.fdv2.payloads.DeleteObject;
import com.launchdarkly.sdk.internal.fdv2.payloads.Error;
Expand All @@ -11,6 +12,7 @@
import com.launchdarkly.sdk.internal.fdv2.payloads.PayloadTransferred;
import com.launchdarkly.sdk.internal.fdv2.payloads.PutObject;
import com.launchdarkly.sdk.internal.fdv2.payloads.ServerIntent;
import com.launchdarkly.sdk.internal.fdv2.sources.FDv2ProtocolHandler.FDv2ActionChangeset;

import org.junit.Test;

Expand Down Expand Up @@ -675,6 +677,38 @@ public void payloadTransferred_PopulatesSelector() {
assertEquals(42, changeset.getSelector().getVersion());
}

@Test
public void selectorlessFullTransfer_EmitsEmptySelector() {
for (boolean withObject : new boolean[] {false, true}) {
FDv2ProtocolHandler handler = new FDv2ProtocolHandler();
handler.handleEvent(createServerIntentEvent(IntentCode.TRANSFER_FULL, "initial", 1, ""));
FDv2ActionChangeset initial = (FDv2ActionChangeset) handler.handleEvent(
createPayloadTransferredEvent("initial", 1));
assertFalse(initial.getChangeset().getSelector().isEmpty());

handler.handleEvent(createServerIntentEvent(IntentCode.TRANSFER_FULL, "", 0, ""));
if (withObject) {
handler.handleEvent(createPutObjectEvent("flag", "flag-key", 1));
}
FDv2ActionChangeset action = (FDv2ActionChangeset) handler.handleEvent(
createPayloadTransferredEvent("", 0));

assertEquals(FDv2ChangeSet.FDv2ChangeSetType.FULL, action.getChangeset().getType());
assertEquals(Selector.EMPTY, action.getChangeset().getSelector());
assertEquals(withObject ? 1 : 0, action.getChangeset().getChanges().size());
}
}

@Test
public void payloadTransferred_NonEmptyStateWithZeroVersionPreservesSelector() {
FDv2ProtocolHandler handler = new FDv2ProtocolHandler();
handler.handleEvent(createServerIntentEvent(IntentCode.TRANSFER_FULL, "initial", 0, ""));
FDv2ActionChangeset action = (FDv2ActionChangeset) handler.handleEvent(
createPayloadTransferredEvent("initial", 0));

assertEquals(Selector.make(0, "initial"), action.getChangeset().getSelector());
}

/**
* Tests that ChangeSet.None has an empty selector.
*/
Expand Down
Loading