Rename config

src/androidTest/java/tests/integration/rollout/RolloutCacheManagerIntegrationTest.java

@@ -65,7 +65,7 @@ public void setUp() {
 
     @Test
     public void expirationPeriodIsUsed() throws InterruptedException {
-        test(getTimestampDaysAgo(1), RolloutCacheConfiguration.builder().expiration(1));
+        test(getTimestampDaysAgo(1), RolloutCacheConfiguration.builder().expirationDays(1));
     }
 
     @Test

src/main/java/io/split/android/client/RolloutCacheConfiguration.java

@@ -5,16 +5,16 @@
 
 public class RolloutCacheConfiguration {
 
-    private final int mExpiration;
+    private final int mExpirationDays;
     private final boolean mClearOnInit;
 
     private RolloutCacheConfiguration(int expiration, boolean clearOnInit) {
-        mExpiration = expiration;
+        mExpirationDays = expiration;
         mClearOnInit = clearOnInit;
     }
 
-    public int getExpiration() {
-        return mExpiration;
+    public int getExpirationDays() {
+        return mExpirationDays;
     }
 
     public boolean isClearOnInit() {
@@ -38,15 +38,15 @@ private Builder() {
 
         /**
          * Set the expiration time for the rollout definitions cache, in days. Default is 10 days.
-         * @param expiration in days
+         * @param expirationDays in days
          * @return This builder
          */
-        public Builder expiration(int expiration) {
-            if (expiration < MIN_EXPIRATION_DAYS) {
+        public Builder expirationDays(int expirationDays) {
+            if (expirationDays < MIN_EXPIRATION_DAYS) {
                 Logger.w("Cache expiration must be at least 1 day. Using default value.");
                 mExpiration = ServiceConstants.DEFAULT_ROLLOUT_CACHE_EXPIRATION;
             } else {
-                mExpiration = expiration;
+                mExpiration = expirationDays;
             }
 
             return this;

src/main/java/io/split/android/client/SplitClientConfig.java

@@ -254,7 +254,7 @@ public String trafficType() {
 
     @Deprecated
     public long cacheExpirationInSeconds() {
-        return TimeUnit.DAYS.toSeconds(rolloutCacheConfiguration().getExpiration());
+        return TimeUnit.DAYS.toSeconds(rolloutCacheConfiguration().getExpirationDays());
     }
 
     public long eventFlushInterval() {

src/main/java/io/split/android/client/service/synchronizer/RolloutCacheManagerImpl.java

@@ -101,7 +101,7 @@ private boolean validateExpiration() {
         // calculate elapsed time since last update
         long daysSinceLastUpdate = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - lastUpdateTimestamp);
 
-        if (lastUpdateTimestamp > 0 && daysSinceLastUpdate >= mConfig.getExpiration()) {
+        if (lastUpdateTimestamp > 0 && daysSinceLastUpdate >= mConfig.getExpirationDays()) {
             Logger.v("Clearing rollout definitions cache due to expiration");
             return true;
         } else if (mConfig.isClearOnInit()) {

src/test/java/io/split/android/client/RolloutCacheConfigurationTest.java

@@ -11,16 +11,16 @@ public class RolloutCacheConfigurationTest {
     @Test
     public void defaultValues() {
         RolloutCacheConfiguration config = RolloutCacheConfiguration.builder().build();
-        assertEquals(10, config.getExpiration());
+        assertEquals(10, config.getExpirationDays());
         assertFalse(config.isClearOnInit());
     }
 
     @Test
     public void expirationIsCorrectlySet() {
         RolloutCacheConfiguration.Builder builder = RolloutCacheConfiguration.builder();
-        builder.expiration(1);
+        builder.expirationDays(1);
         RolloutCacheConfiguration config = builder.build();
-        assertEquals(1, config.getExpiration());
+        assertEquals(1, config.getExpirationDays());
     }
 
     @Test
@@ -34,8 +34,8 @@ public void clearOnInitIsCorrectlySet() {
     @Test
     public void negativeExpirationIsSetToDefault() {
         RolloutCacheConfiguration.Builder builder = RolloutCacheConfiguration.builder();
-        builder.expiration(-1);
+        builder.expirationDays(-1);
         RolloutCacheConfiguration config = builder.build();
-        assertEquals(10, config.getExpiration());
+        assertEquals(10, config.getExpirationDays());
     }
 }

src/test/java/io/split/android/client/SplitClientConfigTest.java

@@ -229,17 +229,17 @@ public void observerCacheExpirationPeriodMatchesDedupeTimeIntervalWhenDedupeTime
     public void rolloutCacheConfigurationDefaults() {
         RolloutCacheConfiguration config = SplitClientConfig.builder().build().rolloutCacheConfiguration();
 
-        assertEquals(10, config.getExpiration());
+        assertEquals(10, config.getExpirationDays());
         assertFalse(config.isClearOnInit());
     }
 
     @Test
     public void rolloutCacheConfigurationExpirationIsCorrectlySet() {
         RolloutCacheConfiguration config = SplitClientConfig.builder()
-                .rolloutCacheConfiguration(RolloutCacheConfiguration.builder().expiration(1).clearOnInit(true).build())
+                .rolloutCacheConfiguration(RolloutCacheConfiguration.builder().expirationDays(1).clearOnInit(true).build())
                 .build().rolloutCacheConfiguration();
 
-        assertEquals(1, config.getExpiration());
+        assertEquals(1, config.getExpirationDays());
         assertTrue(config.isClearOnInit());
     }
 
@@ -251,7 +251,7 @@ public void nullRolloutCacheConfigurationSetsDefault() {
                 .rolloutCacheConfiguration(null)
                 .build().rolloutCacheConfiguration();
 
-        assertEquals(10, config.getExpiration());
+        assertEquals(10, config.getExpirationDays());
         assertFalse(config.isClearOnInit());
         assertEquals(1, logMessages.size());
     }

src/test/java/io/split/android/client/service/synchronizer/RolloutCacheManagerTest.kt

@@ -177,7 +177,7 @@ class RolloutCacheManagerTest {
     }
 
     private fun getCacheManager(expiration: Int, clearOnInit: Boolean): RolloutCacheManager {
-        return RolloutCacheManagerImpl(mGeneralInfoStorage, RolloutCacheConfiguration.builder().expiration(expiration).clearOnInit(clearOnInit).build(), mCleanUpDatabaseTask, mEncryptionMigrationTask, mSplitsCache, mSegmentsCache)
+        return RolloutCacheManagerImpl(mGeneralInfoStorage, RolloutCacheConfiguration.builder().expirationDays(expiration).clearOnInit(clearOnInit).build(), mCleanUpDatabaseTask, mEncryptionMigrationTask, mSplitsCache, mSegmentsCache)
     }
 
     private fun createMockedTimestamp(period: Long): Long {