Review comment changes

demo/src/main/java/com/google/android/fhir/demo/api/HapiFhirService.kt

@@ -29,6 +29,7 @@ import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PATCH
+import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Url
@@ -52,7 +53,7 @@ interface HapiFhirService {
  @DELETE("{type}/{id}")
  suspend fun deleteResource(@Path("type") type: String, @Path("id") id: String): OperationOutcome
 
- @retrofit2.http.POST(".") suspend fun postData(@Body body: RequestBody): Resource
+ @POST(".") suspend fun postData(@Body body: RequestBody): Resource
 
  companion object {
  const val BASE_URL = "https://hapi.fhir.org/baseR4/"

engine/src/main/java/com/google/android/fhir/sync/bundle/BundleUploader.kt

@@ -17,6 +17,7 @@
 package com.google.android.fhir.sync.bundle
 
 import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.db.impl.dao.SquashedLocalChange
 import com.google.android.fhir.sync.DataSource
@@ -37,8 +38,9 @@ internal class BundleUploader(val dataSource: DataSource) : Uploader {
  override suspend fun upload(
  localChanges: List<SquashedLocalChange>,
  ): Flow<UploadResult> = flow {
- BundlePayloadGenerator(
- createRequest = HttpPutForCreateEntryComponent(FhirContext.forR4().newJsonParser()),
+ TransactionBundleGenerator(
+ createRequest =
+ HttpPutForCreateEntryComponent(FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()),
  updateRequest = HttpPatchForUpdateEntryComponent(),
  deleteRequest = HttpDeleteEntryComponent(),
  localChangeProvider = DefaultLocalChangeProvider(localChanges)
@@ -48,7 +50,9 @@ internal class BundleUploader(val dataSource: DataSource) : Uploader {
  try {
  val response =
  dataSource.postBundle(
- FhirContext.forR4().newJsonParser().encodeResourceToString(bundle)
+ FhirContext.forCached(FhirVersionEnum.R4)
+ .newJsonParser()
+ .encodeResourceToString(bundle)
  )
  emit(getUploadResult(response, localChangeTokens))
  } catch (e: Exception) {

engine/src/main/java/com/google/android/fhir/sync/bundle/BundlePayloadGenerator.kt → engine/src/main/java/com/google/android/fhir/sync/bundle/TransactionBundleGenerator.kt

@@ -27,8 +27,7 @@ typealias ResourceBundleAndAssociatedLocalChangeTokens = Pair<Bundle, List<Local
  * Generates pairs of Transaction [Bundle] and [LocalChangeToken]s associated with the resources
  * present in the transaction bundle.
  */
-internal class BundlePayloadGenerator(
- private val bundleType: Bundle.BundleType = Bundle.BundleType.TRANSACTION,
+internal class TransactionBundleGenerator(
  private val createRequest: HttpVerbBasedBundleEntryComponent,
  private val updateRequest: HttpVerbBasedBundleEntryComponent,
  private val deleteRequest: HttpVerbBasedBundleEntryComponent,
@@ -45,7 +44,7 @@ internal class BundlePayloadGenerator(
  localChanges: List<SquashedLocalChange>
  ): ResourceBundleAndAssociatedLocalChangeTokens {
  return Bundle().apply {
- type = bundleType
+ type = Bundle.BundleType.TRANSACTION
  localChanges.forEach {
  this.addEntry(
  getHttpVerbBasedBundleEntryComponentForLocalChangeType(it.localChange.type).getEntry(it)
@@ -71,7 +70,7 @@ internal interface LocalChangeProvider {
 }
 
 /**
- * Tells [BundlePayloadGenerator] that all the local changes should be part of a single [Bundle]
+ * Tells [TransactionBundleGenerator] that all the local changes should be part of a single [Bundle]
  * transaction.
  */
 internal class DefaultLocalChangeProvider(private val localChanges: List<SquashedLocalChange>) :

engine/src/test/java/com/google/android/fhir/sync/bundle/BundleUploaderTest.kt

@@ -17,6 +17,7 @@
 package com.google.android.fhir.sync.bundle
 
 import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.db.impl.dao.SquashedLocalChange
 import com.google.android.fhir.db.impl.entities.LocalChangeEntity
@@ -99,7 +100,7 @@ class BundleUploaderTest {
  resourceId = "Patient-001",
  type = LocalChangeEntity.Type.INSERT,
  payload =
- FhirContext.forR4()
+ FhirContext.forCached(FhirVersionEnum.R4)
  .newJsonParser()
  .encodeResourceToString(
  Patient().apply {

engine/src/test/java/com/google/android/fhir/sync/bundle/BundleTransactionPayloadGeneratorTest.kt → engine/src/test/java/com/google/android/fhir/sync/bundle/TransactionBundleGeneratorTest.kt

@@ -17,6 +17,7 @@
 package com.google.android.fhir.sync.bundle
 
 import ca.uhn.fhir.context.FhirContext
+import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.db.impl.dao.LocalChangeToken
 import com.google.android.fhir.db.impl.dao.LocalChangeUtils
 import com.google.android.fhir.db.impl.dao.SquashedLocalChange
@@ -32,13 +33,14 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class BundleTransactionPayloadGeneratorTest {
+class TransactionBundleGeneratorTest {
 
  @Test
  fun `generate() should return empty list if there are no local changes`() = runBlocking {
  val generator =
- BundlePayloadGenerator(
- createRequest = HttpPutForCreateEntryComponent(FhirContext.forR4().newJsonParser()),
+ TransactionBundleGenerator(
+ createRequest =
+ HttpPutForCreateEntryComponent(FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()),
  updateRequest = HttpPatchForUpdateEntryComponent(),
  deleteRequest = HttpDeleteEntryComponent(),
  localChangeProvider =
@@ -56,7 +58,7 @@ class BundleTransactionPayloadGeneratorTest {
 
  @Test
  fun `generate() should return single Transaction Bundle with 3 entries`() = runBlocking {
- val jsonParser = FhirContext.forR4().newJsonParser()
+ val jsonParser = FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()
  val changes =
  listOf(
  SquashedLocalChange(
@@ -135,8 +137,9 @@ class BundleTransactionPayloadGeneratorTest {
  )
  )
  val generator =
- BundlePayloadGenerator(
- createRequest = HttpPutForCreateEntryComponent(FhirContext.forR4().newJsonParser()),
+ TransactionBundleGenerator(
+ createRequest =
+ HttpPutForCreateEntryComponent(FhirContext.forCached(FhirVersionEnum.R4).newJsonParser()),
  updateRequest = HttpPatchForUpdateEntryComponent(),
  deleteRequest = HttpDeleteEntryComponent(),
  localChangeProvider = DefaultLocalChangeProvider(changes)