Skip to content

Update event listener naming #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gthea merged 12 commits into from
Jan 21, 2026
Merged

Update event listener naming #857

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6dcd2a2
Release 5.4.2 (#824)
gthea Oct 31, 2025
a3dec44
Updated License Year (#843)
github-actions[bot] Jan 5, 2026
c37e0b3
Merge pull request #853 from splitio/master
gthea Jan 19, 2026
775cfd3
New integration tests
gthea Jan 20, 2026
877ebd9
Refactor tests
gthea Jan 20, 2026
badd72f
Reuse helper methods
gthea Jan 20, 2026
8271d95
Clean up
gthea Jan 20, 2026
3867550
Update event listener naming
gthea Jan 20, 2026
21dbd14
Merge branch 'FME-11237-fixes_b' into FME-11237-fixes_2
gthea Jan 20, 2026
fb383b3
Merge branch 'development' into FME-11237-fixes_2
gthea Jan 20, 2026
6366a40
Default socket factory when not specified
gthea Jan 21, 2026
7d187dc
Merge pull request #858 from splitio/FME-11237-fixes_2
gthea Jan 21, 2026
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
4 changes: 2 additions & 2 deletions api/src/main/java/io/split/android/client/SplitClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.Map;

import io.split.android.client.attributes.AttributesManager;
import io.split.android.client.events.SdkEventListener;
import io.split.android.client.events.SplitEventListener;
import io.split.android.client.events.SplitEvent;
import io.split.android.client.events.SplitEventTask;

Expand Down Expand Up @@ -214,7 +214,7 @@ public interface SplitClient extends AttributesManager {
*
* @param listener the event listener to register. Must not be null.
*/
void addEventListener(@NonNull SdkEventListener listener);
void addEventListener(@NonNull SplitEventListener listener);

/**
* Enqueue a new event to be sent to Split data collection services.
Expand Down
2 changes: 1 addition & 1 deletion ...droid/client/events/SdkEventListener.java → ...oid/client/events/SplitEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* });
* }</pre>
*/
public abstract class SdkEventListener {
public abstract class SplitEventListener {

/**
* Called when SDK_READY event occurs, executed on a background thread.
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/io/split/android/client/events/SplitEventTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* </ul>
* <p>
* For events with metadata (like SDK_UPDATE or SDK_READY_FROM_CACHE), use
* {@link SdkEventListener} instead for type-safe metadata access.
* {@link SplitEventListener} instead for type-safe metadata access.
* <p>
* Example usage:
* <pre>{@code
Expand Down
2 changes: 1 addition & 1 deletion events-domain/src/main/java/io/split/android/client/events/ListenableEventsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public interface ListenableEventsManager {

void register(SplitEvent event, SplitEventTask task);

void registerEventListener(SdkEventListener listener);
void registerEventListener(SplitEventListener listener);

boolean eventAlreadyTriggered(SplitEvent event);
}
14 changes: 7 additions & 7 deletions events-domain/src/main/java/io/split/android/client/events/SplitEventsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public void register(SplitEvent event, SplitEventTask task) {
}

@Override
public void registerEventListener(SdkEventListener listener) {
public void registerEventListener(SplitEventListener listener) {
requireNonNull(listener);

// Register SDK_READY handlers (bg + main)
Expand Down Expand Up @@ -190,15 +190,15 @@ private EventHandler<SplitEvent, EventMetadata> createMainThreadHandler(final Sp
}

// SdkEventListener handlers for SDK_READY
private EventHandler<SplitEvent, EventMetadata> createReadyBackgroundHandler(final SdkEventListener listener) {
private EventHandler<SplitEvent, EventMetadata> createReadyBackgroundHandler(final SplitEventListener listener) {
return (event, metadata) -> {
SplitClient client = mResources.getSplitClient();
SdkReadyMetadata typedMetadata = TypedTaskConverter.convertForSdkReady(metadata);
executeMethod(() -> listener.onReady(client, typedMetadata));
};
}

private EventHandler<SplitEvent, EventMetadata> createReadyMainThreadHandler(final SdkEventListener listener) {
private EventHandler<SplitEvent, EventMetadata> createReadyMainThreadHandler(final SplitEventListener listener) {
return (event, metadata) -> {
SplitClient client = mResources.getSplitClient();
SdkReadyMetadata typedMetadata = TypedTaskConverter.convertForSdkReady(metadata);
Expand All @@ -207,15 +207,15 @@ private EventHandler<SplitEvent, EventMetadata> createReadyMainThreadHandler(fin
}

// SdkEventListener handlers for SDK_UPDATE
private EventHandler<SplitEvent, EventMetadata> createUpdateBackgroundHandler(final SdkEventListener listener) {
private EventHandler<SplitEvent, EventMetadata> createUpdateBackgroundHandler(final SplitEventListener listener) {
return (event, metadata) -> {
SplitClient client = mResources.getSplitClient();
SdkUpdateMetadata typedMetadata = TypedTaskConverter.convertForSdkUpdate(metadata);
executeMethod(() -> listener.onUpdate(client, typedMetadata));
};
}

private EventHandler<SplitEvent, EventMetadata> createUpdateMainThreadHandler(final SdkEventListener listener) {
private EventHandler<SplitEvent, EventMetadata> createUpdateMainThreadHandler(final SplitEventListener listener) {
return (event, metadata) -> {
SplitClient client = mResources.getSplitClient();
SdkUpdateMetadata typedMetadata = TypedTaskConverter.convertForSdkUpdate(metadata);
Expand All @@ -224,15 +224,15 @@ private EventHandler<SplitEvent, EventMetadata> createUpdateMainThreadHandler(fi
}

// SdkEventListener handlers for SDK_READY_FROM_CACHE
private EventHandler<SplitEvent, EventMetadata> createReadyFromCacheBackgroundHandler(final SdkEventListener listener) {
private EventHandler<SplitEvent, EventMetadata> createReadyFromCacheBackgroundHandler(final SplitEventListener listener) {
return (event, metadata) -> {
SplitClient client = mResources.getSplitClient();
SdkReadyMetadata typedMetadata = TypedTaskConverter.convertForSdkReady(metadata);
executeMethod(() -> listener.onReadyFromCache(client, typedMetadata));
};
}

private EventHandler<SplitEvent, EventMetadata> createReadyFromCacheMainThreadHandler(final SdkEventListener listener) {
private EventHandler<SplitEvent, EventMetadata> createReadyFromCacheMainThreadHandler(final SplitEventListener listener) {
return (event, metadata) -> {
SplitClient client = mResources.getSplitClient();
SdkReadyMetadata typedMetadata = TypedTaskConverter.convertForSdkReady(metadata);
Expand Down
4 changes: 2 additions & 2 deletions main/src/androidTest/java/fake/SplitClientStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import io.split.android.client.EvaluationOptions;
import io.split.android.client.SplitClient;
import io.split.android.client.SplitResult;
import io.split.android.client.events.SdkEventListener;
import io.split.android.client.events.SplitEventListener;
import io.split.android.client.events.SplitEvent;
import io.split.android.client.events.SplitEventTask;

Expand Down Expand Up @@ -122,7 +122,7 @@ public void on(SplitEvent event, SplitEventTask task) {
}

@Override
public void addEventListener(SdkEventListener listener) {
public void addEventListener(SplitEventListener listener) {
// Stub implementation - does nothing
}

Expand Down
68 changes: 33 additions & 35 deletions main/src/androidTest/java/tests/integration/events/SdkEventsIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import android.content.Context;

import androidx.annotation.NonNull;
import androidx.test.platform.app.InstrumentationRegistry;

import org.junit.After;
Expand Down Expand Up @@ -37,14 +36,13 @@
import io.split.android.client.SplitClientConfig;
import io.split.android.client.SplitFactory;
import io.split.android.client.api.Key;
import io.split.android.client.events.SdkEventListener;
import io.split.android.client.events.SplitEventListener;
import io.split.android.client.events.SdkReadyMetadata;
import io.split.android.client.events.SdkUpdateMetadata;
import io.split.android.client.events.SplitEvent;
import io.split.android.client.events.SplitEventTask;
import io.split.android.client.network.HttpMethod;
import io.split.android.client.storage.db.GeneralInfoEntity;
import io.split.android.client.storage.db.MyLargeSegmentEntity;
import io.split.android.client.storage.db.MySegmentEntity;
import io.split.android.client.storage.db.SplitEntity;
import io.split.android.client.storage.db.SplitRoomDatabase;
Expand Down Expand Up @@ -246,7 +244,7 @@ public void sdkReadyListenerFiresWithMetadata() throws Exception {
SplitClient client = factory.client(new Key("key_1"));

// And: a handler H is registered using addEventListener with onReady
client.addEventListener(new SdkEventListener() {
client.addEventListener(new SplitEventListener() {
@Override
public void onReady(SplitClient client, SdkReadyMetadata metadata) {
onReadyCount.incrementAndGet();
Expand Down Expand Up @@ -297,7 +295,7 @@ public void sdkReadyListenerReplaysToLateSubscribers() throws Exception {
AtomicReference<SdkReadyMetadata> receivedMetadata = new AtomicReference<>();
CountDownLatch lateReadyLatch = new CountDownLatch(1);

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onReady(SplitClient client, SdkReadyMetadata metadata) {
onReadyCount.incrementAndGet();
Expand Down Expand Up @@ -342,7 +340,7 @@ public void sdkReadyViewListenerFiresOnMainThread() throws Exception {
SplitClient client = factory.client(new Key("key_1"));

// And: a handler H is registered using addEventListener with onReadyView
client.addEventListener(new SdkEventListener() {
client.addEventListener(new SplitEventListener() {
@Override
public void onReadyView(SplitClient client, SdkReadyMetadata metadata) {
onReadyViewCount.incrementAndGet();
Expand Down Expand Up @@ -488,7 +486,7 @@ public void sdkUpdateEmittedOnlyAfterSdkReady() throws Exception {
CountDownLatch updateLatch = new CountDownLatch(1);

// Register handlers BEFORE SDK_READY fires
fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
updateHandlerCount.incrementAndGet();
Expand Down Expand Up @@ -546,7 +544,7 @@ public void sdkUpdateFiresOnAnyDataChangeEventAfterSdkReady() throws Exception {
AtomicReference<SdkUpdateMetadata> lastMetadata = new AtomicReference<>();
CountDownLatch updateLatch = new CountDownLatch(1);

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
updateHandlerCount.incrementAndGet();
Expand Down Expand Up @@ -591,7 +589,7 @@ public void sdkUpdateDoesNotReplayToLateSubscribers() throws Exception {
AtomicReference<CountDownLatch> secondUpdateLatchRef = new AtomicReference<>(null);

// And: a handler H1 is registered for sdkUpdate
fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handler1Count.incrementAndGet();
Expand Down Expand Up @@ -620,7 +618,7 @@ public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
CountDownLatch secondUpdateLatch = new CountDownLatch(2);
secondUpdateLatchRef.set(secondUpdateLatch);

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handler2Count.incrementAndGet();
Expand Down Expand Up @@ -872,7 +870,7 @@ public void handlersInvokedSequentiallyErrorsIsolated() throws Exception {

// Given: three handlers H1, H2 and H3 are registered for sdkUpdate in that order
// And: H2 throws an exception when invoked
fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handler1Count.incrementAndGet();
Expand All @@ -881,7 +879,7 @@ public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
}
});

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handler2Count.incrementAndGet();
Expand All @@ -891,7 +889,7 @@ public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
}
});

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handler3Count.incrementAndGet();
Expand Down Expand Up @@ -948,7 +946,7 @@ public void metadataCorrectlyPropagatedToHandlers() throws Exception {
CountDownLatch updateLatch = new CountDownLatch(1);

// Given: a handler H is registered for sdkUpdate which inspects the received metadata
fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
updateHandlerCount.incrementAndGet();
Expand Down Expand Up @@ -1038,15 +1036,15 @@ public void sdkScopedEventsFanOutToMultipleClients() throws Exception {
CountDownLatch updateLatchB = new CountDownLatch(1);

// And: handlers HA and HB are registered for sdkUpdate
fixture.clientA.addEventListener(new SdkEventListener() {
fixture.clientA.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handlerACount.incrementAndGet();
updateLatchA.countDown();
}
});

fixture.clientB.addEventListener(new SdkEventListener() {
fixture.clientB.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handlerBCount.incrementAndGet();
Expand Down Expand Up @@ -1092,15 +1090,15 @@ public void clientScopedEventsDoNotFanOutToOtherClients() throws Exception {
CountDownLatch updateLatchB = new CountDownLatch(1);

// And: handlers HA and HB are registered for sdkUpdate
fixture.clientA.addEventListener(new SdkEventListener() {
fixture.clientA.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handlerACount.incrementAndGet();
updateLatchA.countDown();
}
});

fixture.clientB.addEventListener(new SdkEventListener() {
fixture.clientB.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
handlerBCount.incrementAndGet();
Expand Down Expand Up @@ -1140,7 +1138,7 @@ public void sdkUpdateMetadataContainsTypeForFlagsUpdate() throws Exception {
AtomicReference<SdkUpdateMetadata> receivedMetadata = new AtomicReference<>();
CountDownLatch updateLatch = new CountDownLatch(1);

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
receivedMetadata.set(metadata);
Expand Down Expand Up @@ -1182,7 +1180,7 @@ public void sdkUpdateMetadataContainsTypeForSegmentsUpdate() throws Exception {
AtomicReference<SdkUpdateMetadata> receivedMetadata = new AtomicReference<>();
CountDownLatch updateLatch = new CountDownLatch(1);

fixture.client.addEventListener(new SdkEventListener() {
fixture.client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata metadata) {
receivedMetadata.set(metadata);
Expand Down Expand Up @@ -1285,7 +1283,7 @@ public void onPostExecution(SplitClient c) {
List<SdkUpdateMetadata> receivedMetadataList = new ArrayList<>();
CountDownLatch updateLatch = new CountDownLatch(1);

client.addEventListener(new SdkEventListener() {
client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient c, SdkUpdateMetadata metadata) {
synchronized (receivedMetadataList) {
Expand Down Expand Up @@ -1470,7 +1468,7 @@ public void onPostExecution(SplitClient c) {
CountDownLatch updateLatch = new CountDownLatch(expectedEventCount * 2);

// Register new API handler (addEventListener)
client.addEventListener(new SdkEventListener() {
client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient c, SdkUpdateMetadata metadata) {
synchronized (receivedMetadataList) {
Expand Down Expand Up @@ -1841,7 +1839,7 @@ private TwoClientFixture createTwoStreamingClientsAndWaitForReady(Key keyA, Key
private void registerCacheReadyHandler(SplitClient client, AtomicInteger count,
AtomicReference<SdkReadyMetadata> metadata,
CountDownLatch latch) {
client.addEventListener(new SdkEventListener() {
client.addEventListener(new SplitEventListener() {
@Override
public void onReadyFromCache(SplitClient client, SdkReadyMetadata eventMetadata) {
count.incrementAndGet();
Expand All @@ -1856,7 +1854,7 @@ public void onReadyFromCache(SplitClient client, SdkReadyMetadata eventMetadata)
*/
private void registerUpdateHandler(SplitClient client, AtomicInteger count,
AtomicReference<SdkUpdateMetadata> metadata) {
client.addEventListener(new SdkEventListener() {
client.addEventListener(new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata eventMetadata) {
count.incrementAndGet();
Expand All @@ -1881,10 +1879,10 @@ public void onPostExecution(SplitClient client) {
/**
* Creates a SdkEventListener that counts onReady invocations and captures metadata.
*/
private SdkEventListener createOnReadyListener(AtomicInteger count,
AtomicReference<SdkReadyMetadata> metadata,
CountDownLatch latch) {
return new SdkEventListener() {
private SplitEventListener createOnReadyListener(AtomicInteger count,
AtomicReference<SdkReadyMetadata> metadata,
CountDownLatch latch) {
return new SplitEventListener() {
@Override
public void onReady(SplitClient client, SdkReadyMetadata eventMetadata) {
if (count != null) count.incrementAndGet();
Expand All @@ -1897,10 +1895,10 @@ public void onReady(SplitClient client, SdkReadyMetadata eventMetadata) {
/**
* Creates a SdkEventListener that counts onUpdate invocations and captures metadata.
*/
private SdkEventListener createOnUpdateListener(AtomicInteger count,
AtomicReference<SdkUpdateMetadata> metadata,
CountDownLatch latch) {
return new SdkEventListener() {
private SplitEventListener createOnUpdateListener(AtomicInteger count,
AtomicReference<SdkUpdateMetadata> metadata,
CountDownLatch latch) {
return new SplitEventListener() {
@Override
public void onUpdate(SplitClient client, SdkUpdateMetadata eventMetadata) {
if (count != null) count.incrementAndGet();
Expand All @@ -1913,9 +1911,9 @@ public void onUpdate(SplitClient client, SdkUpdateMetadata eventMetadata) {
/**
* Creates a SdkEventListener with both onReady and onUpdate handlers.
*/
private SdkEventListener createDualListener(AtomicInteger readyCount, CountDownLatch readyLatch,
AtomicInteger updateCount, CountDownLatch updateLatch) {
return new SdkEventListener() {
private SplitEventListener createDualListener(AtomicInteger readyCount, CountDownLatch readyLatch,
AtomicInteger updateCount, CountDownLatch updateLatch) {
return new SplitEventListener() {
@Override
public void onReady(SplitClient client, SdkReadyMetadata metadata) {
if (readyCount != null) readyCount.incrementAndGet();
Expand Down
Loading
Loading