Update ConfigManager usage in api client, naming

mParticle · Jan 4, 2022 · 54d6b65 · 54d6b65
1 parent 611d121
commit 54d6b65
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/android-core/src/androidTest/kotlin/com.mparticle/internal/ConfigStalenessCheckTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/internal/ConfigStalenessCheckTest.kt
@@ -31,7 +31,7 @@ class ConfigStalenessCheckTest: BaseCleanInstallEachTest() {
 
  assertEquals(config1.toString(), configManager.config)
  val etag = configManager.etag
- val lastModified = configManager.configLastModified
+ val lastModified = configManager.ifModified
  val timestamp = configManager.configTimestamp
 
  MParticle.setInstance(null)
@@ -44,7 +44,7 @@ class ConfigStalenessCheckTest: BaseCleanInstallEachTest() {
  //after restart, we should still have config1
  assertEquals(config1.toString(), configManager.config)
  assertEquals(etag, configManager.etag)
- assertEquals(lastModified, configManager.configLastModified)
+ assertEquals(lastModified, configManager.ifModified)
  assertEquals(timestamp, configManager.configTimestamp)
 
  configManager.onNewConfig { latch.countDown() }
@@ -86,7 +86,7 @@ class ConfigStalenessCheckTest: BaseCleanInstallEachTest() {
  //after configMaxAge time has elapsed, config should be cleared after restart
  assertNull(configManager.config)
  assertNull(configManager.etag)
- assertNull(configManager.configLastModified)
+ assertNull(configManager.ifModified)
  assertNull(configManager.configTimestamp)
 
  configManager.onNewConfig { latch.countDown() }
@@ -114,7 +114,7 @@ class ConfigStalenessCheckTest: BaseCleanInstallEachTest() {
 
  assertEquals(config1.toString(), configManager.config)
  val etag = configManager.etag
- val lastModified = configManager.configLastModified
+ val lastModified = configManager.ifModified
  val timestamp = configManager.configTimestamp
 
  MParticle.setInstance(null)
@@ -127,7 +127,7 @@ class ConfigStalenessCheckTest: BaseCleanInstallEachTest() {
  //after restart, we should still have config1
  assertEquals(config1.toString(), configManager.config)
  assertEquals(etag, configManager.etag)
- assertEquals(lastModified, configManager.configLastModified)
+ assertEquals(lastModified, configManager.ifModified)
  assertEquals(timestamp, configManager.configTimestamp)
 
  configManager.onNewConfig { latch.countDown() }
@@ -165,7 +165,7 @@ class ConfigStalenessCheckTest: BaseCleanInstallEachTest() {
  //directly after restart, config should be cleared
  assertNull(configManager.config)
  assertNull(configManager.etag)
- assertNull(configManager.configLastModified)
+ assertNull(configManager.ifModified)
  assertNull(configManager.configTimestamp)
 
  configManager.onNewConfig { latch.countDown() }

diff --git a/android-core/src/main/java/com/mparticle/internal/ConfigManager.java b/android-core/src/main/java/com/mparticle/internal/ConfigManager.java
@@ -267,7 +267,7 @@ Long getConfigTimestamp() {
 
  void saveConfigJson(JSONObject json, String etag, String lastModified) throws JSONException {
  if (json != null) {
- Logger.info("Updating config to:\n" + json.toString());
+ Logger.debug("Updating config to:\n" + json.toString());
  sPreferences.edit()
  .putLong(CONFIG_JSON_TIMESTAMP, System.currentTimeMillis())
  .putString(CONFIG_JSON, json.toString())
@@ -1234,7 +1234,7 @@ public String getEtag() {
  return sPreferences.getString(Constants.PrefKeys.ETAG, null);
  }
 
- public String getConfigLastModified() {
+ public String getIfModified() {
  return sPreferences.getString(Constants.PrefKeys.IF_MODIFIED, null);
  }
 

diff --git a/android-core/src/main/java/com/mparticle/internal/MParticleApiClientImpl.java b/android-core/src/main/java/com/mparticle/internal/MParticleApiClientImpl.java
@@ -144,11 +144,11 @@ public void fetchConfig(boolean force) throws IOException, MPConfigException {
  }
 
  connection.setRequestProperty("User-Agent", mUserAgent);
- String etag = mPreferences.getString(Constants.PrefKeys.ETAG, null);
+ String etag = mConfigManager.getEtag();
  if (etag != null){
  connection.setRequestProperty("If-None-Match", etag);
  }
- String modified = mPreferences.getString(Constants.PrefKeys.IF_MODIFIED, null);
+ String modified = mConfigManager.getIfModified();
  if (modified != null){
  connection.setRequestProperty("If-Modified-Since", modified);
  }

diff --git a/android-core/src/test/java/com/mparticle/internal/ConfigManagerTest.java b/android-core/src/test/java/com/mparticle/internal/ConfigManagerTest.java
@@ -632,11 +632,11 @@ public void testLastModified() throws JSONException {
  String lastModified = String.valueOf(Math.abs(ran.nextLong()));
 
  //test default value
- assertNull(manager.getConfigLastModified());
+ assertNull(manager.getIfModified());
 
  //test set via config
  manager.updateConfig(new JSONObject(), null, lastModified);
- assertEquals(lastModified, manager.getConfigLastModified());
+ assertEquals(lastModified, manager.getIfModified());
  }
 
  @Test
@@ -674,21 +674,21 @@ public void testGetConfig() throws JSONException {
  //test defaults
  assertNull(manager.getConfig());
  assertNull(manager.getEtag());
- assertNull(manager.getConfigLastModified());
+ assertNull(manager.getIfModified());
  assertNull(manager.getConfigTimestamp());
 
  //test reload() does not set config
  manager.reloadConfig(newConfigJson);
  assertNull(manager.getConfig());
  assertNull(manager.getEtag());
- assertNull(manager.getConfigLastModified());
+ assertNull(manager.getIfModified());
  assertNull(manager.getConfigTimestamp());
 
  //test update DOES set config
  manager.updateConfig(newConfigJson,"my ETag", "12345");
  assertEquals(newConfigJson.toString(), manager.getConfig());
  assertEquals("my ETag", manager.getEtag());
- assertEquals("12345", manager.getConfigLastModified());
+ assertEquals("12345", manager.getIfModified());
  assertNotNull(manager.getConfigTimestamp());
  }
 }