Fix initial config load when auto poll enabled with results from cache (

#48)

gradle.properties

@@ -1 +1 @@
-version=9.1.1
+version=9.1.2

src/main/java/com/configcat/ConfigService.java

@@ -105,7 +105,12 @@ public CompletableFuture<SettingResult> getSettings() {
                             ? new SettingResult(entryResult.value().getConfig().getEntries(), entryResult.value().getFetchTime())
                             : SettingResult.EMPTY);
         } else {
-            return fetchIfOlder(Constants.DISTANT_PAST, initialized.get()) // If we are initialized, we prefer the cached results
+            long threshold = Constants.DISTANT_PAST;
+            if (!initialized.get() && pollingMode instanceof AutoPollingMode) {
+                AutoPollingMode autoPollingMode = (AutoPollingMode) pollingMode;
+                threshold = System.currentTimeMillis() - (autoPollingMode.getAutoPollRateInSeconds() * 1000L);
+            }
+            return fetchIfOlder(threshold, initialized.get()) // If we are initialized, we prefer the cached results
                     .thenApply(entryResult -> !entryResult.value().isEmpty()
                             ? new SettingResult(entryResult.value().getConfig().getEntries(), entryResult.value().getFetchTime())
                             : SettingResult.EMPTY);

src/main/java/com/configcat/Constants.java

@@ -7,7 +7,7 @@ private Constants() { /* prevent from instantiation*/ }
     static final long DISTANT_PAST = 0;
     static final String CONFIG_JSON_NAME = "config_v6.json";
     static final String SERIALIZATION_FORMAT_VERSION = "v2";
-    static final String VERSION = "9.1.1";
+    static final String VERSION = "9.1.2";
 
     static final String SDK_KEY_PROXY_PREFIX = "configcat-proxy/";
     static final String SDK_KEY_PREFIX = "configcat-sdk-1";

src/test/java/com/configcat/AutoPollingTest.java

@@ -224,6 +224,29 @@ void testPollIntervalRespectsCacheExpiration() throws Exception {
         configService.close();
     }
 
+    @Test
+    void testPollsWhenCacheExpired() throws Exception {
+        this.server.enqueue(new MockResponse().setResponseCode(200).setBody(String.format(TEST_JSON, "test1")));
+
+        ConfigCache cache = new SingleValueCache(Helpers.cacheValueFromConfigJsonWithTime(String.format(TEST_JSON, "test"), System.currentTimeMillis() - 5000));
+
+        PollingMode pollingMode = PollingModes.autoPoll(1);
+        ConfigFetcher fetcher = new ConfigFetcher(new OkHttpClient(),
+                logger,
+                "",
+                this.server.url("/").toString(),
+                false,
+                pollingMode.getPollingIdentifier());
+        ConfigService configService = new ConfigService("", fetcher, pollingMode, cache, logger, false, new ConfigCatHooks());
+
+        configService.getSettings().get();
+
+        assertEquals("test1", configService.getSettings().get().settings().get("fakeKey").getSettingsValue().getStringValue());
+        assertEquals(1, this.server.getRequestCount());
+
+        configService.close();
+    }
+
     @Test
     void testOnlineOffline() throws Exception {
         this.server.enqueue(new MockResponse().setResponseCode(200).setBody(String.format(TEST_JSON, "test")));

src/test/java/com/configcat/Helpers.java

@@ -11,6 +11,12 @@ static String cacheValueFromConfigJson(String json) {
         return entry.serialize();
     }
 
+    static String cacheValueFromConfigJsonWithTime(String json, long time) {
+        Config config = Utils.gson.fromJson(json, Config.class);
+        Entry entry = new Entry(config, "fakeTag", json, time);
+        return entry.serialize();
+    }
+
     static String cacheValueFromConfigJsonWithEtag(String json, String etag) {
         Config config = Utils.gson.fromJson(json, Config.class);
         Entry entry = new Entry(config, etag, json, System.currentTimeMillis());