Change sseDisconnectionDelay type (#700)

splitio · Sep 10, 2024 · e6795bb · e6795bb
1 parent b5b7bd6
commit e6795bb
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ apply plugin: 'kotlin-android'
 apply from: 'spec.gradle'
 
 ext {
-    splitVersion = '4.2.0'
+    splitVersion = '4.2.1-rc1'
 }
 
 android {

diff --git a/src/androidTest/java/helper/IntegrationHelper.java b/src/androidTest/java/helper/IntegrationHelper.java
@@ -198,22 +198,22 @@ public static SplitClientConfig lowRefreshRateConfig() {
     }
 
     public static SplitClientConfig lowRefreshRateConfig(boolean streamingEnabled) {
-        return lowRefreshRateConfig(streamingEnabled, false, true, 60L, 2L);
+        return lowRefreshRateConfig(streamingEnabled, false, true, 60L, 2);
     }
 
     public static SplitClientConfig lowRefreshRateConfig(boolean streamingEnabled, boolean telemetryEnabled) {
-        return lowRefreshRateConfig(streamingEnabled, telemetryEnabled, true, 60L, 2L);
+        return lowRefreshRateConfig(streamingEnabled, telemetryEnabled, true, 60L, 2);
     }
 
     public static SplitClientConfig syncDisabledConfig() {
-        return lowRefreshRateConfig(true, false, false, 60L, 2L);
+        return lowRefreshRateConfig(true, false, false, 60L, 2);
     }
 
-    public static SplitClientConfig customSseConnectionDelayConfig(boolean streamingEnabled, long delay, long disconnectionDelay) {
+    public static SplitClientConfig customSseConnectionDelayConfig(boolean streamingEnabled, long delay, int disconnectionDelay) {
         return lowRefreshRateConfig(streamingEnabled, false, true, delay, disconnectionDelay);
     }
 
-    public static SplitClientConfig lowRefreshRateConfig(boolean streamingEnabled, boolean telemetryEnabled, boolean syncEnabled, long delay, long sseDisconnectionDelay) {
+    public static SplitClientConfig lowRefreshRateConfig(boolean streamingEnabled, boolean telemetryEnabled, boolean syncEnabled, long delay, int sseDisconnectionDelay) {
         TestableSplitConfigBuilder builder = new TestableSplitConfigBuilder()
                 .ready(30000)
                 .featuresRefreshRate(3)

diff --git a/src/androidTest/java/helper/TestableSplitConfigBuilder.java b/src/androidTest/java/helper/TestableSplitConfigBuilder.java
@@ -59,7 +59,7 @@ public class TestableSplitConfigBuilder {
     private UserConsent mUserConsent = UserConsent.GRANTED;
     private boolean mEncryptionEnabled;
     private long mDefaultSSEConnectionDelayInSecs = ServiceConstants.DEFAULT_SSE_CONNECTION_DELAY_SECS;
-    private long mSSEDisconnectionDelayInSecs = 60L;
+    private int mSSEDisconnectionDelayInSecs = 60;
     private long mObserverCacheExpirationPeriod = ServiceConstants.DEFAULT_OBSERVER_CACHE_EXPIRATION_PERIOD_MS;
     private String mPrefix = "";
     private CertificatePinningConfiguration mCertificatePinningConfiguration;
@@ -249,7 +249,7 @@ public TestableSplitConfigBuilder defaultSSEConnectionDelayInSecs(long seconds)
         return this;
     }
 
-    public TestableSplitConfigBuilder sseDisconnectionDelayInSecs(long seconds) {
+    public TestableSplitConfigBuilder sseDisconnectionDelayInSecs(int seconds) {
         this.mSSEDisconnectionDelayInSecs = seconds;
         return this;
     }

diff --git a/src/androidTest/java/tests/integration/streaming/SplitChangeNotificationIntegrationTest.java b/src/androidTest/java/tests/integration/streaming/SplitChangeNotificationIntegrationTest.java
@@ -146,7 +146,7 @@ private void testSplitNotification(String notificationMessage) throws IOExceptio
     private Pair<SplitClient, SplitEventTaskHelper> getClient(CountDownLatch latch, String sseResponse) throws IOException, InterruptedException {
         HttpClientMock httpClientMock = new HttpClientMock(createStreamingResponseDispatcher(sseResponse));
 
-        SplitClientConfig config = IntegrationHelper.customSseConnectionDelayConfig(true, 0, 5L);
+        SplitClientConfig config = IntegrationHelper.customSseConnectionDelayConfig(true, 0, 5);
 
         SplitFactory splitFactory = IntegrationHelper.buildFactory(
                 IntegrationHelper.dummyApiKey(),

diff --git a/src/androidTest/java/tests/integration/streaming/SyncGuardianIntegrationTest.java b/src/androidTest/java/tests/integration/streaming/SyncGuardianIntegrationTest.java
@@ -138,7 +138,7 @@ public void changeInStreamingDelayAffectsSyncBehaviour() throws IOException, Int
                 false,
                 IntegrationHelper.streamingEnabledToken(6),
                 1L,
-                1L,
+                1,
                 null);
         SplitClient client = pair.first;
         SplitEventTaskHelper readyTask = pair.second;
@@ -233,10 +233,10 @@ public void splitsAreNotFetchedOnResumeWhenSingleSyncIsEnabled() throws Interrup
     }
 
     private Pair<SplitClient, SplitEventTaskHelper> getClient(CountDownLatch latch, boolean streamingEnabled, boolean singleSync, String sseResponse) throws IOException {
-        return getClient(latch, streamingEnabled, singleSync, sseResponse, 2L, 2L, null);
+        return getClient(latch, streamingEnabled, singleSync, sseResponse, 2L, 2, null);
     }
 
-    private Pair<SplitClient, SplitEventTaskHelper> getClient(CountDownLatch latch, boolean streamingEnabled, boolean singleSync, String sseResponse, long defaultConnectionDelay, long disconnectionDelay, TestingConfig testingConfig) throws IOException {
+    private Pair<SplitClient, SplitEventTaskHelper> getClient(CountDownLatch latch, boolean streamingEnabled, boolean singleSync, String sseResponse, long defaultConnectionDelay, int disconnectionDelay, TestingConfig testingConfig) throws IOException {
         HttpClientMock httpClientMock = new HttpClientMock(createStreamingResponseDispatcher(sseResponse));
 
         SplitClientConfig config = (singleSync) ? IntegrationHelper.syncDisabledConfig() : IntegrationHelper.customSseConnectionDelayConfig(streamingEnabled, defaultConnectionDelay, disconnectionDelay);

diff --git a/src/main/java/io/split/android/client/SplitClientConfig.java b/src/main/java/io/split/android/client/SplitClientConfig.java
@@ -125,7 +125,7 @@ public class SplitClientConfig {
     private boolean mEncryptionEnabled = false;
     private final String mPrefix;
     private final long mDefaultSSEConnectionDelayInSecs;
-    private final long mSSEDisconnectionDelayInSecs;
+    private final int mSSEDisconnectionDelayInSecs;
 
     // To be set during startup
     public static String splitSdkVersion;
@@ -182,7 +182,7 @@ private SplitClientConfig(String endpoint,
                               UserConsent userConsent,
                               boolean encryptionEnabled,
                               long defaultSSEConnectionDelayInSecs,
-                              long sseDisconnectionDelayInSecs,
+                              int sseDisconnectionDelayInSecs,
                               String prefix,
                               long observerCacheExpirationPeriod,
                               CertificatePinningConfiguration certificatePinningConfiguration,
@@ -469,7 +469,7 @@ public long defaultSSEConnectionDelay() {
         return mDefaultSSEConnectionDelayInSecs;
     }
 
-    public long sseDisconnectionDelay() {
+    public int sseDisconnectionDelay() {
         return mSSEDisconnectionDelayInSecs;
     }
 
@@ -553,7 +553,7 @@ public static final class Builder {
 
         private final long mDefaultSSEConnectionDelayInSecs = ServiceConstants.DEFAULT_SSE_CONNECTION_DELAY_SECS;
 
-        private final long mSSEDisconnectionDelayInSecs = 60L;
+        private final int mSSEDisconnectionDelayInSecs = 60;
 
         private final long mObserverCacheExpirationPeriod = OBSERVER_CACHE_EXPIRATION_PERIOD;
 

diff --git a/src/main/java/io/split/android/client/SplitFactoryHelper.java b/src/main/java/io/split/android/client/SplitFactoryHelper.java
@@ -241,7 +241,7 @@ PushNotificationManager getPushNotificationManager(SplitTaskExecutor splitTaskEx
                                                        SseClient sseClient,
                                                        TelemetryRuntimeProducer telemetryRuntimeProducer,
                                                        long defaultSseConnectionDelayInSecs,
-                                                       long sseDisconnectionDelayInSecs) {
+                                                       int sseDisconnectionDelayInSecs) {
         return new PushNotificationManager(pushManagerEventBroadcaster,
                 sseAuthenticator,
                 sseClient,

diff --git a/...ain/java/io/split/android/client/service/sseclient/sseclient/PushNotificationManager.java b/...ain/java/io/split/android/client/service/sseclient/sseclient/PushNotificationManager.java
@@ -1,14 +1,12 @@
 package io.split.android.client.service.sseclient.sseclient;
 
-import static io.split.android.client.utils.Utils.checkNotNull;
 import static java.lang.Thread.sleep;
+import static io.split.android.client.utils.Utils.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import io.split.android.client.service.executor.ThreadFactoryBuilder;
-
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -19,6 +17,7 @@
 import io.split.android.client.service.executor.SplitTask;
 import io.split.android.client.service.executor.SplitTaskExecutionInfo;
 import io.split.android.client.service.executor.SplitTaskType;
+import io.split.android.client.service.executor.ThreadFactoryBuilder;
 import io.split.android.client.service.sseclient.SseJwtToken;
 import io.split.android.client.service.sseclient.feedbackchannel.DelayStatusEvent;
 import io.split.android.client.service.sseclient.feedbackchannel.PushManagerEventBroadcaster;
@@ -54,13 +53,13 @@ public PushNotificationManager(@NonNull PushManagerEventBroadcaster pushManagerE
                                    @NonNull SseRefreshTokenTimer refreshTokenTimer,
                                    @NonNull TelemetryRuntimeProducer telemetryRuntimeProducer,
                                    long defaultSSEConnectionDelayInSecs,
-                                   long sseDisconnectionDelayInSecs,
+                                   int sseDisconnectionDelayInSecs,
                                    @Nullable ScheduledExecutorService executorService) {
         this(pushManagerEventBroadcaster,
                 sseAuthenticator,
                 sseClient,
                 refreshTokenTimer,
-                new SseDisconnectionTimer(new SplitSingleThreadTaskExecutor(), Math.toIntExact(sseDisconnectionDelayInSecs)),
+                new SseDisconnectionTimer(new SplitSingleThreadTaskExecutor(), sseDisconnectionDelayInSecs),
                 telemetryRuntimeProducer,
                 defaultSSEConnectionDelayInSecs,
                 executorService);

diff --git a/src/main/java/io/split/android/client/service/sseclient/sseclient/SseDisconnectionTimer.java b/src/main/java/io/split/android/client/service/sseclient/sseclient/SseDisconnectionTimer.java
@@ -1,6 +1,6 @@
 package io.split.android.client.service.sseclient.sseclient;
 
-import static com.google.gson.internal.$Gson$Preconditions.checkNotNull;
+import static io.split.android.client.utils.Utils.checkNotNull;
 
 import androidx.annotation.NonNull;