[EMBR-631] Rename lazy properties.

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/api/EmbraceApiService.kt

@@ -35,8 +35,8 @@
  private val scheduledExecutorService: ScheduledExecutorService,
  networkConnectivityService: NetworkConnectivityService,
  private val cacheManager: DeliveryCacheManager,
- private val deviceId: Lazy<String>,
- private val appId: Lazy<String>
+ private val lazyDeviceId: Lazy<String>,
+ private val lazyAppId: Lazy<String>
 ) : ApiService, NetworkConnectivityListener {
 
  private val retryQueue: DeliveryFailedApiCalls by lazy { cacheManager.loadFailedApiCalls() }
@@ -178,14 +178,14 @@
  )
  }
  val request: ApiRequest = eventBuilder(url).copy(
- deviceId = deviceId.value,
- appId = appId.value,
+ deviceId = lazyDeviceId.value,
+ appId = lazyAppId.value,
  url = url,
  httpMethod = HttpMethod.POST,
  contentEncoding = "gzip"
  )
 
  postAEIBlob(blobMessage, request)
  }
 
  /**
@@ -253,8 +253,8 @@
  )
  }
  val request: ApiRequest = eventBuilder(url).copy(
- deviceId = deviceId.value,
- appId = appId.value,
+ deviceId = lazyDeviceId.value,
+ appId = lazyAppId.value,
  url = url,
  httpMethod = HttpMethod.POST,
  contentEncoding = "gzip"
@@ -378,8 +378,8 @@
  return ApiRequest(
  url = url,
  httpMethod = HttpMethod.POST,
- appId = appId.value,
- deviceId = deviceId.value,
+ appId = lazyAppId.value,
+ deviceId = lazyDeviceId.value,
  contentEncoding = "gzip"
  )
  }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/api/EmbraceApiUrlBuilder.kt

@@ -11,8 +11,8 @@
  private val enableIntegrationTesting: Boolean,
  private val isDebug: Boolean,
  private val sdkEndpointBehavior: SdkEndpointBehavior,
- private val appId: Lazy<String>,
- private val deviceId: Lazy<String>,
+ private val lazyAppId: Lazy<String>,
+ private val lazyDeviceId: Lazy<String>,
  context: Context,
 ) : ApiUrlBuilder {
  companion object {
@@ -25,19 +25,19 @@
  val packageInfo = packageManager.getPackageInfo(context.packageName, 0)
  val versionName = packageInfo.versionName.toString().trim { it <= ' ' }
  versionName
  } catch (e: PackageManager.NameNotFoundException) {
  "UNKNOWN"
  }
 
  private fun getConfigBaseUrl() =
- buildUrl(sdkEndpointBehavior.getConfig(appId.value), CONFIG_API_VERSION, "config")
+ buildUrl(sdkEndpointBehavior.getConfig(lazyAppId.value), CONFIG_API_VERSION, "config")
 
  private fun getOperatingSystemCode() = Build.VERSION.SDK_INT.toString() + ".0.0"
 
  private fun getCoreBaseUrl(): String = if (isDebugBuild()) {
- sdkEndpointBehavior.getDataDev(appId.value)
+ sdkEndpointBehavior.getDataDev(lazyAppId.value)
  } else {
- sdkEndpointBehavior.getData(appId.value)
+ sdkEndpointBehavior.getData(lazyAppId.value)
  }
 
  private fun isDebugBuild(): Boolean {
@@ -49,8 +49,8 @@
  }
 
  override fun getConfigUrl(): String {
- return "${getConfigBaseUrl()}?appId=${appId.value}&osVersion=${getOperatingSystemCode()}" +
- "&appVersion=$appVersionName&deviceId=${deviceId.value}"
+ return "${getConfigBaseUrl()}?appId=${lazyAppId.value}&osVersion=${getOperatingSystemCode()}" +
+ "&appVersion=$appVersionName&deviceId=${lazyDeviceId.value}"
  }
 
  override fun getEmbraceUrlWithSuffix(suffix: String): String {

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/injection/EssentialServiceModule.kt

@@ -88,9 +88,9 @@ internal class EssentialServiceModuleImpl(
  coreModule.jsonSerializer
  )
 
- private val appId = lazy { localConfig.appId }
+ private val lazyAppId = lazy { localConfig.appId }
 
- private val deviceId = lazy(androidServicesModule.preferencesService::deviceIdentifier)
+ private val lazyDeviceId = lazy(androidServicesModule.preferencesService::deviceIdentifier)
 
  private val thresholdCheck: BehaviorThresholdCheck =
  BehaviorThresholdCheck(androidServicesModule.preferencesService::deviceIdentifier)
@@ -168,8 +168,8 @@ internal class EssentialServiceModuleImpl(
  enableIntegrationTesting = enableIntegrationTesting,
  isDebug = coreModule.isDebug,
  sdkEndpointBehavior = sdkEndpointBehavior,
- appId = appId,
- deviceId = deviceId,
+ lazyAppId = lazyAppId,
+ lazyDeviceId = lazyDeviceId,
  context = coreModule.context,
  )
  }
@@ -235,8 +235,8 @@ internal class EssentialServiceModuleImpl(
  apiRetryExecutor,
  networkConnectivityService,
  deliveryCacheManager,
- deviceId,
- appId
+ lazyDeviceId,
+ lazyAppId
  )
  }
 

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceApiUrlBuilderTest.kt

@@ -30,8 +30,8 @@ internal class EmbraceApiUrlBuilderTest {
  enableIntegrationTesting = false,
  isDebug = false,
  sdkEndpointBehavior = fakeSdkEndpointBehavior(localCfg = { BaseUrlLocalConfig() }),
- appId = lazy { APP_ID },
- deviceId = lazy { preferenceService.deviceIdentifier },
+ lazyAppId = lazy { APP_ID },
+ lazyDeviceId = lazy { preferenceService.deviceIdentifier },
  context = context,
  )
  }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/comms/api/EmbraceApiServiceTest.kt

@@ -344,8 +344,8 @@ internal class EmbraceApiServiceTest {
  scheduledExecutorService = testScheduledExecutor,
  networkConnectivityService = networkConnectivityService,
  cacheManager = mockCacheManager,
- deviceId = lazy { "07D85B44E4E245F4A30E559BFC0D07FF" },
- appId = lazy { "o0o0o" },
+ lazyDeviceId = lazy { "07D85B44E4E245F4A30E559BFC0D07FF" },
+ lazyAppId = lazy { "o0o0o" },
  )
 
  failedApiCalls.clear()