From 6a7c68cd568971413fb6040420048647079665b2 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Fri, 13 Nov 2026 17:51:36 +0000 Subject: [PATCH 1/2] fix: Clear empty FDv2 selectors in shared protocol handling Co-Authored-By: Ryan Lamb <4955475+kinyoklion@users.noreply.github.com> --- .../sdk/server/DefaultFDv2RequestorTest.java | 11 ++++++ .../server/StreamingSynchronizerImplTest.java | 24 +++++++++++++ .../fdv2/sources/FDv2ProtocolHandler.java | 2 +- .../fdv2/sources/FDv2ProtocolHandlerTest.java | 34 +++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java index 808606f4..9dde5e9b 100644 --- a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java +++ b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java @@ -92,6 +92,17 @@ 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.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); diff --git a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java index d9d3047f..b3478491 100644 --- a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java +++ b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java @@ -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\"}]}"); + 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\"}]}"); diff --git a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java index a00b48a8..22397ec0 100644 --- a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java +++ b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java @@ -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); diff --git a/lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandlerTest.java b/lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandlerTest.java index ae32c71b..c2499a7d 100644 --- a/lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandlerTest.java +++ b/lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandlerTest.java @@ -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; @@ -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; @@ -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. */ From 6b4d555ff322a336feeccc3d3562a214b17ac6e7 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Fri, 13 Nov 2026 18:46:30 +0000 Subject: [PATCH 2/2] test: Correct selectorless FDv2 HTTP fixtures Co-Authored-By: Ryan Lamb <4955475+kinyoklion@users.noreply.github.com> --- .../com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java | 3 ++- .../launchdarkly/sdk/server/StreamingSynchronizerImplTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java index 9dde5e9b..0242f1ae 100644 --- a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java +++ b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/DefaultFDv2RequestorTest.java @@ -94,7 +94,8 @@ private HttpProperties makeHttpConfig(LDConfig config) { @Test public void emptySelectorOmitsBasisOnNextPoll() throws Exception { - try (HttpServer server = HttpServer.start(Handlers.bodyJson(VALID_EVENTS_JSON)); + 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")); diff --git a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java index b3478491..915abba2 100644 --- a/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java +++ b/lib/sdk/server/src/test/java/com/launchdarkly/sdk/server/StreamingSynchronizerImplTest.java @@ -71,7 +71,7 @@ private static String makeEvent(String type, String data) { @Test public void emptySelectorSendsNoBasis() throws Exception { String intent = makeEvent("server-intent", - "{\"payloads\":[{\"id\":\"current\",\"target\":1,\"intentCode\":\"xfer-full\"}]}"); + "{\"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),